Fix conflicts issues

ClickHouse · Mar 31, 2023 · 1f1b3d3 · 1f1b3d3
1 parent c8cfbe2
commit 1f1b3d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/cpp/src/arrow/adapters/orc/adapter.cc b/cpp/src/arrow/adapters/orc/adapter.cc
@@ -196,7 +196,6 @@ class ORCFileReader::Impl {
     return reader_.get();
   }
 
-
   Status Init() {
     int64_t nstripes = reader_->getNumberOfStripes();
     stripes_.resize(nstripes);
@@ -518,9 +517,7 @@ class ORCFileReader::Impl {
 
   Result<std::shared_ptr<RecordBatchReader>> NextStripeReader(int64_t batch_size) {
     std::vector<int> empty_vec;
-    return NextStripeReader(batch_size, empty_vec); 
-  }
-
+    return NextStripeReader(batch_size, empty_vec);
   }
 
  private:

diff --git a/cpp/src/arrow/adapters/orc/adapter.h b/cpp/src/arrow/adapters/orc/adapter.h
@@ -30,7 +30,7 @@
 #include "arrow/type_fwd.h"
 #include "arrow/util/macros.h"
 #include "arrow/util/visibility.h"
-#include "arrow/adapters/orc/adapter_util.h"
+#include "arrow/adapters/orc/util.h"
 
 namespace arrow {
 namespace adapters {