fix2

Author: lszskye

include/paimon/defs.h

@@ -284,8 +284,8 @@ struct PAIMON_EXPORT Options {
     static const char BLOB_AS_DESCRIPTOR[];
     /// "global-index.enabled" - Whether to enable global index for scan. Default value is "true".
     static const char GLOBAL_INDEX_ENABLED[];
-    /// "global-index.external-path" - The external path where the global index will be
-    /// written.
+    /// "global-index.external-path" - Global index root directory, if not set, the global index
+    /// files will be stored under the <table-root-directory>/index.
     static const char GLOBAL_INDEX_EXTERNAL_PATH[];
 };
 

src/paimon/core/utils/file_store_path_factory.cpp

@@ -157,6 +157,7 @@ std::unique_ptr<IndexPathFactory> FileStorePathFactory::CreateGlobalIndexFileFac
         std::string NewPath() const override {
             return factory_->NewIndexFile();
         }
+        
         std::string ToPath(const std::shared_ptr<IndexFileMeta>& file) const override {
             const auto& external_path = file->ExternalPath();
             if (external_path) {
@@ -168,7 +169,7 @@ std::unique_ptr<IndexPathFactory> FileStorePathFactory::CreateGlobalIndexFileFac
         std::string ToPath(const std::string& file_name) const override {
             const auto& external_path = factory_->GetGlobalIndexExternalPath();
             if (external_path) {
-                return PathUtil::JoinPath(factory_->IndexPath(external_path.value()), file_name);
+                return PathUtil::JoinPath(external_path.value(), file_name);
             }
             return PathUtil::JoinPath(factory_->IndexPath(factory_->RootPath()), file_name);
         }

src/paimon/core/utils/file_store_path_factory_test.cpp

@@ -481,17 +481,15 @@ TEST_F(FileStorePathFactoryTest, TestCreateIndexFileFactory) {
         ASSERT_OK_AND_ASSIGN(
             auto index_path_factory,
             file_store_path_factory->CreateIndexFileFactory(partition, /*bucket=*/2));
-        ASSERT_EQ(index_path_factory->ToPath("bitmap.index"),
-                  "/tmp/external-path/index/bitmap.index");
+        ASSERT_EQ(index_path_factory->ToPath("bitmap.index"), "/tmp/external-path/bitmap.index");
         ASSERT_TRUE(index_path_factory->IsExternalPath());
 
         auto index_file_meta = std::make_shared<IndexFileMeta>(
             /*index_type=*/"bitmap", /*file_name=*/"bitmap.index", /*file_size=*/10,
             /*row_count=*/5, /*dv_ranges=*/std::nullopt,
-            /*external_path=*/"/tmp/external-path/index/bitmap.index",
+            /*external_path=*/"/tmp/external-path/bitmap.index",
             /*global_index_meta=*/std::nullopt);
-        ASSERT_EQ(index_path_factory->ToPath(index_file_meta),
-                  "/tmp/external-path/index/bitmap.index");
+        ASSERT_EQ(index_path_factory->ToPath(index_file_meta), "/tmp/external-path/bitmap.index");
     }
 }
 }  // namespace paimon::test