This is an automated email from the ASF dual-hosted git repository. jiangtian pushed a commit to branch fix_default_directory in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 9855f06f8e52bfa0dd5a885a4ed86263aad775b7 Author: jt2594838 <[email protected]> AuthorDate: Mon Feb 24 10:30:53 2020 +0800 fix default directories --- .../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 ++++++------ server/src/test/resources/logback.xml | 9 ++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index 88a3e55..8e8ed0f 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@ -117,27 +117,27 @@ public class IoTDBConfig { /** * System directory, including version file for each storage group and metadata */ - private String systemDir = "data/system"; + private String systemDir = "data" + File.separator + "system"; /** * Schema directory, including storage set of values. */ - private String schemaDir = "data/system/schema"; + private String schemaDir = "data" + File.separator + "system" + File.separator + "schema"; /** * Sync directory, including the lock file, uuid file, device owner map */ - private String syncDir = "data/system/sync"; + private String syncDir = "data" + File.separator + "system" + File.separator + "sync"; /** * Query directory, stores temporary files of query */ - private String queryDir = "data/query"; + private String queryDir = "data" + File.separator + "query"; /** * Data directory of data. It can be settled as dataDirs = {"data1", "data2", "data3"}; */ - private String[] dataDirs = {"data/data"}; + private String[] dataDirs = {"data" + File.separator + "data"}; /** * Strategy of multiple directories. @@ -147,7 +147,7 @@ public class IoTDBConfig { /** * Wal directory. */ - private String walFolder = "data/wal"; + private String walFolder = "data" + File.separator + "wal"; /** * Maximum MemTable number in MemTable pool. diff --git a/server/src/test/resources/logback.xml b/server/src/test/resources/logback.xml index eda1ec4..8128729 100644 --- a/server/src/test/resources/logback.xml +++ b/server/src/test/resources/logback.xml @@ -35,17 +35,16 @@ </appender> <!--<logger name="org.apache.iotdb.db.utils.OpenFileNumUtil" level="debug" />--> <!--<logger name="org.apache.iotdb.db.utils.OpenFileNumUtilTest" level="debug" />--> - <!-- do not print "Can't get the cpu ratio,because this OS:mac os x is not support in test"--> - <logger name="org.apache.iotdb.db.metrics.server.ServerArgument" level="ERROR" /> + <logger name="org.apache.iotdb.db.metrics.server.ServerArgument" level="ERROR"/> <!-- enable me if you want to monitor when files are opened and closed. <logger name="FileMonitor" level="info"/> --> <logger name="org.apache.iotdb.db.engine.merge" level="DEBUG"/> <logger name="org.eclipse.jetty.util.thread.QueuedThreadPool" level="DEBUG"/> - <logger name="org.apache.iotdb.db.service.MetricsService" level="INFO" /> - <logger name="org.apache.iotdb.db.engine.flush.FlushManager" level="INFO" /> - <logger name="org.apache.iotdb.db.integration.IoTDBMergeTest" level="INFO" /> + <logger name="org.apache.iotdb.db.service.MetricsService" level="INFO"/> + <logger name="org.apache.iotdb.db.engine.flush.FlushManager" level="INFO"/> + <logger name="org.apache.iotdb.db.integration.IoTDBMergeTest" level="INFO"/> <root level="WARN"> <appender-ref ref="stdout"/> </root>
