Skip to content

refactor: refactor block index properties #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 1, 2024
Merged

refactor: refactor block index properties #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c5eeb1
refactor: refactor block index properties
TrevorBergeron Jan 10, 2024
fd31a3b
Merge remote-tracking branch 'github/main' into align_offsets
TrevorBergeron Jan 27, 2024
7c9edbb
fix concat
TrevorBergeron Jan 29, 2024
dd8596c
Merge branch 'main' into align_offsets
TrevorBergeron Jan 30, 2024
aae0a70
Merge branch 'main' into align_offsets
TrevorBergeron Jan 30, 2024
3e70312
Merge branch 'main' into align_offsets
TrevorBergeron Jan 31, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions bigframes/core/block_transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ def equals(block1: blocks.Block, block2: blocks.Block) -> bool:
block1 = block1.reset_index(drop=False)
block2 = block2.reset_index(drop=False)

joined, (lmap, rmap) = block1.index.join(block2.index, how="outer")
joined_block = joined._block
joined_block, (lmap, rmap) = block1.join(block2, how="outer")

equality_ids = []
for lcol, rcol in zip(block1.value_columns, block2.value_columns):
Expand Down Expand Up @@ -130,7 +129,7 @@ def interpolate(block: blocks.Block, method: str = "linear") -> blocks.Block:
if len(index_columns) != 1:
raise ValueError("only method 'linear' supports multi-index")
xvalues = block.index_columns[0]
if block.index_dtypes[0] not in dtypes.NUMERIC_BIGFRAMES_TYPES_PERMISSIVE:
if block.index.dtypes[0] not in dtypes.NUMERIC_BIGFRAMES_TYPES_PERMISSIVE:
raise ValueError("Can only interpolate on numeric index.")

for column in original_columns:
Expand Down Expand Up @@ -743,14 +742,14 @@ def align_rows(
right_block: blocks.Block,
join: str = "outer",
):
joined_index, (get_column_left, get_column_right) = left_block.index.join(
right_block.index, how=join
joined_block, (get_column_left, get_column_right) = left_block.join(
right_block, how=join
)
left_columns = [get_column_left[col] for col in left_block.value_columns]
right_columns = [get_column_right[col] for col in right_block.value_columns]

left_block = joined_index._block.select_columns(left_columns)
right_block = joined_index._block.select_columns(right_columns)
left_block = joined_block.select_columns(left_columns)
right_block = joined_block.select_columns(right_columns)
return left_block, right_block


Expand Down
Loading