fix ci

apache · Oct 9, 2024 · ce5ad76 · ce5ad76
1 parent 7de8e59
commit ce5ad76
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/cpp-ch/clickhouse.version b/cpp-ch/clickhouse.version
@@ -1,3 +1,3 @@
 CH_ORG=loneylee
 CH_BRANCH=1004
-CH_COMMIT=4cea22406d5c9d6b2daf1cb8283f1346eb2c727e
+CH_COMMIT=3284d8fa85a8e7f17d2de74260b7704c43e54c09
diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp b/cpp-ch/local-engine/Common/CHUtil.cpp
@@ -677,6 +677,7 @@ void BackendInitializerUtil::initSettings(const std::map<std::string, std::strin
     settings.set(MERGETREE_INSERT_WITHOUT_LOCAL_STORAGE, false);
     settings.set(DECIMAL_OPERATIONS_ALLOW_PREC_LOSS, true);
     settings.set("remote_filesystem_read_prefetch", false);
+    settings.set("remote_filesystem_read_method", "read");
 
     for (const auto & [key, value] : spark_conf_map)
     {

diff --git a/cpp-ch/local-engine/Disks/ObjectStorages/GlutenHDFSObjectStorage.cpp b/cpp-ch/local-engine/Disks/ObjectStorages/GlutenHDFSObjectStorage.cpp
@@ -30,7 +30,7 @@ std::unique_ptr<ReadBufferFromFileBase> GlutenHDFSObjectStorage::readObject( ///
     size_t begin_of_path = object.remote_path.find('/', object.remote_path.find("//") + 2);
     auto hdfs_path = object.remote_path.substr(begin_of_path);
     auto hdfs_uri = object.remote_path.substr(0, begin_of_path);
-    return std::make_unique<ReadBufferFromHDFS>(hdfs_uri, hdfs_path, config, HDFSObjectStorage::patchSettings(read_settings));
+    return std::make_unique<ReadBufferFromHDFS>(hdfs_uri, hdfs_path, config, HDFSObjectStorage::patchSettings(read_settings), 0, true);
 }
 
 DB::ObjectStorageKey local_engine::GlutenHDFSObjectStorage::generateObjectKeyForPath(const std::string & path, const std::optional<std::string> & key_prefix) const

diff --git a/cpp-ch/local-engine/Parser/scalar_function_parser/arithmetic.cpp b/cpp-ch/local-engine/Parser/scalar_function_parser/arithmetic.cpp
@@ -305,7 +305,6 @@ class FunctionParserModulo final : public FunctionParserBinaryArithmetic
         const DB::ActionsDAG::NodeRawConstPtrs & new_args,
         DataTypePtr result_type) const override
     {
-        assert(func_name == name);
         const auto * left_arg = new_args[0];
         const auto * right_arg = new_args[1];
 

diff --git a/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp b/cpp-ch/local-engine/Storages/MergeTree/SparkStorageMergeTree.cpp
@@ -153,11 +153,15 @@ void SparkStorageMergeTree::prefetchMetaDataFile(std::unordered_set<std::string>
         return;
     std::vector<String> meta_paths;
     std::ranges::for_each(parts, [&](const String & name) { meta_paths.emplace_back(fs::path(relative_data_path) / name / "meta.bin"); });
+    auto read_settings = ReadSettings{};
+    // read_settings.enable_filesystem_cache = false;
+    read_settings.remote_fs_method = RemoteFSReadMethod::read;
     for (const auto & meta_path : meta_paths)
     {
         if (!disk->exists(meta_path))
             continue;
-        auto in = disk->readFile(meta_path, ReadSettings{});
+
+        auto in = disk->readFile(meta_path, read_settings);
         String ignore_data;
         readStringUntilEOF(ignore_data, *in);
     }