Skip to content

Commit b90241e

Browse files
refactor: refactor block index properties (#312)
* refactor: refactor block index properties * fix concat
1 parent 068879f commit b90241e

File tree

9 files changed

+408
-425
lines changed

9 files changed

+408
-425
lines changed

bigframes/core/block_transforms.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ def equals(block1: blocks.Block, block2: blocks.Block) -> bool:
3838
block1 = block1.reset_index(drop=False)
3939
block2 = block2.reset_index(drop=False)
4040

41-
joined, (lmap, rmap) = block1.index.join(block2.index, how="outer")
42-
joined_block = joined._block
41+
joined_block, (lmap, rmap) = block1.join(block2, how="outer")
4342

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

136135
for column in original_columns:
@@ -743,14 +742,14 @@ def align_rows(
743742
right_block: blocks.Block,
744743
join: str = "outer",
745744
):
746-
joined_index, (get_column_left, get_column_right) = left_block.index.join(
747-
right_block.index, how=join
745+
joined_block, (get_column_left, get_column_right) = left_block.join(
746+
right_block, how=join
748747
)
749748
left_columns = [get_column_left[col] for col in left_block.value_columns]
750749
right_columns = [get_column_right[col] for col in right_block.value_columns]
751750

752-
left_block = joined_index._block.select_columns(left_columns)
753-
right_block = joined_index._block.select_columns(right_columns)
751+
left_block = joined_block.select_columns(left_columns)
752+
right_block = joined_block.select_columns(right_columns)
754753
return left_block, right_block
755754

756755

0 commit comments

Comments
 (0)