File tree Expand file tree Collapse file tree 4 files changed +12
-47
lines changed Expand file tree Collapse file tree 4 files changed +12
-47
lines changed Original file line number Diff line number Diff line change 23
23
import ibis .expr .types as ibis_types
24
24
25
25
import bigframes .core .compile .compiled as compiled
26
+ import bigframes .core .guid as guids
26
27
import bigframes .core .join_def as join_defs
27
- import bigframes .core .joins as joining
28
28
import bigframes .core .ordering as orderings
29
29
30
30
@@ -50,9 +50,13 @@ def join_by_column_ordered(
50
50
finally, all the right columns.
51
51
"""
52
52
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
+
56
60
l_mapping = {** join .get_left_mapping (), ** l_hidden_mapping }
57
61
r_mapping = {** join .get_right_mapping (), ** r_hidden_mapping }
58
62
Original file line number Diff line number Diff line change 15
15
"""Helpers to join ArrayValue objects."""
16
16
17
17
from bigframes .core .joins .merge import merge
18
- from bigframes .core .joins .name_resolution import JoinNameRemapper
19
18
20
- __all__ = ("merge" , "JoinNameRemapper" )
19
+ __all__ = [
20
+ "merge" ,
21
+ ]
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 59
59
import bigframes .core .expression as ex
60
60
import bigframes .core .global_session as global_session
61
61
import bigframes .core .indexes
62
+ import bigframes .core .joins
62
63
import bigframes .core .reshape
63
64
import bigframes .core .tools
64
65
import bigframes .dataframe
You can’t perform that action at this time.
0 commit comments