Fix compile failure

apache · May 27, 2024 · fece87c · fece87c
1 parent 4e810dd
commit fece87c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/cpp/velox/operators/writer/VeloxParquetDatasource.cc b/cpp/velox/operators/writer/VeloxParquetDatasource.cc
@@ -43,7 +43,7 @@ namespace {
 const int32_t kGzipWindowBits4k = 12;
 }
 
-void initSink(const std::unordered_map<std::string, std::string>& /** sparkConfs */) {
+void VeloxParquetDatasource::initSink(const std::unordered_map<std::string, std::string>& /* sparkConfs */) {
   if (strncmp(filePath_.c_str(), "file:", 5) == 0) {
     sink_ = dwio::common::FileSink::create(filePath_, {.pool = pool_.get()});
   } else {

diff --git a/cpp/velox/operators/writer/VeloxParquetDatasource.h b/cpp/velox/operators/writer/VeloxParquetDatasource.h
@@ -88,8 +88,8 @@ class VeloxParquetDatasource : public Datasource {
       std::shared_ptr<arrow::Schema> schema)
       : Datasource(filePath, schema), filePath_(filePath), schema_(schema), pool_(std::move(veloxPool)) {}
 
-  void init(const std::unordered_map<std::string, std::string>& sparkConfs);
-  void initSink(const std::unordered_map<std::string, std::string>& sparkConfs) override;
+  void init(const std::unordered_map<std::string, std::string>& sparkConfs) override;
+  virtual void initSink(const std::unordered_map<std::string, std::string>& sparkConfs);
   void inspectSchema(struct ArrowSchema* out) override;
   void write(const std::shared_ptr<ColumnarBatch>& cb) override;
   void close() override;

diff --git a/cpp/velox/operators/writer/VeloxParquetDatasourceABFS.h b/cpp/velox/operators/writer/VeloxParquetDatasourceABFS.h
@@ -41,6 +41,7 @@ class VeloxParquetDatasourceABFS final : public VeloxParquetDatasource {
       std::shared_ptr<facebook::velox::memory::MemoryPool> sinkPool,
       std::shared_ptr<arrow::Schema> schema)
       : VeloxParquetDatasource(filePath, veloxPool, sinkPool, schema) {}
+
   void initSink(const std::unordered_map<std::string, std::string>& sparkConfs) override {
     auto hiveConf = getHiveConfig(std::make_shared<facebook::velox::core::MemConfig>(sparkConfs));
     auto fileSystem = filesystems::getFileSystem(filePath_, hiveConf);

diff --git a/cpp/velox/operators/writer/VeloxParquetDatasourceGCS.h b/cpp/velox/operators/writer/VeloxParquetDatasourceGCS.h
@@ -40,7 +40,8 @@ class VeloxParquetDatasourceGCS final : public VeloxParquetDatasource {
       std::shared_ptr<facebook::velox::memory::MemoryPool> sinkPool,
       std::shared_ptr<arrow::Schema> schema)
       : VeloxParquetDatasource(filePath, veloxPool, sinkPool, schema) {}
-  void initSink(const std::unordered_map<std::string, std::string>& /** sparkConfs*/) override {
+
+  void initSink(const std::unordered_map<std::string, std::string>& /* sparkConfs */) override {
     auto fileSystem = filesystems::getFileSystem(filePath_, nullptr);
     auto* gcsFileSystem = dynamic_cast<filesystems::GCSFileSystem*>(fileSystem.get());
     sink_ = std::make_unique<dwio::common::WriteFileSink>(

diff --git a/cpp/velox/operators/writer/VeloxParquetDatasourceHDFS.h b/cpp/velox/operators/writer/VeloxParquetDatasourceHDFS.h
@@ -41,6 +41,7 @@ class VeloxParquetDatasourceHDFS final : public VeloxParquetDatasource {
       std::shared_ptr<facebook::velox::memory::MemoryPool> sinkPool,
       std::shared_ptr<arrow::Schema> schema)
       : VeloxParquetDatasource(filePath, veloxPool, sinkPool, schema) {}
+
   void initSink(const std::unordered_map<std::string, std::string>& sparkConfs) override {
     auto hiveConf = getHiveConfig(std::make_shared<facebook::velox::core::MemConfig>(sparkConfs));
     sink_ = dwio::common::FileSink::create(filePath_, {.connectorProperties = hiveConf, .pool = sinkPool_.get()});

diff --git a/cpp/velox/operators/writer/VeloxParquetDatasourceS3.h b/cpp/velox/operators/writer/VeloxParquetDatasourceS3.h
@@ -41,10 +41,10 @@ class VeloxParquetDatasourceS3 final : public VeloxParquetDatasource {
       std::shared_ptr<facebook::velox::memory::MemoryPool> sinkPool,
       std::shared_ptr<arrow::Schema> schema)
       : VeloxParquetDatasource(filePath, veloxPool, sinkPool, schema) {}
-  void init(const std::unordered_map<std::string, std::string>& sparkConfs) override {
+
+  void initSink(const std::unordered_map<std::string, std::string>& sparkConfs) override {
     auto hiveConf = getHiveConfig(std::make_shared<facebook::velox::core::MemConfig>(sparkConfs));
     sink_ = dwio::common::FileSink::create(filePath_, {.connectorProperties = hiveConf, .pool = sinkPool_.get()});
-    VeloxParquetDatasource::init(sparkConfs);
   }
 };
 } // namespace gluten