fix store init error

apache · Jul 4, 2024 · 6bb3134 · 6bb3134
1 parent 87f1b73
commit 6bb3134
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/hugegraph-pd/pom.xml b/hugegraph-pd/pom.xml
@@ -142,7 +142,7 @@
                                 <include>.flattened-pom.xml</include>
                                 <!-- WARN: delete dist dir may influence dev? -->
                                 <!-- TODO: replace with ${final.name} in pd-dist -->
-                                <include>dist/**</include>
+                                <include>apache-hugegraph-incubating-pd-1.3.0/**</include>
                             </includes>
                             <followSymlinks>false</followSymlinks>
                         </fileset>

diff --git a/...re/hg-store-rocksdb/src/main/java/org/apache/hugegraph/rocksdb/access/RocksDBOptions.java b/...re/hg-store-rocksdb/src/main/java/org/apache/hugegraph/rocksdb/access/RocksDBOptions.java
@@ -23,6 +23,8 @@
 import static org.apache.hugegraph.config.OptionChecker.rangeDouble;
 import static org.apache.hugegraph.config.OptionChecker.rangeInt;
 
+import java.util.Map;
+
 import org.apache.hugegraph.config.ConfigConvOption;
 import org.apache.hugegraph.config.ConfigListConvOption;
 import org.apache.hugegraph.config.ConfigOption;
@@ -82,18 +84,20 @@ public class RocksDBOptions extends OptionHolder {
                     ""
             );
 
-    public static final ConfigOption<InfoLogLevel> LOG_LEVEL =
+    public static final ConfigOption<String> LOG_LEVEL =
             new ConfigOption<>(
                     "rocksdb.log_level",
                     "The info log level of RocksDB.",
-                    allowValues(InfoLogLevel.DEBUG_LEVEL,
-                                InfoLogLevel.INFO_LEVEL,
-                                InfoLogLevel.WARN_LEVEL,
-                                InfoLogLevel.ERROR_LEVEL,
-                                InfoLogLevel.FATAL_LEVEL,
-                                InfoLogLevel.HEADER_LEVEL),
-                    InfoLogLevel.INFO_LEVEL
-            );
+                    allowValues("DEBUG", "INFO", "WARN", "ERROR", "FATAL", "HEADER"),
+                    "INFO"
+            );
+    public static final Map<String, InfoLogLevel> LOG_LEVEL_MAPPING =
+            Map.of("DEBUG", InfoLogLevel.DEBUG_LEVEL,
+                   "INFO", InfoLogLevel.INFO_LEVEL,
+                   "WARN", InfoLogLevel.WARN_LEVEL,
+                   "ERROR", InfoLogLevel.ERROR_LEVEL,
+                   "FATAL", InfoLogLevel.FATAL_LEVEL,
+                   "HEADER", InfoLogLevel.HEADER_LEVEL);
 
     public static final ConfigOption<Integer> NUM_LEVELS =
             new ConfigOption<>(

diff --git a/...re/hg-store-rocksdb/src/main/java/org/apache/hugegraph/rocksdb/access/RocksDBSession.java b/...re/hg-store-rocksdb/src/main/java/org/apache/hugegraph/rocksdb/access/RocksDBSession.java
@@ -143,7 +143,8 @@ public static void initOptions(HugeConfig conf,
                 db.setAllowConcurrentMemtableWrite(true);
                 db.setEnableWriteThreadAdaptiveYield(true);
             }
-            db.setInfoLogLevel(conf.get(RocksDBOptions.LOG_LEVEL));
+            db.setInfoLogLevel(
+                    RocksDBOptions.LOG_LEVEL_MAPPING.get(conf.get(RocksDBOptions.LOG_LEVEL)));
             db.setMaxSubcompactions(conf.get(RocksDBOptions.MAX_SUB_COMPACTIONS));
             db.setAllowMmapWrites(conf.get(RocksDBOptions.ALLOW_MMAP_WRITES));
             db.setAllowMmapReads(conf.get(RocksDBOptions.ALLOW_MMAP_READS));

diff --git a/hugegraph-store/pom.xml b/hugegraph-store/pom.xml
@@ -154,7 +154,7 @@
                                 <include>*.tar.gz</include>
                                 <include>.flattened-pom.xml</include>
                                 <!-- TODO: replace with ${final.name} in store-dist -->
-                                <include>dist/**</include>
+                                <include>apache-hugegraph-incubating-store-1.3.0/**</include>
                             </includes>
                             <followSymlinks>false</followSymlinks>
                         </fileset>