This is an automated email from the ASF dual-hosted git repository. chaow pushed a commit to branch make_config_consistent in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit bc71ce6c642ce0333e8ebd27779a848b8f06b04a Author: chaow <[email protected]> AuthorDate: Fri Apr 23 16:47:20 2021 +0800 make version change easy --- antlr/pom.xml | 2 +- cli/pom.xml | 4 ++-- client-cpp/pom.xml | 2 +- client-py/pom.xml | 2 +- cluster/pom.xml | 14 +++++++------- .../src/assembly/resources/conf/iotdb-cluster.properties | 2 +- .../org/apache/iotdb/cluster/config/ClusterConfig.java | 6 +++--- code-coverage/pom.xml | 2 +- compile-tools/pom.xml | 4 ++-- compile-tools/thrift/pom.xml | 2 +- cross-tests/pom.xml | 2 +- distribution/pom.xml | 2 +- example/client-cpp-example/pom.xml | 2 +- example/flink/pom.xml | 2 +- example/hadoop/pom.xml | 6 +++--- example/jdbc/pom.xml | 2 +- example/kafka/pom.xml | 2 +- example/mqtt/pom.xml | 2 +- example/pom.xml | 2 +- example/pulsar/pom.xml | 2 +- example/rocketmq/pom.xml | 2 +- example/session/pom.xml | 2 +- example/tsfile/pom.xml | 2 +- example/udf/pom.xml | 4 ++-- flink-iotdb-connector/pom.xml | 2 +- flink-tsfile-connector/pom.xml | 2 +- grafana/pom.xml | 2 +- hadoop/pom.xml | 4 ++-- hive-connector/pom.xml | 7 +++---- jdbc/pom.xml | 2 +- pom.xml | 3 ++- server/pom.xml | 2 +- server/src/assembly/resources/conf/iotdb-engine.properties | 2 +- .../main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 6 +++--- service-rpc/pom.xml | 2 +- .../src/main/java/org/apache/iotdb/rpc/RpcUtils.java | 2 +- session/pom.xml | 2 +- spark-iotdb-connector/pom.xml | 2 +- spark-tsfile/pom.xml | 4 ++-- thrift-cluster/pom.xml | 2 +- thrift-sync/pom.xml | 2 +- thrift/pom.xml | 2 +- tsfile/pom.xml | 2 +- zeppelin-interpreter/pom.xml | 2 +- 44 files changed, 64 insertions(+), 64 deletions(-) diff --git a/antlr/pom.xml b/antlr/pom.xml index f6b9f2d..076d4ff 100644 --- a/antlr/pom.xml +++ b/antlr/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-antlr</artifactId> diff --git a/cli/pom.xml b/cli/pom.xml index 9842822..11ce20b 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-cli</artifactId> @@ -72,7 +72,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-server</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/client-cpp/pom.xml b/client-cpp/pom.xml index 4d205f4..b020e7f 100644 --- a/client-cpp/pom.xml +++ b/client-cpp/pom.xml @@ -24,7 +24,7 @@ <parent> <artifactId>iotdb-parent</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>client-cpp</artifactId> diff --git a/client-py/pom.xml b/client-py/pom.xml index c677dea..94bdc87 100644 --- a/client-py/pom.xml +++ b/client-py/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-python-api</artifactId> diff --git a/cluster/pom.xml b/cluster/pom.xml index f074aa1..27b13fd 100644 --- a/cluster/pom.xml +++ b/cluster/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-cluster</artifactId> @@ -58,7 +58,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>service-rpc</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.apache.thrift</groupId> @@ -69,7 +69,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-server</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.apache.thrift</groupId> @@ -84,7 +84,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-thrift-cluster</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> <exclusions> <exclusion> <groupId>org.apache.thrift</groupId> @@ -96,20 +96,20 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-server</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-session</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-jdbc</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> <scope>compile</scope> </dependency> <dependency> diff --git a/cluster/src/assembly/resources/conf/iotdb-cluster.properties b/cluster/src/assembly/resources/conf/iotdb-cluster.properties index 079b124..e92e2a7 100644 --- a/cluster/src/assembly/resources/conf/iotdb-cluster.properties +++ b/cluster/src/assembly/resources/conf/iotdb-cluster.properties @@ -86,7 +86,7 @@ default_replica_num=3 # so the leader will send logs(snapshot) to the follower, # NOTICE, it may cost minutes of time to send a snapshot, # so this parameter should be larger than the snapshot cost time. -# catch_up_timeout_ms=300000 +# catch_up_timeout_ms=600000 # whether to use batch append entries in log catch up # use_batch_in_catch_up=true diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java index 241dc82..4894ba6 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/config/ClusterConfig.java @@ -60,10 +60,10 @@ public class ClusterConfig { private boolean useBatchInLogCatchUp = true; /** max number of committed logs to be saved */ - private int minNumOfLogsInMem = 100; + private int minNumOfLogsInMem = 1000; /** max number of committed logs in memory */ - private int maxNumOfLogsInMem = 1000; + private int maxNumOfLogsInMem = 2000; /** max memory size of committed logs in memory, default 512M */ private long maxMemorySizeForRaftLog = 536870912; @@ -142,7 +142,7 @@ public class ClusterConfig { /** The maximum number of logs saved on the disk */ private int maxPersistRaftLogNumberOnDisk = 1_000_000; - private boolean enableUsePersistLogOnDiskToCatchUp = false; + private boolean enableUsePersistLogOnDiskToCatchUp = true; /** * The number of logs read on the disk at one time, which is mainly used to control the memory diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml index 3f27bd9..db50a78 100644 --- a/code-coverage/pom.xml +++ b/code-coverage/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${package.version}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-code-coverage</artifactId> diff --git a/compile-tools/pom.xml b/compile-tools/pom.xml index a4c0447..c3ad609 100644 --- a/compile-tools/pom.xml +++ b/compile-tools/pom.xml @@ -20,9 +20,9 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>iotdb-parent</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.12.1-SNAPSHOT</version> + <artifactId>iotdb-parent</artifactId> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>client-cpp-tools</artifactId> diff --git a/compile-tools/thrift/pom.xml b/compile-tools/thrift/pom.xml index a93e23a..b97c0ae 100644 --- a/compile-tools/thrift/pom.xml +++ b/compile-tools/thrift/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>client-cpp-tools</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>client-cpp-tools-thrift</artifactId> diff --git a/cross-tests/pom.xml b/cross-tests/pom.xml index 0df4043..bb4909b 100644 --- a/cross-tests/pom.xml +++ b/cross-tests/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>iotdb-parent</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>cross-tests</artifactId> diff --git a/distribution/pom.xml b/distribution/pom.xml index e4e72f9..7f075d7 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-distribution</artifactId> diff --git a/example/client-cpp-example/pom.xml b/example/client-cpp-example/pom.xml index 451627e..21ba951 100644 --- a/example/client-cpp-example/pom.xml +++ b/example/client-cpp-example/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-examples</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>client-cpp-example</artifactId> diff --git a/example/flink/pom.xml b/example/flink/pom.xml index 9450363..6b73d9a 100644 --- a/example/flink/pom.xml +++ b/example/flink/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-examples</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>flink-example</artifactId> diff --git a/example/hadoop/pom.xml b/example/hadoop/pom.xml index cdfbd15..e72bd37 100644 --- a/example/hadoop/pom.xml +++ b/example/hadoop/pom.xml @@ -24,17 +24,17 @@ <parent> <artifactId>iotdb-examples</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>hadoop-example</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <name>hadoop-example</name> <dependencies> <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>hadoop-tsfile</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> </project> diff --git a/example/jdbc/pom.xml b/example/jdbc/pom.xml index c72a6a5..499199a 100644 --- a/example/jdbc/pom.xml +++ b/example/jdbc/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>iotdb-examples</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jdbc-example</artifactId> diff --git a/example/kafka/pom.xml b/example/kafka/pom.xml index 6133711..272787c 100644 --- a/example/kafka/pom.xml +++ b/example/kafka/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-examples</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>kafka-example</artifactId> diff --git a/example/mqtt/pom.xml b/example/mqtt/pom.xml index 44ae558..f11f943 100644 --- a/example/mqtt/pom.xml +++ b/example/mqtt/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-examples</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>mqtt-example</artifactId> diff --git a/example/pom.xml b/example/pom.xml index a3bb4bc..0dd1d98 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <packaging>pom</packaging> diff --git a/example/pulsar/pom.xml b/example/pulsar/pom.xml index 881e616..f76ad58 100644 --- a/example/pulsar/pom.xml +++ b/example/pulsar/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>iotdb-examples</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/example/rocketmq/pom.xml b/example/rocketmq/pom.xml index 3281c2f..fe8ec63 100644 --- a/example/rocketmq/pom.xml +++ b/example/rocketmq/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-examples</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>rocketmq-example</artifactId> diff --git a/example/session/pom.xml b/example/session/pom.xml index 33682d3..9b9d86d 100644 --- a/example/session/pom.xml +++ b/example/session/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>iotdb-examples</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>client-example</artifactId> diff --git a/example/tsfile/pom.xml b/example/tsfile/pom.xml index 3bdea5a..1e998f7 100644 --- a/example/tsfile/pom.xml +++ b/example/tsfile/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-examples</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>tsfile-example</artifactId> diff --git a/example/udf/pom.xml b/example/udf/pom.xml index 8410382..89a1b4d 100644 --- a/example/udf/pom.xml +++ b/example/udf/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-examples</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>udf-example</artifactId> @@ -32,7 +32,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-server</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/flink-iotdb-connector/pom.xml b/flink-iotdb-connector/pom.xml index a959663..3e82b24 100644 --- a/flink-iotdb-connector/pom.xml +++ b/flink-iotdb-connector/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>flink-iotdb-connector</artifactId> diff --git a/flink-tsfile-connector/pom.xml b/flink-tsfile-connector/pom.xml index 96cf40e..350b488 100644 --- a/flink-tsfile-connector/pom.xml +++ b/flink-tsfile-connector/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>flink-tsfile-connector</artifactId> diff --git a/grafana/pom.xml b/grafana/pom.xml index 02356c4..ec7f2cd 100644 --- a/grafana/pom.xml +++ b/grafana/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <!--parent> diff --git a/hadoop/pom.xml b/hadoop/pom.xml index d7bff58..a626c09 100644 --- a/hadoop/pom.xml +++ b/hadoop/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>hadoop-tsfile</artifactId> @@ -40,7 +40,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>tsfile</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> diff --git a/hive-connector/pom.xml b/hive-connector/pom.xml index 227b485..4591b17 100644 --- a/hive-connector/pom.xml +++ b/hive-connector/pom.xml @@ -22,13 +22,12 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>iotdb-parent</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.12.1-SNAPSHOT</version> + <artifactId>iotdb-parent</artifactId> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>hive-connector</artifactId> - <version>0.12.1-SNAPSHOT</version> <packaging>jar</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -38,7 +37,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>hadoop-tsfile</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.hive</groupId> diff --git a/jdbc/pom.xml b/jdbc/pom.xml index d341267..da76b42 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-jdbc</artifactId> diff --git a/pom.xml b/pom.xml index f51e4ce..1a016bc 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ </parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <packaging>pom</packaging> <name>Apache IoTDB Project Parent POM</name> <description>This is the top level project that builds, packages the tsfile, iotdb engine, jdbc, and integration libs.</description> @@ -156,6 +156,7 @@ <!-- disable enforcer by default--> <enforcer.skip>true</enforcer.skip> <spotless.version>2.4.2</spotless.version> + <revision>0.12.1-SNAPSHOT</revision> </properties> <!-- if we claim dependencies in dependencyManagement, then we do not claim diff --git a/server/pom.xml b/server/pom.xml index a01a232..0cd7484 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-server</artifactId> diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties index 521c0b9..94ad410 100644 --- a/server/src/assembly/resources/conf/iotdb-engine.properties +++ b/server/src/assembly/resources/conf/iotdb-engine.properties @@ -43,7 +43,7 @@ rpc_port=6667 # rpc_max_concurrent_client_num=65535 # thrift max frame size, 64MB by default -# thrift_max_frame_size=67108864 +# thrift_max_frame_size=536870912 # thrift init buffer size # thrift_init_buffer_size=1024 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 10c9d87..a15ccfc 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 @@ -118,7 +118,7 @@ public class IoTDBConfig { private long allocateMemoryForSchema = Runtime.getRuntime().maxMemory() * 1 / 10; /** Memory allocated for the read process besides cache */ - private long allocateMemoryForReadWithoutCache = Runtime.getRuntime().maxMemory() * 9 / 100; + private long allocateMemoryForReadWithoutCache = allocateMemoryForRead * 3 / 10; private volatile int maxQueryDeduplicatedPathNum = 1000; @@ -272,7 +272,7 @@ public class IoTDBConfig { private long memtableSizeThreshold = 1024 * 1024 * 1024L; /** When average series point number reaches this, flush the memtable to disk */ - private int avgSeriesPointNumberThreshold = 100000; + private int avgSeriesPointNumberThreshold = 10000; /** * Work when tsfile_manage_strategy is level_strategy. When merge point number reaches this, merge @@ -530,7 +530,7 @@ public class IoTDBConfig { private String kerberosKeytabFilePath = "/path"; /** kerberos principal */ - private String kerberosPrincipal = "principal"; + private String kerberosPrincipal = "your principal"; /** the num of memtable in each storage group */ private int concurrentWritingTimePartition = 1; diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml index 17f6014..5eca9a7 100644 --- a/service-rpc/pom.xml +++ b/service-rpc/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>service-rpc</artifactId> diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java b/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java index df5ef19..4cfc743 100644 --- a/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java +++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/RpcUtils.java @@ -38,7 +38,7 @@ import java.util.Map; public class RpcUtils { /** How big should the default read and write buffers be? Defaults to 64KB */ - public static final int THRIFT_DEFAULT_BUF_CAPACITY = 64 * 1024; + public static final int THRIFT_DEFAULT_BUF_CAPACITY = 1024; /** * It is used to prevent the size of the parsing package from being too large and allocating the * buffer will cause oom. Therefore, the maximum length of the requested memory is limited when diff --git a/session/pom.xml b/session/pom.xml index 396f711..6dbabdc 100644 --- a/session/pom.xml +++ b/session/pom.xml @@ -23,7 +23,7 @@ <parent> <artifactId>iotdb-parent</artifactId> <groupId>org.apache.iotdb</groupId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/spark-iotdb-connector/pom.xml b/spark-iotdb-connector/pom.xml index e1ed83c..ea1dbd0 100644 --- a/spark-iotdb-connector/pom.xml +++ b/spark-iotdb-connector/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>spark-iotdb-connector</artifactId> diff --git a/spark-tsfile/pom.xml b/spark-tsfile/pom.xml index f317f4a..4d15e73 100644 --- a/spark-tsfile/pom.xml +++ b/spark-tsfile/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>spark-tsfile</artifactId> @@ -39,7 +39,7 @@ <dependency> <groupId>org.apache.iotdb</groupId> <artifactId>hadoop-tsfile</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.spark</groupId> diff --git a/thrift-cluster/pom.xml b/thrift-cluster/pom.xml index fa8359f..0c37bf7 100644 --- a/thrift-cluster/pom.xml +++ b/thrift-cluster/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-thrift-cluster</artifactId> diff --git a/thrift-sync/pom.xml b/thrift-sync/pom.xml index ced74db..81dda1f 100644 --- a/thrift-sync/pom.xml +++ b/thrift-sync/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-thrift-sync</artifactId> diff --git a/thrift/pom.xml b/thrift/pom.xml index 4ddba8a..0be6af6 100644 --- a/thrift/pom.xml +++ b/thrift/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>iotdb-thrift</artifactId> diff --git a/tsfile/pom.xml b/tsfile/pom.xml index f99659c..3015822 100644 --- a/tsfile/pom.xml +++ b/tsfile/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>tsfile</artifactId> diff --git a/zeppelin-interpreter/pom.xml b/zeppelin-interpreter/pom.xml index 773d4fb..fb44289 100644 --- a/zeppelin-interpreter/pom.xml +++ b/zeppelin-interpreter/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.iotdb</groupId> <artifactId>iotdb-parent</artifactId> - <version>0.12.1-SNAPSHOT</version> + <version>${revision}</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>zeppelin-iotdb</artifactId>
