You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/06/17 02:02:06 UTC
[incubator-iotdb] branch master updated (b13184a -> 5fdbe9b)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from b13184a remove detail classpath in Win bat scripts (#1377)
add 90c5a4d disable sync by default (#1325)
add 7766000 Merge remote-tracking branch 'origin/master'
add b6beda8 Merge remote-tracking branch 'origin/master'
add a2416e8 Merge remote-tracking branch 'origin/master'
new 63de9f3 Merge remote-tracking branch 'origin/master'
new 5fdbe9b add max_degree_of_index_node and tag_attribute_total_size in starting check
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 48 +++++++++++++++++-----
1 file changed, 38 insertions(+), 10 deletions(-)
[incubator-iotdb] 02/02: add max_degree_of_index_node and
tag_attribute_total_size in starting check
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 5fdbe9b01ce6e2e4c0f8a681e879b8801f6e4d9a
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Jun 17 10:02:12 2020 +0800
add max_degree_of_index_node and tag_attribute_total_size in starting check
---
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 48 +++++++++++++++++-----
1 file changed, 38 insertions(+), 10 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
index f61bd6b..807c5e2 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
@@ -28,6 +28,7 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.metadata.MLogWriter;
import org.apache.iotdb.db.metadata.MetadataConstant;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
+import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer;
import org.slf4j.Logger;
@@ -69,8 +70,16 @@ public class IoTDBConfigCheck {
private static final String ENABLE_PARTITION_STRING = "enable_partition";
private static boolean enablePartition = IoTDBDescriptor.getInstance().getConfig().isEnablePartition();
+ private static final String TAG_ATTRIBUTE_SIZE_STRING = "tag_attribute_total_size";
+ private static final String tagAttributeTotalSize = String.valueOf(IoTDBDescriptor.getInstance().getConfig().getTagAttributeTotalSize());
+
+ private static final String MAX_DEGREE_OF_INDEX_STRING = "max_degree_of_index_node";
+ private static final String maxDegreeOfIndexNode = String.valueOf(TSFileDescriptor.getInstance().getConfig().getMaxDegreeOfIndexNode());
+
private static final String IOTDB_VERSION_STRING = "iotdb_version";
- private static String iotdbVersion = "0.10.0";
+
+ private static final String ERROR_LOG = "Wrong %s, please set as: %s !";
+
public static IoTDBConfigCheck getInstance() {
return IoTDBConfigCheckHolder.INSTANCE;
@@ -81,7 +90,7 @@ public class IoTDBConfigCheck {
}
private IoTDBConfigCheck() {
- logger.info("Starting IoTDB " + iotdbVersion);
+ logger.info("Starting IoTDB " + IoTDBConstant.VERSION);
// check whether SCHEMA_DIR exists, create if not exists
File dir = SystemFileFactory.INSTANCE.getFile(SCHEMA_DIR);
@@ -112,11 +121,13 @@ public class IoTDBConfigCheck {
System.exit(-1);
}
+ systemProperties.put(IOTDB_VERSION_STRING, IoTDBConstant.VERSION);
systemProperties.put(TIMESTAMP_PRECISION_STRING, timestampPrecision);
systemProperties.put(PARTITION_INTERVAL_STRING, String.valueOf(partitionInterval));
systemProperties.put(TSFILE_FILE_SYSTEM_STRING, tsfileFileSystem);
systemProperties.put(ENABLE_PARTITION_STRING, String.valueOf(enablePartition));
- systemProperties.put(IOTDB_VERSION_STRING, iotdbVersion);
+ systemProperties.put(TAG_ATTRIBUTE_SIZE_STRING, tagAttributeTotalSize);
+ systemProperties.put(MAX_DEGREE_OF_INDEX_STRING, maxDegreeOfIndexNode);
}
@@ -193,8 +204,10 @@ public class IoTDBConfigCheck {
try (FileOutputStream tmpFOS = new FileOutputStream(tmpPropertiesFile.toString())) {
properties.setProperty(PARTITION_INTERVAL_STRING, String.valueOf(partitionInterval));
properties.setProperty(TSFILE_FILE_SYSTEM_STRING, tsfileFileSystem);
- properties.setProperty(IOTDB_VERSION_STRING, iotdbVersion);
+ properties.setProperty(IOTDB_VERSION_STRING, IoTDBConstant.VERSION);
properties.setProperty(ENABLE_PARTITION_STRING, String.valueOf(enablePartition));
+ properties.setProperty(TAG_ATTRIBUTE_SIZE_STRING, tagAttributeTotalSize);
+ properties.setProperty(MAX_DEGREE_OF_INDEX_STRING, maxDegreeOfIndexNode);
properties.store(tmpFOS, SYSTEM_PROPERTIES_STRING);
// upgrade finished, delete old system.properties file
@@ -237,6 +250,9 @@ public class IoTDBConfigCheck {
}
}
+ /**
+ * Check all immutable properties
+ */
private void checkProperties() throws IOException {
for (Entry<String, String> entry : systemProperties.entrySet()) {
if (!properties.containsKey(entry.getKey())) {
@@ -246,20 +262,32 @@ public class IoTDBConfigCheck {
}
if (!properties.getProperty(TIMESTAMP_PRECISION_STRING).equals(timestampPrecision)) {
- logger.error("Wrong {}, please set as: {} !", TIMESTAMP_PRECISION_STRING, properties
- .getProperty(TIMESTAMP_PRECISION_STRING));
+ logger.error(String.format(ERROR_LOG, TIMESTAMP_PRECISION_STRING, properties
+ .getProperty(TIMESTAMP_PRECISION_STRING)));
System.exit(-1);
}
if (Long.parseLong(properties.getProperty(PARTITION_INTERVAL_STRING)) != partitionInterval) {
- logger.error("Wrong {}, please set as: {} !", PARTITION_INTERVAL_STRING, properties
- .getProperty(PARTITION_INTERVAL_STRING));
+ logger.error(String.format(ERROR_LOG, PARTITION_INTERVAL_STRING, properties
+ .getProperty(PARTITION_INTERVAL_STRING)));
System.exit(-1);
}
if (!(properties.getProperty(TSFILE_FILE_SYSTEM_STRING).equals(tsfileFileSystem))) {
- logger.error("Wrong {}, please set as: {} !", TSFILE_FILE_SYSTEM_STRING, properties
- .getProperty(TSFILE_FILE_SYSTEM_STRING));
+ logger.error(String.format(ERROR_LOG, TSFILE_FILE_SYSTEM_STRING, properties
+ .getProperty(TSFILE_FILE_SYSTEM_STRING)));
+ System.exit(-1);
+ }
+
+ if (!(properties.getProperty(TAG_ATTRIBUTE_SIZE_STRING).equals(tagAttributeTotalSize))) {
+ logger.error(String.format(ERROR_LOG, TAG_ATTRIBUTE_SIZE_STRING, properties
+ .getProperty(TAG_ATTRIBUTE_SIZE_STRING)));
+ System.exit(-1);
+ }
+
+ if (!(properties.getProperty(MAX_DEGREE_OF_INDEX_STRING).equals(maxDegreeOfIndexNode))) {
+ logger.error(String.format(ERROR_LOG, MAX_DEGREE_OF_INDEX_STRING, properties
+ .getProperty(MAX_DEGREE_OF_INDEX_STRING)));
System.exit(-1);
}
}
[incubator-iotdb] 01/02: Merge remote-tracking branch
'origin/master'
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 63de9f302839ae1920dc2996c85f180f19edf790
Merge: a2416e8 b13184a
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Jun 17 09:54:59 2020 +0800
Merge remote-tracking branch 'origin/master'
RELEASE_NOTES.md | 181 +++++++++++++
distribution/src/assembly/distribution.xml | 40 ++-
docs/UserGuide/Client/Programming - Native API.md | 30 ++-
.../DDL Data Definition Language.md | 8 +-
.../UserGuide/Client/Programming - Native API.md | 34 ++-
.../DDL Data Definition Language.md | 9 +-
.../main/java/org/apache/iotdb/SessionExample.java | 6 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 20 +-
.../test/java/org/apache/iotdb/jdbc/BatchTest.java | 27 +-
.../src/assembly/resources/sbin/start-server.bat | 5 +-
.../assembly/resources/tools/detect-watermark.bat | 4 +-
.../tools/logVisualize/log-visualizer-cmd.bat | 4 +-
.../tools/logVisualize/log-visualizer-gui.bat | 4 +-
.../src/assembly/resources/tools/memory-tool.bat | 4 +-
.../assembly/resources/tools/start-WalChecker.bat | 5 +-
.../assembly/resources/tools/start-sync-client.bat | 5 +-
.../tools/tsfileToolSet/print-iotdb-data-dir.bat | 4 +-
.../tsfileToolSet/print-tsfile-resource-files.bat | 4 +-
.../tools/tsfileToolSet/print-tsfile-sketch.bat | 4 +-
.../resources/tools/upgrade/offline-upgrade.bat | 2 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 6 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 12 +-
.../engine/storagegroup/StorageGroupProcessor.java | 44 +++-
.../db/exception/BatchInsertionException.java | 28 +-
.../org/apache/iotdb/db/metadata/MManager.java | 31 ++-
.../java/org/apache/iotdb/db/metadata/MTree.java | 99 +++++--
.../apache/iotdb/db/qp/executor/IPlanExecutor.java | 4 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 10 +-
.../db/qp/logical/sys/ShowTimeSeriesOperator.java | 9 +-
.../db/qp/physical/sys/ShowTimeSeriesPlan.java | 15 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 154 +++++------
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 61 ++---
.../org/apache/iotdb/db/service/TSServiceImpl.java | 101 +++-----
.../integration/IoTDBSortedShowTimeseriesIT.java | 287 +++++++++++++++++++++
.../apache/iotdb/db/utils/VersionUtilsTest.java | 55 ++++
service-rpc/rpc-changelist.md | 21 ++
.../apache/iotdb/rpc/BatchExecutionException.java | 3 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 39 +--
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 +
service-rpc/src/main/thrift/rpc.thrift | 22 +-
.../java/org/apache/iotdb/session/Session.java | 48 ++--
.../org/apache/iotdb/session/pool/SessionPool.java | 40 +--
.../org/apache/iotdb/session/IoTDBSessionIT.java | 12 +-
.../apache/iotdb/tsfile/utils/VersionUtils.java | 13 +-
44 files changed, 1094 insertions(+), 421 deletions(-)