diff --git a/hugegraph-pd/pom.xml b/hugegraph-pd/pom.xml index b5db57f267..c40733b52d 100644 --- a/hugegraph-pd/pom.xml +++ b/hugegraph-pd/pom.xml @@ -142,7 +142,7 @@ .flattened-pom.xml - dist/** + apache-hugegraph-incubating-pd-1.3.0/** false diff --git a/hugegraph-store/hg-store-rocksdb/src/main/java/org/apache/hugegraph/rocksdb/access/RocksDBOptions.java b/hugegraph-store/hg-store-rocksdb/src/main/java/org/apache/hugegraph/rocksdb/access/RocksDBOptions.java index f2fab66bc6..9d380b3356 100644 --- a/hugegraph-store/hg-store-rocksdb/src/main/java/org/apache/hugegraph/rocksdb/access/RocksDBOptions.java +++ b/hugegraph-store/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 LOG_LEVEL = + public static final ConfigOption 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 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 NUM_LEVELS = new ConfigOption<>( diff --git a/hugegraph-store/hg-store-rocksdb/src/main/java/org/apache/hugegraph/rocksdb/access/RocksDBSession.java b/hugegraph-store/hg-store-rocksdb/src/main/java/org/apache/hugegraph/rocksdb/access/RocksDBSession.java index fe27183f18..70299f8f09 100644 --- a/hugegraph-store/hg-store-rocksdb/src/main/java/org/apache/hugegraph/rocksdb/access/RocksDBSession.java +++ b/hugegraph-store/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 index 2965bc855a..2626a1848a 100644 --- a/hugegraph-store/pom.xml +++ b/hugegraph-store/pom.xml @@ -154,7 +154,7 @@ *.tar.gz .flattened-pom.xml - dist/** + apache-hugegraph-incubating-store-1.3.0/** false