Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
qinxuye committed Sep 16, 2023
1 parent 994fbff commit 87ec47d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/xorbits/_mars/dataframe/merge/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
cudf = lazy_import("cudf")


class DataFrameMergeAlign(MapReduceOperand, DataFrameAutoMergeMixin):
class DataFrameMergeAlign(MapReduceOperand, DataFrameOperandMixin):
_op_type_ = OperandDef.DATAFRAME_SHUFFLE_MERGE_ALIGN

index_shuffle_size = Int32Field("index_shuffle_size")
Expand Down Expand Up @@ -174,7 +174,7 @@ class MergeMethod(Enum):
shuffle = 2


class DataFrameMerge(DataFrameOperand, DataFrameOperandMixin):
class DataFrameMerge(DataFrameOperand, DataFrameAutoMergeMixin):
_op_type_ = OperandDef.DATAFRAME_MERGE

how = StringField("how")
Expand Down

0 comments on commit 87ec47d

Please sign in to comment.