You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/11/12 02:46:23 UTC
[incubator-iotdb] branch master updated (39a04d3 -> d182003)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 39a04d3 [IOTDB-192] Improvement for LRUCache (#523)
add d182003 [IOTDB-295] Refactor db.exception (#530)
No new revisions were added by this update.
Summary of changes:
.../UserGuide/4-Client/2-Programming - JDBC.md | 27 ++-
.../UserGuide/4-Client/2-Programming - JDBC.md | 30 ++-
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 5 +-
.../directories/strategy/DirectoryStrategy.java | 3 +-
.../iotdb/db/cost/statistic/Measurement.java | 5 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 54 +++---
.../db/engine/cache/CacheHitRatioMonitor.java | 5 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 5 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 2 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 20 +-
.../apache/iotdb/db/engine/memtable/IMemTable.java | 6 +-
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 4 +-
.../iotdb/db/engine/merge/task/MergeTask.java | 4 +-
.../db/engine/merge/task/RecoverMergeTask.java | 4 +-
.../engine/storagegroup/StorageGroupProcessor.java | 34 ++--
.../db/engine/storagegroup/TsFileProcessor.java | 6 +-
.../iotdb/db/exception/ArgsErrorException.java | 36 ----
.../db/exception/ConfigAdjusterException.java | 18 +-
.../db/exception/DeltaEngineRunningException.java | 45 -----
.../exception/DiskSpaceInsufficientException.java | 8 +-
.../apache/iotdb/db/exception/MergeException.java | 16 +-
...geGroupException.java => ProcessException.java} | 15 +-
.../iotdb/db/exception/ProcessorException.java | 47 -----
...on.java => QueryInBatchStatementException.java} | 18 +-
.../iotdb/db/exception/StartupException.java | 19 +-
.../iotdb/db/exception/StorageEngineException.java | 19 +-
.../db/exception/SyncConnectionException.java | 11 +-
.../SyncDeviceOwnerConflictException.java | 18 +-
.../iotdb/db/exception/SysCheckException.java | 38 ----
...rorException.java => SystemCheckException.java} | 16 +-
.../db/exception/TsFileProcessorException.java | 22 +--
.../MetadataException.java} | 20 +-
.../metadata/TimeseriesAlreadyExistException.java} | 18 +-
.../db/exception/path/MTreePathException.java | 22 +--
.../{ => path}/NotStorageGroupException.java | 11 +-
.../db/exception/path/PTreePathException.java | 9 +-
.../PathException.java} | 17 +-
.../db/exception/qp/IllegalASTFormatException.java | 39 ----
.../db/exception/qp/QueryProcessorException.java | 40 ----
.../exception/query/IllegalASTFormatException.java | 68 +++++++
.../{qp => query}/LogicalOperatorException.java | 22 ++-
.../{qp => query}/LogicalOptimizeException.java | 20 +-
.../exception/{ => query}/OutOfTTLException.java | 9 +-
.../QueryProcessException.java} | 20 +-
.../{ => query}/UnSupportedFillTypeException.java | 19 +-
.../exception/runtime/FlushRunTimeException.java | 12 +-
.../StorageEngineFailureException.java | 17 +-
.../{ => storageGroup}/StorageGroupException.java | 20 +-
.../storageGroup/StorageGroupNotSetException.java} | 11 +-
.../storageGroup/StorageGroupPathException.java} | 13 +-
.../StorageGroupProcessorException.java | 29 ++-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 94 ++++-----
.../org/apache/iotdb/db/metadata/MManager.java | 213 +++++++++++----------
.../java/org/apache/iotdb/db/metadata/MTree.java | 190 +++++++++---------
.../java/org/apache/iotdb/db/metadata/PNode.java | 10 +-
.../java/org/apache/iotdb/db/metadata/PTree.java | 49 ++---
.../org/apache/iotdb/db/monitor/StatMonitor.java | 22 +--
.../org/apache/iotdb/db/qp/QueryProcessor.java | 52 ++---
.../apache/iotdb/db/qp/constant/DatetimeUtils.java | 4 +-
.../qp/executor/AbstractQueryProcessExecutor.java | 46 ++---
.../db/qp/executor/IQueryProcessExecutor.java | 33 ++--
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 146 +++++++-------
.../db/qp/logical/crud/BasicFunctionOperator.java | 11 +-
.../db/qp/logical/crud/BasicOperatorType.java | 2 +-
.../iotdb/db/qp/logical/crud/FilterOperator.java | 47 +++--
.../iotdb/db/qp/physical/crud/QueryPlan.java | 6 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 143 +++++++-------
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 46 ++---
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 38 ++--
.../qp/strategy/optimizer/DnfFilterOptimizer.java | 6 +-
.../db/qp/strategy/optimizer/IFilterOptimizer.java | 6 +-
.../qp/strategy/optimizer/ILogicalOptimizer.java | 2 +-
.../optimizer/MergeSingleFilterOptimizer.java | 2 +-
.../qp/strategy/optimizer/RemoveNotOptimizer.java | 15 +-
.../db/query/aggregation/AggregateFunction.java | 42 ++--
.../db/query/aggregation/impl/FirstAggrFunc.java | 6 +-
.../db/query/control/QueryResourceManager.java | 2 +-
.../db/query/dataset/DeviceIterateDataSet.java | 6 +-
.../dataset/groupby/GroupByEngineDataSet.java | 7 +-
.../groupby/GroupByWithValueFilterDataSet.java | 6 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 16 +-
.../db/query/executor/AggregateEngineExecutor.java | 19 +-
.../iotdb/db/query/executor/EngineExecutor.java | 9 +-
.../iotdb/db/query/executor/EngineQueryRouter.java | 22 +--
.../db/query/executor/FillEngineExecutor.java | 8 +-
.../db/query/executor/IEngineQueryRouter.java | 16 +-
.../externalsort/SimpleExternalSortEngine.java | 4 +-
.../iotdb/db/query/factory/AggreFuncFactory.java | 8 +-
.../java/org/apache/iotdb/db/query/fill/IFill.java | 3 +-
.../org/apache/iotdb/db/query/fill/LinearFill.java | 9 +-
.../query/timegenerator/EngineNodeConstructor.java | 2 +-
.../apache/iotdb/db/rescon/TVListAllocator.java | 5 +-
.../org/apache/iotdb/db/service/JDBCService.java | 4 +-
.../org/apache/iotdb/db/service/JMXService.java | 8 +-
.../apache/iotdb/db/service/MetricsService.java | 2 +-
.../java/org/apache/iotdb/db/service/Monitor.java | 5 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 151 +++++++++------
.../db/sync/receiver/load/FileLoaderManager.java | 4 +-
.../db/sync/receiver/transfer/SyncServiceImpl.java | 6 +-
.../java/org/apache/iotdb/db/tools/WalChecker.java | 10 +-
.../db/tools/watermark/WatermarkDetector.java | 10 +-
.../writelog/manager/MultiFileLogNodeManager.java | 5 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 27 +--
.../writelog/recover/TsFileRecoverPerformer.java | 29 +--
.../adapter/IoTDBConfigDynamicAdapterTest.java | 8 +-
.../db/engine/cache/DeviceMetaDataCacheTest.java | 6 +-
.../apache/iotdb/db/engine/merge/MergeLogTest.java | 6 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 7 +-
.../iotdb/db/engine/merge/MergeTaskTest.java | 6 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 8 +-
.../engine/modification/DeletionFileNodeTest.java | 20 +-
.../db/engine/modification/DeletionQueryTest.java | 27 +--
.../storagegroup/FileNodeManagerBenchmark.java | 18 +-
.../storagegroup/StorageGroupProcessorTest.java | 26 +--
.../iotdb/db/engine/storagegroup/TTLTest.java | 52 ++---
.../engine/storagegroup/TsFileProcessorTest.java | 11 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 2 +-
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 6 +-
.../org/apache/iotdb/db/metadata/MGraphTest.java | 6 +-
.../iotdb/db/metadata/MManagerAdvancedTest.java | 14 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 65 ++++---
.../iotdb/db/metadata/MManagerImproveTest.java | 20 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 152 ++++++++-------
.../org/apache/iotdb/db/metadata/MetadataTest.java | 8 +-
.../iotdb/db/qp/bench/QueryParseBenchmark.java | 12 +-
.../iotdb/db/qp/other/TSPlanContextAuthorTest.java | 9 +-
.../db/qp/other/TSPlanContextPropertyTest.java | 9 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 56 +++---
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 74 ++++---
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 37 ++--
.../iotdb/db/qp/plan/TestConcatOptimizer.java | 17 +-
.../iotdb/db/qp/strategy/LogicalGeneratorTest.java | 2 +-
.../apache/iotdb/db/qp/utils/MemIntQpExecutor.java | 14 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 6 +-
.../fileRelated/UnSealedTsFileReaderTest.java | 4 +-
.../resourceRelated/SeqResourceReaderTest.java | 4 +-
.../resourceRelated/UnseqResourceReaderTest.java | 4 +-
.../db/sql/DatetimeQueryDataSetUtilsTest.java | 2 +-
.../db/sync/receiver/load/FileLoaderTest.java | 6 +-
.../recover/SyncReceiverLogAnalyzerTest.java | 6 +-
.../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 15 +-
.../org/apache/iotdb/db/tools/WalCheckerTest.java | 12 +-
.../apache/iotdb/db/writelog/PerformanceTest.java | 10 +-
.../iotdb/db/writelog/recover/LogReplayerTest.java | 8 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 8 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 10 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 20 +-
147 files changed, 1638 insertions(+), 1805 deletions(-)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/ArgsErrorException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/DeltaEngineRunningException.java
copy server/src/main/java/org/apache/iotdb/db/exception/{NotStorageGroupException.java => ProcessException.java} (76%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/ProcessorException.java
rename server/src/main/java/org/apache/iotdb/db/exception/{FlushRunTimeException.java => QueryInBatchStatementException.java} (68%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/SysCheckException.java
copy server/src/main/java/org/apache/iotdb/db/exception/{PathErrorException.java => SystemCheckException.java} (71%)
rename server/src/main/java/org/apache/iotdb/db/exception/{MetadataErrorException.java => metadata/MetadataException.java} (63%)
copy server/src/main/java/org/apache/iotdb/db/{auth/user/LocalFileUserManager.java => exception/metadata/TimeseriesAlreadyExistException.java} (65%)
copy hive-connector/src/main/java/org/apache/iotdb/hive/TsFileSerDeException.java => server/src/main/java/org/apache/iotdb/db/exception/path/MTreePathException.java (62%)
rename server/src/main/java/org/apache/iotdb/db/exception/{ => path}/NotStorageGroupException.java (71%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/expression/IExpression.java => server/src/main/java/org/apache/iotdb/db/exception/path/PTreePathException.java (82%)
rename server/src/main/java/org/apache/iotdb/db/exception/{PathErrorException.java => path/PathException.java} (66%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/qp/IllegalASTFormatException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/qp/QueryProcessorException.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/exception/query/IllegalASTFormatException.java
rename server/src/main/java/org/apache/iotdb/db/exception/{qp => query}/LogicalOperatorException.java (58%)
rename server/src/main/java/org/apache/iotdb/db/exception/{qp => query}/LogicalOptimizeException.java (65%)
rename server/src/main/java/org/apache/iotdb/db/exception/{ => query}/OutOfTTLException.java (78%)
rename server/src/main/java/org/apache/iotdb/db/exception/{QueryInBatchStmtException.java => query/QueryProcessException.java} (68%)
rename server/src/main/java/org/apache/iotdb/db/exception/{ => query}/UnSupportedFillTypeException.java (61%)
copy client/src/main/java/org/apache/iotdb/exception/ArgsErrorException.java => server/src/main/java/org/apache/iotdb/db/exception/runtime/FlushRunTimeException.java (76%)
rename server/src/main/java/org/apache/iotdb/db/exception/{ => runtime}/StorageEngineFailureException.java (77%)
rename server/src/main/java/org/apache/iotdb/db/exception/{ => storageGroup}/StorageGroupException.java (75%)
copy server/src/main/java/org/apache/iotdb/db/{auth/user/LocalFileUserManager.java => exception/storageGroup/StorageGroupNotSetException.java} (71%)
rename server/src/main/java/org/apache/iotdb/db/{qp/exception/DateTimeFormatException.java => exception/storageGroup/StorageGroupPathException.java} (70%)
rename server/src/main/java/org/apache/iotdb/db/exception/{ => storageGroup}/StorageGroupProcessorException.java (61%)