Skip to content

Commit 231cf29

Browse files
refactor: Remove join name mapper code. (#597)
* refactor: Remove join name mapper code. * remove dead import
1 parent b94bae9 commit 231cf29

File tree

4 files changed

+12
-47
lines changed

4 files changed

+12
-47
lines changed

bigframes/core/compile/single_column.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import ibis.expr.types as ibis_types
2424

2525
import bigframes.core.compile.compiled as compiled
26+
import bigframes.core.guid as guids
2627
import bigframes.core.join_def as join_defs
27-
import bigframes.core.joins as joining
2828
import bigframes.core.ordering as orderings
2929

3030

@@ -50,9 +50,13 @@ def join_by_column_ordered(
5050
finally, all the right columns.
5151
"""
5252

53-
l_hidden_mapping, r_hidden_mapping = joining.JoinNameRemapper(namespace="hidden")(
54-
left._hidden_column_ids, right._hidden_column_ids
55-
)
53+
l_hidden_mapping = {
54+
id: guids.generate_guid("hidden_") for id in left._hidden_column_ids
55+
}
56+
r_hidden_mapping = {
57+
id: guids.generate_guid("hidden_") for id in right._hidden_column_ids
58+
}
59+
5660
l_mapping = {**join.get_left_mapping(), **l_hidden_mapping}
5761
r_mapping = {**join.get_right_mapping(), **r_hidden_mapping}
5862

bigframes/core/joins/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"""Helpers to join ArrayValue objects."""
1616

1717
from bigframes.core.joins.merge import merge
18-
from bigframes.core.joins.name_resolution import JoinNameRemapper
1918

20-
__all__ = ("merge", "JoinNameRemapper")
19+
__all__ = [
20+
"merge",
21+
]

bigframes/core/joins/name_resolution.py

Lines changed: 0 additions & 41 deletions
This file was deleted.

bigframes/pandas/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import bigframes.core.expression as ex
6060
import bigframes.core.global_session as global_session
6161
import bigframes.core.indexes
62+
import bigframes.core.joins
6263
import bigframes.core.reshape
6364
import bigframes.core.tools
6465
import bigframes.dataframe

0 commit comments

Comments
 (0)