You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2020/03/09 12:18:50 UTC
[incubator-iotdb] branch jira_550 updated (299865b -> 23564eb)
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch jira_550
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 299865b [IOTDB-550] Fix TSMRWriteExample executes unsuccessfully
add e7acb86 update User Guide link in readme file
add e5f253a Merge pull request #890 from LebronAl/dev_fix_readme
add 98bfef4 [IOTDB-547] Fix typo for tsfile schema
add 5a5f36b Merge pull request #889 from vesense/patch-8
add 27fb440 [IOTDB-545] Update checkPathValidity in Session (#886)
add f7c850f [IOTDB-497] Apache Flink Connector Support (#817)
add 93f8146 [HOTFIX] fix the maven badge pixel
add fdb1f40 Merge pull request #892 from vesense/patch-9
add 28c35aa [IOTDB-399] add Chinese user guide (#884)
add 0391873 optimize tsfile expression
add 9b943d2 Merge pull request #894 from Ring-k/master
add 0bc56c4 [IOTDB-549] Reorganize exception (#893)
new 23564eb Merge remote-tracking branch 'upstream/master' into jira_545
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:
README.md | 4 +-
.../SystemDesign/1-TsFile/4-Read.md | 4 +-
.../UserGuide/0-Get Started/1-QuickStart.md | 12 +-
.../UserGuide/0-Get Started/3-Publication.md | 10 +-
.../UserGuide/3-Server/3-Cluster Setup.md | 6 +-
.../4-Client/1-Command Line Interface (CLI).md | 6 +-
.../4-Client/2-Programming - Native API.md | 12 +-
.../4-Client/4-Programming - Other Languages.md | 48 ++-
.../2-DML (Data Manipulation Language).md | 382 ++++++++++++++++++++-
.../UserGuide/6-System Tools/4-Watermark Tool.md | 4 -
.../6-System Tools/7-Monitor and Log Tools.md | 198 ++++++++++-
.../7-Ecosystem Integration/3-Spark TsFile.md | 327 +++++++++++++++++-
.../7-Ecosystem Integration/4-Spark IoTDB.md | 159 ++++++++-
docs/Documentation/SystemDesign/1-TsFile/4-Read.md | 8 +-
.../UserGuide/0-Get Started/3-Publication.md | 10 +-
.../UserGuide/4-Client/3-Programming - JDBC.md | 14 +-
.../flink/README.md | 16 +-
example/{rocketmq => flink}/pom.xml | 11 +-
.../org/apache/iotdb/flink/FlinkIoTDBSink.java | 85 +++++
example/pom.xml | 1 +
.../apache/iotdb/rocketmq/RocketMQConsumer.java | 24 +-
.../main/java/org/apache/iotdb/SessionExample.java | 26 +-
flink-iotdb-connector/README.md | 58 ++++
flink-iotdb-connector/pom.xml | 55 +++
.../iotdb/flink/DefaultIoTSerializationSchema.java | 99 ++++++
.../main/java/org/apache/iotdb/flink/Event.java | 54 +++
.../java/org/apache/iotdb/flink/IoTDBOptions.java | 152 ++++++++
.../java/org/apache/iotdb/flink/IoTDBSink.java | 187 ++++++++++
.../apache/iotdb/flink/IoTSerializationSchema.java | 31 ++
.../flink/DefaultIoTSerializationSchemaTest.java | 49 +++
.../iotdb/flink/IoTDBSinkBatchInsertTest.java | 102 ++++++
.../iotdb/flink/IoTDBSinkBatchTimerTest.java | 74 ++++
.../apache/iotdb/flink/IoTDBSinkInsertTest.java | 66 ++++
.../apache/iotdb/jdbc/AbstractIoTDBResultSet.java | 6 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 9 +-
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 4 +-
.../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java | 4 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 4 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 8 +-
pom.xml | 4 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 85 +++--
.../iotdb/db/integration/IOTDBGroupByIT.java | 22 +-
...xception.java => IoTDBConnectionException.java} | 11 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 6 +-
.../iotdb/rpc/StatementExecutionException.java | 12 +-
.../iotdb/session/IoTDBSessionException.java | 36 --
.../java/org/apache/iotdb/session/Session.java | 140 ++++----
.../org/apache/iotdb/session/SessionDataSet.java | 16 +-
.../org/apache/iotdb/session/IoTDBSessionIT.java | 75 ++--
.../read/expression/util/ExpressionOptimizer.java | 58 +++-
.../tsfile/write/schema/MeasurementSchema.java | 2 +-
.../read/filter/IExpressionOptimizerTest.java | 15 +-
52 files changed, 2498 insertions(+), 313 deletions(-)
copy docs/Documentation/UserGuide/3-Server/2-Single Node Setup.md => example/flink/README.md (76%)
copy example/{rocketmq => flink}/pom.xml (84%)
create mode 100644 example/flink/src/main/java/org/apache/iotdb/flink/FlinkIoTDBSink.java
create mode 100644 flink-iotdb-connector/README.md
create mode 100644 flink-iotdb-connector/pom.xml
create mode 100644 flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/DefaultIoTSerializationSchema.java
create mode 100644 flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/Event.java
create mode 100644 flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/IoTDBOptions.java
create mode 100644 flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/IoTDBSink.java
create mode 100644 flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/IoTSerializationSchema.java
create mode 100644 flink-iotdb-connector/src/test/java/org/apache/iotdb/flink/DefaultIoTSerializationSchemaTest.java
create mode 100644 flink-iotdb-connector/src/test/java/org/apache/iotdb/flink/IoTDBSinkBatchInsertTest.java
create mode 100644 flink-iotdb-connector/src/test/java/org/apache/iotdb/flink/IoTDBSinkBatchTimerTest.java
create mode 100644 flink-iotdb-connector/src/test/java/org/apache/iotdb/flink/IoTDBSinkInsertTest.java
rename service-rpc/src/main/java/org/apache/iotdb/rpc/{IoTDBRPCException.java => IoTDBConnectionException.java} (76%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/QueryFilterOptimizationException.java => service-rpc/src/main/java/org/apache/iotdb/rpc/StatementExecutionException.java (72%)
delete mode 100644 session/src/main/java/org/apache/iotdb/session/IoTDBSessionException.java
[incubator-iotdb] 01/01: Merge remote-tracking branch
'upstream/master' into jira_545
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a commit to branch jira_550
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 23564eb6a104c717ae4f94688e7076b7abf5d8d1
Merge: 299865b 0bc56c4
Author: samperson1997 <sz...@mails.tsinghua.edu.cn>
AuthorDate: Mon Mar 9 20:17:29 2020 +0800
Merge remote-tracking branch 'upstream/master' into jira_545
# Conflicts:
# session/src/main/java/org/apache/iotdb/session/Session.java
# session/src/test/java/org/apache/iotdb/session/IoTDBSessionIT.java
README.md | 4 +-
.../SystemDesign/1-TsFile/4-Read.md | 4 +-
.../UserGuide/0-Get Started/1-QuickStart.md | 12 +-
.../UserGuide/0-Get Started/3-Publication.md | 10 +-
.../UserGuide/3-Server/3-Cluster Setup.md | 6 +-
.../4-Client/1-Command Line Interface (CLI).md | 6 +-
.../4-Client/2-Programming - Native API.md | 12 +-
.../4-Client/4-Programming - Other Languages.md | 48 ++-
.../2-DML (Data Manipulation Language).md | 382 ++++++++++++++++++++-
.../UserGuide/6-System Tools/4-Watermark Tool.md | 4 -
.../6-System Tools/7-Monitor and Log Tools.md | 198 ++++++++++-
.../7-Ecosystem Integration/3-Spark TsFile.md | 327 +++++++++++++++++-
.../7-Ecosystem Integration/4-Spark IoTDB.md | 159 ++++++++-
docs/Documentation/SystemDesign/1-TsFile/4-Read.md | 8 +-
.../UserGuide/0-Get Started/3-Publication.md | 10 +-
.../UserGuide/4-Client/3-Programming - JDBC.md | 14 +-
.../3-Spark TsFile.md => example/flink/README.md | 12 +-
example/flink/pom.xml | 45 +++
.../org/apache/iotdb/flink/FlinkIoTDBSink.java | 85 +++++
example/pom.xml | 1 +
.../apache/iotdb/rocketmq/RocketMQConsumer.java | 24 +-
.../main/java/org/apache/iotdb/SessionExample.java | 26 +-
flink-iotdb-connector/README.md | 58 ++++
flink-iotdb-connector/pom.xml | 55 +++
.../iotdb/flink/DefaultIoTSerializationSchema.java | 99 ++++++
.../main/java/org/apache/iotdb/flink/Event.java | 54 +++
.../java/org/apache/iotdb/flink/IoTDBOptions.java | 152 ++++++++
.../java/org/apache/iotdb/flink/IoTDBSink.java | 187 ++++++++++
.../apache/iotdb/flink/IoTSerializationSchema.java | 31 ++
.../flink/DefaultIoTSerializationSchemaTest.java | 49 +++
.../iotdb/flink/IoTDBSinkBatchInsertTest.java | 102 ++++++
.../iotdb/flink/IoTDBSinkBatchTimerTest.java | 74 ++++
.../apache/iotdb/flink/IoTDBSinkInsertTest.java | 66 ++++
.../apache/iotdb/jdbc/AbstractIoTDBResultSet.java | 6 +-
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 9 +-
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 4 +-
.../iotdb/jdbc/IoTDBNonAlignQueryResultSet.java | 4 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 4 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 8 +-
pom.xml | 4 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 85 +++--
.../iotdb/db/integration/IOTDBGroupByIT.java | 22 +-
...xception.java => IoTDBConnectionException.java} | 11 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 6 +-
.../iotdb/rpc/StatementExecutionException.java | 20 +-
.../java/org/apache/iotdb/session/Session.java | 140 ++++----
.../org/apache/iotdb/session/SessionDataSet.java | 16 +-
.../org/apache/iotdb/session/IoTDBSessionIT.java | 75 ++--
.../read/expression/util/ExpressionOptimizer.java | 58 +++-
.../tsfile/write/schema/MeasurementSchema.java | 2 +-
.../read/filter/IExpressionOptimizerTest.java | 15 +-
51 files changed, 2542 insertions(+), 271 deletions(-)