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/01/06 13:48:31 UTC
[incubator-iotdb] 02/02: Merge branch 'master' of
github.com:apache/incubator-iotdb
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch fix_401_correct_chunk_size
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 99f9ef9e2390750425623159dad4d7d6768d1a4d
Merge: 6d65b74 6366f2b
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Mon Jan 6 21:47:36 2020 +0800
Merge branch 'master' of github.com:apache/incubator-iotdb
README.md | 60 +--
.../org/apache/iotdb/client/AbstractClient.java | 118 ++----
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 7 +-
docs/Development-VoteRelease.md | 198 +++++++++
docs/Documentation/UserGuide/0-Content.md | 4 +-
.../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 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 54 +--
.../iotdb/db/engine/flush/TsFileFlushPolicy.java | 54 +++
.../iotdb/db/engine/merge/task/MergeFileTask.java | 18 +
.../engine/storagegroup/StorageGroupProcessor.java | 89 ++--
.../db/engine/storagegroup/TsFileProcessor.java | 26 +-
.../db/engine/storagegroup/TsFileResource.java | 86 +++-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 6 +-
.../org/apache/iotdb/db/metadata/MManager.java | 21 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 67 ++-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 7 +
.../qp/executor/AbstractQueryProcessExecutor.java | 187 +++++++--
.../db/qp/executor/IQueryProcessExecutor.java | 18 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 12 +-
.../db/qp/logical/crud/BasicFunctionOperator.java | 3 -
.../iotdb/db/qp/logical/crud/FilterOperator.java | 15 +-
.../sys/CountOperator.java} | 43 +-
.../sys/ShowChildPathsOperator.java} | 35 +-
.../sys/ShowDevicesOperator.java} | 35 +-
.../sys/ShowTimeSeriesOperator.java} | 35 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 24 +-
.../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 +-
.../iotdb/db/qp/physical/sys/ShowTTLPlan.java | 18 +-
.../sys/{ShowPlan.java => ShowTimeSeriesPlan.java} | 35 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 68 ++-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 132 +++---
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 131 +++++-
.../optimizer/MergeSingleFilterOptimizer.java | 13 +-
.../db/query/dataset/DeviceIterateDataSet.java | 4 +-
.../NewEngineDataSetWithoutValueFilter.java | 14 +-
.../iotdb/db/query/executor/EngineExecutor.java | 5 +-
.../iotdb/db/query/reader/ManagedSeriesReader.java | 37 ++
.../SeriesReaderWithoutValueFilter.java | 8 +-
.../org/apache/iotdb/db/service/StaticResps.java | 36 ++
.../org/apache/iotdb/db/service/TSServiceImpl.java | 119 ++----
.../iotdb/db/tools/TsFileResourcePrinter.java | 8 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 31 +-
.../writelog/recover/TsFileRecoverPerformer.java | 50 ++-
.../db/engine/cache/DeviceMetaDataCacheTest.java | 3 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 3 +
.../apache/iotdb/db/engine/merge/MergeTest.java | 3 +
.../storagegroup/StorageGroupProcessorTest.java | 3 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 6 +-
.../db/integration/IoTDBDeleteStorageGroupIT.java | 4 +-
.../db/integration/IoTDBFlushQueryMergeTest.java | 64 ++-
.../iotdb/db/integration/IoTDBGroupbyDeviceIT.java | 18 +-
.../integration/IoTDBLoadExternalTsfileTest.java | 2 +-
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 263 +++++++-----
.../iotdb/db/metadata/MManagerBasicTest.java | 35 +-
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 9 +-
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 12 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 3 +-
.../SeriesReaderWithValueFilterTest.java | 3 +-
.../SeriesReaderWithoutValueFilterTest.java | 5 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 2 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 62 ++-
.../writelog/recover/UnseqTsFileRecoverTest.java | 4 +-
service-rpc/rpc-changelist.md | 6 +
service-rpc/src/main/thrift/rpc.thrift | 10 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 2 +-
79 files changed, 1791 insertions(+), 2574 deletions(-)