You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/12/14 07:02:25 UTC
[iotdb] branch change_rpc_port updated (70ca15a -> 0ea4796)
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a change to branch change_rpc_port
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 70ca15a add internal_ip; move replacePropers to ClusterMain
add 6cb930d Remove useless imports in python client (#2210)
add 6fa424c add 0.11 file check (#2225)
add 27c28a1 Change variable names makes the logic easier to understand
add 4fc4cf2 Merge pull request #2232 from liutaohua/add_comment
add 3982645 Fix the dash in the data model doc (#2234)
add baa317e Fix the spelling of storage group in the server file list doc (#2235)
add db49dae [IOTDB-1049] Fix Nullpointer exception and a delete bug in Last query (#2229)
add 678c2bf [To rel/0.11] Fix sync failed bug (#2241) (#2242)
add baa557d Remove useless escaped characters (#2207)
add 425d985 Clarify the data type when type conversion in batch mode (#2208)
add 20fabd3 add examples for setting fetchSize of session and JDBC (#2244)
add 69dbcfa update download links (#2249)
add ca24aaf fix error in site/config.js.
add 5a1ba81 [IoTDB-1051] Fix duplicate declaration of plugin :maven-assembly-plugin in hadoop/pom.xml
add 61db87b fix start-node script
add c8bc153 fix
add d7e291c Merge pull request #2223 from LebronAl/cluster_fix_auto_create_schema_bug
add 9e2a8f7 fix
add 2455b69 Merge pull request #2252 from LebronAl/cluster_dispatcher_build_request_optimize
add 2bd067b [To rel/0.11] Remove unnecessary dependency of com.clearspring.analytics:stream and fastutil (#2254) (#2255)
add f2e7413 getObject should not return String for all data types (#2247)
add 9431e53 [IOTDB-1050] Fix Count timeserise column name is wrong (#2238)
add 0288b76 Eliminate boost build logs to avoid exceeding maximum log length
add bc02a56 disable travis for cpp module
add 3c266e0 enable deploying the website automatically
add a98eca4 fix tools declaration in Jenkinsfile
add 6a5e527 [IOTDB-507] Add zeppelin-interpreter module (#2096)
add 316f30d fix doc error
add c666c3a Merge pull request #2260 from neuyilan/apache_master_1213_fix_docs
add 6787a2e Avoid overflow by converting to long (#2209)
add bf11ac5 [IOTDB-1054] Remove unsupported compress type like GZIP, LZO etc (#2262)
add c8cf5c9 [IOTDB-1053] Optimize enum `CompressionType` (#2261)
new 0ea4796 Merge remote-tracking branch 'origin/master' into change_rpc_port
The 1 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:
.travis.yml | 2 +-
Jenkinsfile | 29 +-
LICENSE-binary | 2 -
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 4 -
.../java/org/apache/iotdb/cli/AbstractCli.java | 110 +-----
cli/src/main/java/org/apache/iotdb/cli/Cli.java | 5 +-
cli/src/main/java/org/apache/iotdb/cli/WinCli.java | 5 +-
.../main/java/org/apache/iotdb/tool/ExportCsv.java | 4 +-
.../java/org/apache/iotdb/cli/AbstractCliIT.java | 35 +-
client-py/src/iotdb/Session.py | 1 -
client-py/src/iotdb/utils/RowRecord.py | 1 -
cluster/src/assembly/resources/sbin/add-node.bat | 6 +-
cluster/src/assembly/resources/sbin/add-node.sh | 6 +-
cluster/src/assembly/resources/sbin/start-node.bat | 8 +-
cluster/src/assembly/resources/sbin/start-node.sh | 6 +-
.../java/org/apache/iotdb/cluster/ClusterMain.java | 9 +-
.../apache/iotdb/cluster/log/LogDispatcher.java | 4 +-
.../cluster/log/applier/AsyncDataLogApplier.java | 4 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 21 +-
.../iotdb/cluster/query/LocalQueryExecutor.java | 2 +-
.../cluster/server/member/MetaGroupMember.java | 4 +-
compile-tools/boost/pom.xml | 4 +
docs/Download/README.md | 16 +-
docs/UserGuide/Server/Cluster Setup.md | 10 +-
docs/UserGuide/Server/ServerFileList.md | 3 +-
docs/zh/Download/README.md | 16 +-
.../Concept/Data Model and Terminology.md | 3 +-
docs/zh/UserGuide/Server/Cluster Setup.md | 14 +-
docs/zh/UserGuide/Server/ServerFileList.md | 3 +-
.../main/java/org/apache/iotdb/JDBCExample.java | 4 +
.../main/java/org/apache/iotdb/SessionExample.java | 3 +
hadoop/pom.xml | 20 --
pom.xml | 12 +-
server/pom.xml | 5 -
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 18 +-
.../apache/iotdb/db/index/common/IndexUtils.java | 4 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +-
.../iotdb/db/qp/physical/crud/LastQueryPlan.java | 2 +-
.../db/query/dataset/ShowTimeseriesDataSet.java | 7 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 9 +-
.../db/query/executor/fill/LastPointReader.java | 3 +-
.../iotdb/db/sync/sender/transfer/SyncClient.java | 4 +-
.../iotdb/db/utils/datastructure/TVList.java | 6 +-
.../apache/iotdb/db/integration/IOTDBInsertIT.java | 4 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 12 +-
.../iotdb/db/integration/IoTDBDeletionIT.java | 14 +-
.../apache/iotdb/db/integration/IoTDBLastIT.java | 75 ++--
.../iotdb/db/integration/IoTDBRecoverIT.java | 14 +-
.../db/integration/IoTDBRecoverUnclosedIT.java | 12 +-
.../iotdb/db/integration/IoTDBResultSetIT.java | 4 +-
.../iotdb/db/query/dataset/ListDataSetTest.java | 126 +++++++
.../iotdb/db/query/dataset/SingleDataSetTest.java | 133 ++++++++
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 43 ++-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 90 +++++
.../java/org/apache/iotdb/session/Session.java | 6 +
.../iotdb/session/IoTDBSessionComplexIT.java | 2 +-
.../iotdb/session/IoTDBSessionIteratorIT.java | 178 ++++++++--
site/README-zh.md | 2 +-
site/README.md | 2 +-
site/src/main/.vuepress/config.js | 4 +-
spark-iotdb-connector/pom.xml | 6 -
.../apache/iotdb/spark/db/EnvironmentUtils.java | 12 +-
.../file/metadata/enums/CompressionType.java | 118 ++++---
.../tsfile/read/common/DescReadWriteBatchData.java | 24 +-
zeppelin-interpreter/IoTDB-Zeppelin-Demo.zpln | 377 +++++++++++++++++++++
zeppelin-interpreter/README.md | 186 ++++++++++
zeppelin-interpreter/pom.xml | 126 +++++++
.../apache/zeppelin/iotdb/IoTDBInterpreter.java | 213 ++++++++++++
.../src/main/resources/interpreter-setting.json | 70 ++++
.../zeppelin/iotdb/IoTDBInterpreterTest.java | 273 +++++++++++++++
70 files changed, 2111 insertions(+), 451 deletions(-)
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/ListDataSetTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/SingleDataSetTest.java
create mode 100644 zeppelin-interpreter/IoTDB-Zeppelin-Demo.zpln
create mode 100644 zeppelin-interpreter/README.md
create mode 100644 zeppelin-interpreter/pom.xml
create mode 100644 zeppelin-interpreter/src/main/java/org/apache/zeppelin/iotdb/IoTDBInterpreter.java
create mode 100644 zeppelin-interpreter/src/main/resources/interpreter-setting.json
create mode 100644 zeppelin-interpreter/src/test/java/org/apache/zeppelin/iotdb/IoTDBInterpreterTest.java
[iotdb] 01/01: Merge remote-tracking branch 'origin/master' into
change_rpc_port
Posted by hx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch change_rpc_port
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0ea4796183735f1058056d2452ed9fe51ddc392d
Merge: 70ca15a c8cf5c9
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Dec 14 14:57:35 2020 +0800
Merge remote-tracking branch 'origin/master' into change_rpc_port
.travis.yml | 2 +-
Jenkinsfile | 29 +-
LICENSE-binary | 2 -
.../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 4 -
.../java/org/apache/iotdb/cli/AbstractCli.java | 110 +-----
cli/src/main/java/org/apache/iotdb/cli/Cli.java | 5 +-
cli/src/main/java/org/apache/iotdb/cli/WinCli.java | 5 +-
.../main/java/org/apache/iotdb/tool/ExportCsv.java | 4 +-
.../java/org/apache/iotdb/cli/AbstractCliIT.java | 35 +-
client-py/src/iotdb/Session.py | 1 -
client-py/src/iotdb/utils/RowRecord.py | 1 -
cluster/src/assembly/resources/sbin/add-node.bat | 6 +-
cluster/src/assembly/resources/sbin/add-node.sh | 6 +-
cluster/src/assembly/resources/sbin/start-node.bat | 8 +-
cluster/src/assembly/resources/sbin/start-node.sh | 6 +-
.../java/org/apache/iotdb/cluster/ClusterMain.java | 9 +-
.../apache/iotdb/cluster/log/LogDispatcher.java | 4 +-
.../cluster/log/applier/AsyncDataLogApplier.java | 4 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 21 +-
.../iotdb/cluster/query/LocalQueryExecutor.java | 2 +-
.../cluster/server/member/MetaGroupMember.java | 4 +-
compile-tools/boost/pom.xml | 4 +
docs/Download/README.md | 16 +-
docs/UserGuide/Server/Cluster Setup.md | 10 +-
docs/UserGuide/Server/ServerFileList.md | 3 +-
docs/zh/Download/README.md | 16 +-
.../Concept/Data Model and Terminology.md | 3 +-
docs/zh/UserGuide/Server/Cluster Setup.md | 14 +-
docs/zh/UserGuide/Server/ServerFileList.md | 3 +-
.../main/java/org/apache/iotdb/JDBCExample.java | 4 +
.../main/java/org/apache/iotdb/SessionExample.java | 3 +
hadoop/pom.xml | 20 --
pom.xml | 12 +-
server/pom.xml | 5 -
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 18 +-
.../apache/iotdb/db/index/common/IndexUtils.java | 4 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +-
.../iotdb/db/qp/physical/crud/LastQueryPlan.java | 2 +-
.../db/query/dataset/ShowTimeseriesDataSet.java | 7 +-
.../iotdb/db/query/executor/LastQueryExecutor.java | 9 +-
.../db/query/executor/fill/LastPointReader.java | 3 +-
.../iotdb/db/sync/sender/transfer/SyncClient.java | 4 +-
.../iotdb/db/utils/datastructure/TVList.java | 6 +-
.../apache/iotdb/db/integration/IOTDBInsertIT.java | 4 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 12 +-
.../iotdb/db/integration/IoTDBDeletionIT.java | 14 +-
.../apache/iotdb/db/integration/IoTDBLastIT.java | 75 ++--
.../iotdb/db/integration/IoTDBRecoverIT.java | 14 +-
.../db/integration/IoTDBRecoverUnclosedIT.java | 12 +-
.../iotdb/db/integration/IoTDBResultSetIT.java | 4 +-
.../iotdb/db/query/dataset/ListDataSetTest.java | 126 +++++++
.../iotdb/db/query/dataset/SingleDataSetTest.java | 133 ++++++++
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 43 ++-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 90 +++++
.../java/org/apache/iotdb/session/Session.java | 6 +
.../iotdb/session/IoTDBSessionComplexIT.java | 2 +-
.../iotdb/session/IoTDBSessionIteratorIT.java | 178 ++++++++--
site/README-zh.md | 2 +-
site/README.md | 2 +-
site/src/main/.vuepress/config.js | 4 +-
spark-iotdb-connector/pom.xml | 6 -
.../apache/iotdb/spark/db/EnvironmentUtils.java | 12 +-
.../file/metadata/enums/CompressionType.java | 118 ++++---
.../tsfile/read/common/DescReadWriteBatchData.java | 24 +-
zeppelin-interpreter/IoTDB-Zeppelin-Demo.zpln | 377 +++++++++++++++++++++
zeppelin-interpreter/README.md | 186 ++++++++++
zeppelin-interpreter/pom.xml | 126 +++++++
.../apache/zeppelin/iotdb/IoTDBInterpreter.java | 213 ++++++++++++
.../src/main/resources/interpreter-setting.json | 70 ++++
.../zeppelin/iotdb/IoTDBInterpreterTest.java | 273 +++++++++++++++
70 files changed, 2111 insertions(+), 451 deletions(-)
diff --cc docs/UserGuide/Server/Cluster Setup.md
index bf61a3f,3945057..2a5ff8d
--- a/docs/UserGuide/Server/Cluster Setup.md
+++ b/docs/UserGuide/Server/Cluster Setup.md
@@@ -61,19 -61,19 +61,19 @@@ When both exist, the specified configur
> sed -i -e 's/6667/6669/g' ./cluster/target/cluster-0.11.0-SNAPSHOT2/conf/iotdb-engine.properties
# Second step: Unix/OS X/Windows (git bash or WSL)
- > sed -i -e 's/31999/32000/g' ./cluster/target/cluster-0.11.0-SNAPSHOT1/conf/cluster-env.sh
- > sed -i -e 's/31999/32001/g' ./cluster/target/cluster-0.11.0-SNAPSHOT2/conf/cluster-env.sh
+ > sed -i -e 's/31999/32000/g' ./cluster/target/cluster-0.11.0-SNAPSHOT1/conf/iotdb-env.sh
+ > sed -i -e 's/31999/32001/g' ./cluster/target/cluster-0.11.0-SNAPSHOT2/conf/iotdb-env.sh
> chmod -R 777 ./cluster/target/
> nohup ./cluster/target/cluster-0.11.0-SNAPSHOT/sbin/start-node.sh >/dev/null 2>&1 &
-> nohup ./cluster/target/cluster-0.11.0-SNAPSHOT1/sbin/start-node.sh -internal_meta_port 9005 -internal_data_port 40012 -cluster_rpc_port 55561 >/dev/null 2>&1 &
-> nohup ./cluster/target/cluster-0.11.0-SNAPSHOT2/sbin/start-node.sh -internal_meta_port 9007 -internal_data_port 40014 -cluster_rpc_port 55562 >/dev/null 2>&1 &
+> nohup ./cluster/target/cluster-0.11.0-SNAPSHOT1/sbin/start-node.sh -internal_meta_port 9005 -internal_data_port 40012 -cluster_rpc_port 6668 >/dev/null 2>&1 &
+> nohup ./cluster/target/cluster-0.11.0-SNAPSHOT2/sbin/start-node.sh -internal_meta_port 9007 -internal_data_port 40014 -cluster_rpc_port 6669 >/dev/null 2>&1 &
# Second step: Windows (MinGW)
- > sed -i -e 's/31999/32000/g' cluster\target\cluster-0.11.0-SNAPSHOT\conf\cluster-env.bat
- > sed -i -e 's/31999/32001/g' cluster\target\cluster-0.11.0-SNAPSHOT\conf\cluster-env.bat
+ > sed -i -e 's/31999/32000/g' cluster\target\cluster-0.11.0-SNAPSHOT\conf\iotdb-env.bat
+ > sed -i -e 's/31999/32001/g' cluster\target\cluster-0.11.0-SNAPSHOT\conf\iotdb-env.bat
> nohup cluster\target\cluster-0.11.0-SNAPSHOT\sbin\start-node.bat
-> nohup cluster\target\cluster-0.11.0-SNAPSHOT1\sbin\start-node.bat -internal_meta_port 9005 -internal_data_port 40012 -cluster_rpc_port 55561
-> nohup cluster\target\cluster-0.11.0-SNAPSHOT2\sbin\start-node.bat -internal_meta_port 9007 -internal_data_port 40014 -cluster_rpc_port 55562
+> nohup cluster\target\cluster-0.11.0-SNAPSHOT1\sbin\start-node.bat -internal_meta_port 9005 -internal_data_port 40012 -cluster_rpc_port 6668
+> nohup cluster\target\cluster-0.11.0-SNAPSHOT2\sbin\start-node.bat -internal_meta_port 9007 -internal_data_port 40014 -cluster_rpc_port 6669
```
Note: The distributed version uses the 707 identifier to instruct the client to do the appropriate metadata cache so that the data can then be sent directly to the leader of the corresponding data group later.
diff --cc docs/zh/UserGuide/Server/Cluster Setup.md
index 71bc7d7,87a3445..7a27fdd
--- a/docs/zh/UserGuide/Server/Cluster Setup.md
+++ b/docs/zh/UserGuide/Server/Cluster Setup.md
@@@ -55,19 -55,19 +55,19 @@@ o
> sed -i -e 's/6667/6669/g' ./cluster/target/cluster-0.11.0-SNAPSHOT2/conf/iotdb-engine.properties
# 第二步: Unix/OS X/Windows (git bash or WSL)
- > sed -i -e 's/31999/32000/g' ./cluster/target/cluster-0.11.0-SNAPSHOT1/conf/cluster-env.sh
- > sed -i -e 's/31999/32001/g' ./cluster/target/cluster-0.11.0-SNAPSHOT2/conf/cluster-env.sh
+ > sed -i -e 's/31999/32000/g' ./cluster/target/cluster-0.11.0-SNAPSHOT1/conf/iotdb-env.sh
+ > sed -i -e 's/31999/32001/g' ./cluster/target/cluster-0.11.0-SNAPSHOT2/conf/iotdb-env.sh
> chmod -R 777 ./cluster/target/
> nohup ./cluster/target/cluster-0.11.0-SNAPSHOT/sbin/start-node.sh >/dev/null 2>&1 &
-> nohup ./cluster/target/cluster-0.11.0-SNAPSHOT1/sbin/start-node.sh -internal_meta_port 9005 -internal_data_port 40012 -cluster_rpc_port 55561 >/dev/null 2>&1 &
-> nohup ./cluster/target/cluster-0.11.0-SNAPSHOT2/sbin/start-node.sh -internal_meta_port 9007 -internal_data_port 40014 -cluster_rpc_port 55562 >/dev/null 2>&1 &
+> nohup ./cluster/target/cluster-0.11.0-SNAPSHOT1/sbin/start-node.sh -internal_meta_port 9005 -internal_data_port 40012 -cluster_rpc_port 6668 >/dev/null 2>&1 &
+> nohup ./cluster/target/cluster-0.11.0-SNAPSHOT2/sbin/start-node.sh -internal_meta_port 9007 -internal_data_port 40014 -cluster_rpc_port 6669 >/dev/null 2>&1 &
# 第二步: Windows (MinGW)
- > sed -i -e 's/31999/32000/g' cluster\target\cluster-0.11.0-SNAPSHOT\conf\cluster-env.bat
- > sed -i -e 's/31999/32001/g' cluster\target\cluster-0.11.0-SNAPSHOT\conf\cluster-env.bat
+ > sed -i -e 's/31999/32000/g' cluster\target\cluster-0.11.0-SNAPSHOT\conf\iotdb-env.bat
+ > sed -i -e 's/31999/32001/g' cluster\target\cluster-0.11.0-SNAPSHOT\conf\iotdb-env.bat
> nohup cluster\target\cluster-0.11.0-SNAPSHOT\sbin\start-node.bat
-> nohup cluster\target\cluster-0.11.0-SNAPSHOT1\sbin\start-node.bat -internal_meta_port 9005 -internal_data_port 40012 -cluster_rpc_port 55561
-> nohup cluster\target\cluster-0.11.0-SNAPSHOT2\sbin\start-node.bat -internal_meta_port 9007 -internal_data_port 40014 -cluster_rpc_port 55562
+> nohup cluster\target\cluster-0.11.0-SNAPSHOT1\sbin\start-node.bat -internal_meta_port 9005 -internal_data_port 40012 -cluster_rpc_port 6668
+> nohup cluster\target\cluster-0.11.0-SNAPSHOT2\sbin\start-node.bat -internal_meta_port 9007 -internal_data_port 40014 -cluster_rpc_port 6669
```
注：分布式版使用了707标识符来指示客户端做相应的元数据缓存以便之后能够直接将数据发送给对应数据组的 leader。因此建议在当前分支重新 `mvn install -pl jdbc -am -Dmaven.test.skip=true` 和