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 73b725e02a109943107aa528b103ca50a4db9647 Merge: 39e811b 7a2e034 Author: qiaojialin <[email protected]> AuthorDate: Fri Jan 3 20:12:46 2020 +0800 Merge branch 'master' of github.com:apache/incubator-iotdb .../org/apache/iotdb/client/AbstractClient.java | 118 ++---- .../main/java/org/apache/iotdb/tool/ImportCsv.java | 7 +- .../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 9 +- .../main/java/org/apache/iotdb/jdbc/Constant.java | 29 -- .../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 207 +-------- .../iotdb/jdbc/IoTDBMetadataResultMetadata.java | 193 --------- .../apache/iotdb/jdbc/IoTDBMetadataResultSet.java | 427 ------------------- .../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 14 +- .../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 110 +---- .../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 463 --------------------- .../jdbc/IoTDBMetadataResultMetadataTest.java | 108 ----- .../org/apache/iotdb/jdbc/IoTDBStatementTest.java | 151 ------- .../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 79 +++- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 9 +- .../engine/storagegroup/StorageGroupProcessor.java | 39 +- .../db/engine/storagegroup/TsFileProcessor.java | 16 + .../db/engine/storagegroup/TsFileResource.java | 28 ++ .../org/apache/iotdb/db/metadata/MManager.java | 2 +- .../apache/iotdb/db/qp/constant/SQLConstant.java | 7 + .../qp/executor/AbstractQueryProcessExecutor.java | 187 +++++++-- .../db/qp/executor/IQueryProcessExecutor.java | 11 +- .../sys/CountOperator.java} | 43 +- .../sys/ShowChildPathsOperator.java} | 35 +- .../sys/ShowDevicesOperator.java} | 35 +- .../sys/ShowTimeSeriesOperator.java} | 35 +- .../physical/sys/{ShowPlan.java => CountPlan.java} | 40 +- .../sys/{ShowPlan.java => ShowChildPathsPlan.java} | 34 +- .../sys/{ShowPlan.java => ShowDevicesPlan.java} | 36 +- .../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 3 +- .../sys/{ShowPlan.java => ShowTimeSeriesPlan.java} | 35 +- .../iotdb/db/qp/strategy/LogicalGenerator.java | 68 ++- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 19 + .../org/apache/iotdb/db/service/StaticResps.java | 36 ++ .../org/apache/iotdb/db/service/TSServiceImpl.java | 84 +--- .../writelog/recover/TsFileRecoverPerformer.java | 25 +- .../iotdb/db/engine/storagegroup/TTLTest.java | 3 +- .../db/integration/IoTDBDeleteStorageGroupIT.java | 4 +- .../integration/IoTDBLoadExternalTsfileTest.java | 2 +- .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 263 +++++++----- .../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 9 +- .../db/writelog/recover/SeqTsFileRecoverTest.java | 60 ++- .../writelog/recover/UnseqTsFileRecoverTest.java | 2 +- service-rpc/rpc-changelist.md | 6 + service-rpc/src/main/thrift/rpc.thrift | 10 +- 44 files changed, 885 insertions(+), 2216 deletions(-)
