danepitkin commented on code in PR #37097:
URL: https://github.com/apache/arrow/pull/37097#discussion_r1307613229
##########
python/pyarrow/_dataset_parquet.pyx:
##########
@@ -771,13 +771,23 @@ cdef class
ParquetFragmentScanOptions(FragmentScanOptions):
other.thrift_container_size_limit)
return attrs == other_attrs
+<<<<<<< HEAD
+<<<<<<< HEAD
@staticmethod
@binding(True) # Required for Cython < 3
+=======
+ @staticmethod
+>>>>>>> 12e6eb47d (Make _reconstruct staticmethods)
Review Comment:
```suggestion
```
##########
python/pyarrow/_dataset_parquet.pyx:
##########
@@ -771,13 +771,23 @@ cdef class
ParquetFragmentScanOptions(FragmentScanOptions):
other.thrift_container_size_limit)
return attrs == other_attrs
+<<<<<<< HEAD
+<<<<<<< HEAD
Review Comment:
```suggestion
```
##########
python/pyarrow/_dataset_parquet.pyx:
##########
@@ -771,13 +771,23 @@ cdef class
ParquetFragmentScanOptions(FragmentScanOptions):
other.thrift_container_size_limit)
return attrs == other_attrs
+<<<<<<< HEAD
+<<<<<<< HEAD
@staticmethod
@binding(True) # Required for Cython < 3
+=======
+ @staticmethod
+>>>>>>> 12e6eb47d (Make _reconstruct staticmethods)
def _reconstruct(kwargs):
# __reduce__ doesn't allow passing named arguments directly to the
# reconstructor, hence this wrapper.
return ParquetFragmentScanOptions(**kwargs)
+<<<<<<< HEAD
+=======
+>>>>>>> 0930ea44c (Fix cloudpickle test)
+=======
+>>>>>>> 12e6eb47d (Make _reconstruct staticmethods)
Review Comment:
```suggestion
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
