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 6ce1f4133a2c31279ccdd4488c6e670f3ecaaf1b Merge: 719e87e 7714ec4 Author: Jialin Qiao <[email protected]> AuthorDate: Mon Aug 26 14:46:32 2019 +0800 Merge pull request #351 from apache/rpc_client [IOTDB-173] add batch rpc interface README.md | 8 +- RELEASE_NOTES.md | 4 +- client/pom.xml | 1 - .../src/assembly/resources/sbin/start-client.bat | 2 +- client/src/assembly/resources/sbin/start-client.sh | 2 +- client/src/assembly/resources/tools/export-csv.bat | 2 +- client/src/assembly/resources/tools/export-csv.sh | 2 +- client/src/assembly/resources/tools/import-csv.bat | 2 +- client/src/assembly/resources/tools/import-csv.sh | 2 +- .../iotdb/{cli => }/client/AbstractClient.java | 193 +++++++------- .../org/apache/iotdb/{cli => }/client/Client.java | 7 +- .../apache/iotdb/{cli => }/client/WinClient.java | 6 +- .../{cli => }/exception/ArgsErrorException.java | 2 +- .../iotdb/{cli => }/tool/AbstractCsvTool.java | 4 +- .../org/apache/iotdb/{cli => }/tool/ExportCsv.java | 6 +- .../org/apache/iotdb/{cli => }/tool/ImportCsv.java | 6 +- .../iotdb/{cli => }/client/AbstractClientIT.java | 62 +++-- .../iotdb/{cli => }/client/AbstractScript.java | 2 +- .../{cli => }/client/StartClientScriptIT.java | 2 +- .../iotdb/{cli => }/tool/ExportCsvTestIT.java | 4 +- .../iotdb/{cli => }/tool/ImportCsvTestIT.java | 4 +- docs/Development.md | 4 +- docs/Documentation-CHN/QuickStart.md | 6 +- .../UserGuide/1-Overview/3-Scenario.md | 4 +- .../UserGuide/7-Session API/1-Session API.md | 111 +++++++++ .../{7-TsFile => 8-TsFile}/1-Installation.md | 2 +- .../UserGuide/{7-TsFile => 8-TsFile}/2-Usage.md | 2 +- .../{7-TsFile => 8-TsFile}/3-Hierarchy.md | 2 +- .../{8-System Tools => 9-System Tools}/1-Sync.md | 2 +- .../2-Memory Estimation Tool.md | 2 +- .../UserGuide/{8-Tools-Cli.md => 9-Tools-Cli.md} | 28 +-- .../{8-Tools-Grafana.md => 9-Tools-Grafana.md} | 0 .../{8-Tools-Hadoop.md => 9-Tools-Hadoop.md} | 0 .../{8-Tools-spark.md => 9-Tools-spark.md} | 0 docs/Documentation/Frequently asked questions.md | 14 +- docs/Documentation/QuickStart.md | 14 +- .../UserGuide/1-Overview/3-Scenario.md | 4 +- .../UserGuide/3-Operation Manual/3-Data Import.md | 2 +- .../4-Deployment and Management/1-Deployment.md | 4 +- .../7-Build and use IoTDB by Dockerfile.md | 6 +- .../UserGuide/6-JDBC API/1-JDBC API.md | 4 +- .../UserGuide/7-Session API/1-Session API.md | 121 +++++++++ .../{7-TsFile => 8-TsFile}/1-Installation.md | 2 +- .../UserGuide/{7-TsFile => 8-TsFile}/2-Usage.md | 12 +- .../{7-TsFile => 8-TsFile}/3-Hierarchy.md | 2 +- .../{8-System Tools => 9-System Tools}/1-Sync.md | 2 +- .../2-Memory Estimation Tool.md | 2 +- .../UserGuide/{8-Tools-Cli.md => 9-Tools-Cli.md} | 22 +- .../{8-Tools-Grafana.md => 9-Tools-Grafana.md} | 0 .../{8-Tools-Hadoop.md => 9-Tools-Hadoop.md} | 0 .../{8-Tools-spark.md => 9-Tools-spark.md} | 0 example/pom.xml | 1 + .../iotdb/{example => rocketmq}/Constant.java | 2 +- .../{example => rocketmq}/RocketMQConsumer.java | 2 +- .../{example => rocketmq}/RocketMQProducer.java | 2 +- .../apache/iotdb/{example => rocketmq}/Utils.java | 2 +- example/session/pom.xml | 43 ++++ .../main/java/org/apache/iotdb/JDBCExample.java | 43 ++-- .../main/java/org/apache/iotdb/SessionExample.java | 88 +++++++ .../iotdb/tsfile/TsFileWriteWithRowBatch.java | 11 +- .../org/apache/iotdb/jdbc/IoTDBConnection.java | 83 ++----- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 32 ++- .../jdbc/IoTDBPreparedInsertionStatement.java | 2 +- .../apache/iotdb/jdbc/IoTDBPreparedStatement.java | 1 + .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 12 +- .../org/apache/iotdb/jdbc/IoTDBSQLException.java | 4 + .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 24 +- .../src/main/java/org/apache/iotdb/jdbc/Utils.java | 28 +-- .../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java | 4 +- .../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 12 +- pom.xml | 1 + .../org/apache/iotdb/db/sql/parse/TSParser.g | 2 +- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 2 +- .../apache/iotdb/db/cost/statistic/Operation.java | 3 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 22 +- .../iotdb/db/engine/flush/MemTableFlushTask.java | 10 +- .../iotdb/db/engine/memtable/AbstractMemTable.java | 21 +- .../apache/iotdb/db/engine/memtable/IMemTable.java | 7 +- .../db/engine/memtable/IWritableMemChunk.java | 15 +- .../iotdb/db/engine/memtable/WritableMemChunk.java | 86 ++++++- .../engine/storagegroup/StorageGroupProcessor.java | 154 +++++++++--- .../db/engine/storagegroup/TsFileProcessor.java | 51 +++- .../java/org/apache/iotdb/db/metadata/MGraph.java | 2 - .../db/qp/executor/IQueryProcessExecutor.java | 7 + .../iotdb/db/qp/executor/QueryProcessExecutor.java | 35 ++- .../org/apache/iotdb/db/qp/logical/Operator.java | 2 +- .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 7 +- .../iotdb/db/qp/physical/crud/BatchInsertPlan.java | 276 +++++++++++++++++++++ .../iotdb/db/qp/strategy/LogicalGenerator.java | 4 - .../iotdb/db/qp/strategy/PhysicalGenerator.java | 6 - .../org/apache/iotdb/db/rescon/MemTablePool.java | 1 + .../java/org/apache/iotdb/db/service/IoTDB.java | 4 - .../org/apache/iotdb/db/service/TSServiceImpl.java | 65 ++++- .../org/apache/iotdb/db/utils/FileSchemaUtils.java | 14 +- .../java/org/apache/iotdb/db/utils/MemUtils.java | 30 ++- .../apache/iotdb/db/utils/QueryDataSetUtils.java | 86 +++++++ .../iotdb/db/utils/datastructure/BinaryTVList.java | 31 +++ .../db/utils/datastructure/BooleanTVList.java | 31 +++ .../iotdb/db/utils/datastructure/DoubleTVList.java | 31 +++ .../iotdb/db/utils/datastructure/FloatTVList.java | 31 +++ .../iotdb/db/utils/datastructure/IntTVList.java | 31 +++ .../iotdb/db/utils/datastructure/LongTVList.java | 31 +++ .../iotdb/db/utils/datastructure/TVList.java | 38 +++ .../iotdb/db/writelog/recover/LogReplayer.java | 12 +- .../writelog/recover/TsFileRecoverPerformer.java | 14 +- .../db/cost/statistic/PerformanceStatTest.java | 2 +- .../db/engine/memtable/MemTableFlushTaskTest.java | 2 +- .../db/engine/memtable/MemTableTestUtils.java | 10 +- .../storagegroup/StorageGroupProcessorTest.java | 59 ++++- .../iotdb/db/integration/IoTDBAggregationIT.java | 8 +- .../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 6 + .../iotdb/db/writelog/recover/LogReplayerTest.java | 4 +- .../db/writelog/recover/SeqTsFileRecoverTest.java | 6 +- .../writelog/recover/UnseqTsFileRecoverTest.java | 6 +- .../org/apache/iotdb/rpc/IoTDBRPCException.java | 12 +- .../main/java/org/apache/iotdb/rpc/RpcUtils.java | 44 ++++ .../org/apache/iotdb/rpc/SynchronizedHandler.java | 54 ++++ service-rpc/src/main/thrift/rpc.thrift | 24 +- session/pom.xml | 60 +++++ .../main/java/org/apache/iotdb/session/Config.java | 13 +- .../iotdb/session/IoTDBSessionException.java | 17 +- .../java/org/apache/iotdb/session/Session.java | 183 ++++++++++++++ .../org/apache/iotdb/session/SessionUtils.java | 90 +++++++ .../apache/iotdb/tsfile/io/TsFileOutputFormat.java | 10 +- .../apache/iotdb/tsfile/io/TsFileRecordWriter.java | 6 +- .../scala/org/apache/iotdb/tsfile/Converter.scala | 4 +- .../org/apache/iotdb/tsfile/utils/BytesUtils.java | 14 +- .../apache/iotdb/tsfile/write/TsFileWriter.java | 16 +- .../apache/iotdb/tsfile/write/record/RowBatch.java | 47 ++++ .../apache/iotdb/tsfile/write/record/TSRecord.java | 2 - .../tsfile/write/schema/MeasurementSchema.java | 2 +- .../write/schema/{FileSchema.java => Schema.java} | 35 +-- .../iotdb/tsfile/write/schema/SchemaBuilder.java | 18 +- .../iotdb/tsfile/write/writer/TsFileIOWriter.java | 6 +- .../TsFileGeneratorForSeriesReaderByTimestamp.java | 11 +- .../apache/iotdb/tsfile/utils/FileGenerator.java | 11 +- .../org/apache/iotdb/tsfile/utils/RecordUtils.java | 4 +- .../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 27 +- .../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 6 +- .../org/apache/iotdb/tsfile/write/PerfTest.java | 23 +- .../iotdb/tsfile/write/ReadPageInMemTest.java | 21 +- .../iotdb/tsfile/write/TsFileIOWriterTest.java | 8 +- .../iotdb/tsfile/write/TsFileReadWriteTest.java | 10 +- .../org/apache/iotdb/tsfile/write/WriteTest.java | 6 +- .../write/schema/converter/SchemaBuilderTest.java | 6 +- 145 files changed, 2490 insertions(+), 659 deletions(-)
