This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a change to branch mmanager_refactor
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 8c8e291 Refactor deletePath and getAllPath
add 5a563b8 fix OOM when there are too many columns in one query by
adding a IChunkLoader cache
add 6ddb2c3 [IOTDB-471] fix bug (#786)
add f127a26 Revert "[IOTDB-471] fix bug (#786)" (#799)
add a6bd21a Enable auto create schema (#797)
add d079a4d [IOTDB-471] fix and try to locate latestTimeForEachDevice
null pointer bug (#800)
add ec267af Merge remote-tracking branch 'origin/master' into
new_series_reader
add 4326b38 Merge branch 'new_series_reader' of
https://github.com/apache/incubator-iotdb into new_series_reader
add 792f60c fix conflict
add 8747fa0 [IoTDB-475] Improve the logic of AlignByDevicePlan in
PhysicalGenerator (#803)
add 8e4a01a [IOTDB-466] group by device -> align by device && group by
time range [] -> [) (#805)
add 812d739 [IOTDB-464] Vectorize the IReaderByTimestamp (#812)
add 3d8e036 [IOTDB-486] Correct typo and broken link in `example/
rocketmq/readme.md`
add c1c56ba [IOTDB-485] Fix the broken link for `Client/Shell tools`
add b3ef2e0 [IOTDB-489] Variable url pattern should be defined as a
constant
add f63acfb [IOTDB-484] Added maven status badge (#807)
add c72281f [IOTDB-488] Static members shouldn't be accessed through
class instances
add 866eb70 [IOTDB-467] The CLI displays query results in a batch manner
(#806)
add 0353cdf Merge remote-tracking branch 'origin/master' into
new_series_reader
add c4dd626 optimize codes
add 484617c optimize tsfile read doc
add ce5f509 add config parameter
add ca636e7 add config parameter
add e2bf457 Merge branch 'new_series_reader' of
https://github.com/apache/incubator-iotdb into new_series_reader
add 7c87036 Merge remote-tracking branch 'origin/new_series_reader' into
new_series_reader
add 35e1d2c print warn log if waitForAllTsProcessorClosed() too long time
add 6b060ef add comments if a tsfile is closed
add aa34ad8 set jmxport =31999 by default if there is no config file
add a057780 do not print "cant get cpu ratio" in Tests
add a421890 fix bug in ActiveTimeSeriesCounter Test
add 42fd2b7 wait at most 30s for finishing merge tasks before stop daemon.
add 3466683 remove priority in ChunkMetadata and add check in
isPageOverlapped in SeriesReader
add 8918104 Merge remote-tracking branch 'origin/new_series_reader' into
new_series_reader
add ee88d73 Add more log of compression ratio (#801)
add c92895b Merge remote-tracking branch 'origin/master' into
new_series_reader
add 2bb1a8b Add more mergeAggrOnOneSeriesTest
add ec9b912 fix review
add 171949b fix sonar bug
add 964180e Merge remote-tracking branch 'upstream/new_series_reader'
into new_series_reader
add 014d27c Remove useless UnSupportedDataTypeException string
add dd3f44a Update avg method and test values
add 15c5c34 Fix time parititon problem (#816)
add e502f5d [IOTDB-491] Constant name `pool ` should be all uppercase
(#813)
add a6f752f Merge remote-tracking branch 'origin/master' into
new_series_reader
add 855fef4 add group by device
add 67e4f64 Merge remote-tracking branch 'upstream/new_series_reader'
into new_series_reader
add c5df90c add some comments
add 9a54e6e fix align by device doc
add 153d433 Merge remote-tracking branch 'origin/new_series_reader' into
new_series_reader
add 9eb9766 rename raw query data set with value filter
add d46a4c4 Merge branch 'new_series_reader' of
https://github.com/apache/incubator-iotdb into new_series_reader
add 91a37f8 fix a bug in tsfile test
add ae09b5b add ttl in seriesreader with value filter
add 719a938 Cached chunk (#802)
add 2b2f458 Merge remote-tracking branch 'origin/new_series_reader' into
new_series_reader
add 1509a8b Merge branch 'new_series_reader' of
https://github.com/apache/incubator-iotdb into new_series_reader
add 4c0390f Merge branch 'new_series_reader' of
github.com:apache/incubator-iotdb into new_series_reader
add 6658a0a [IOTDB-496]An extra line in CLI when the result is empty
(#819)
add 8352b0f Merge remote-tracking branch 'upstream/new_series_reader'
into mmanager
add 00a4cad Solve conflict
No new revisions were added by this update.
Summary of changes:
README.md | 1 +
.../org/apache/iotdb/client/AbstractClient.java | 89 ++++++++---
.../SystemDesign/1-TsFile/4-Read.md | 46 +++---
.../SystemDesign/6-Tools/1-Sync.md | 1 +
.../2-DML (Data Manipulation Language).md | 4 +-
.../5-Operation Manual/4-SQL Reference.md | 58 +++----
.../2-DML (Data Manipulation Language).md | 6 +-
.../5-Operation Manual/4-SQL Reference.md | 58 +++----
example/rocketmq/readme.md | 4 +-
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 7 +-
.../resources/conf/iotdb-engine.properties | 9 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 20 +--
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 27 +++-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 27 ++--
.../org/apache/iotdb/db/engine/StorageEngine.java | 3 +-
.../db/engine/cache/CacheHitRatioMonitor.java | 5 +
.../engine/cache/CacheHitRatioMonitorMXBean.java | 2 +
.../apache/iotdb/db/engine/cache/ChunkCache.java | 150 +++++++++++++++++
.../iotdb/db/engine/cache/DeviceMetaDataCache.java | 13 +-
.../iotdb/db/engine/cache/RamUsageEstimator.java | 34 ++--
.../engine/memtable/TimeValuePairInMemTable.java | 45 ------
.../db/engine/memtable/TimeValuePairSorter.java | 55 -------
.../iotdb/db/engine/memtable/WritableMemChunk.java | 15 ++
.../iotdb/db/engine/merge/manage/MergeManager.java | 29 ++++
.../db/engine/merge/manage/MergeResource.java | 2 +-
.../db/engine/merge/task/MergeMultiChunkTask.java | 1 +
.../db/engine/querycontext/QueryDataSource.java | 13 +-
.../engine/storagegroup/StorageGroupProcessor.java | 35 +++-
.../db/engine/storagegroup/TsFileProcessor.java | 24 ++-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 1 -
.../db/qp/physical/crud/AlignByDevicePlan.java | 2 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 2 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 11 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 86 ++++------
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 6 +-
.../db/query/aggregation/AggregateResult.java | 84 +++++-----
.../db/query/aggregation/impl/AvgAggrResult.java | 34 ++--
.../db/query/aggregation/impl/CountAggrResult.java | 20 +--
.../query/aggregation/impl/MaxTimeAggrResult.java | 6 +-
.../query/aggregation/impl/MinTimeAggrResult.java | 6 +-
.../db/query/aggregation/impl/SumAggrResult.java | 81 ++++++++--
.../iotdb/db/query/control/FileReaderManager.java | 14 +-
.../db/query/dataset/AlignByDeviceDataSet.java | 6 +-
...er.java => RawQueryDataSetWithValueFilter.java} | 4 +-
.../dataset/RawQueryDataSetWithoutValueFilter.java | 8 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 13 +-
.../db/query/executor/AggregationExecutor.java | 12 +-
.../db/query/executor/RawDataQueryExecutor.java | 12 +-
.../adapter/ByTimestampReaderAdapter.java | 46 +++---
.../{MemChunkLoader.java => DiskChunkLoader.java} | 27 ++--
.../reader/chunk/DiskChunkReaderByTimestamp.java | 55 ++++---
.../db/query/reader/chunk/MemChunkLoader.java | 4 -
.../db/query/reader/chunk/MemChunkReader.java | 1 +
.../iotdb/db/query/reader/chunk/MemPageReader.java | 2 +-
.../db/query/reader/series/IReaderByTimestamp.java | 7 +-
.../reader/series/SeriesRawDataPointReader.java | 2 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 38 ++++-
.../reader/series/SeriesReaderByTimestamp.java | 24 ++-
.../universal/PriorityMergeReaderByTimestamp.java | 52 ------
.../query/timegenerator/EngineNodeConstructor.java | 12 +-
.../java/org/apache/iotdb/db/service/IService.java | 2 +
.../org/apache/iotdb/db/service/JMXService.java | 10 +-
.../apache/iotdb/db/service/RegisterManager.java | 2 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +-
.../iotdb/db/utils/datastructure/BinaryTVList.java | 6 +
.../db/utils/datastructure/BooleanTVList.java | 6 +
.../iotdb/db/utils/datastructure/DoubleTVList.java | 6 +
.../iotdb/db/utils/datastructure/FloatTVList.java | 6 +
.../iotdb/db/utils/datastructure/IntTVList.java | 6 +
.../iotdb/db/utils/datastructure/LongTVList.java | 6 +
.../iotdb/db/utils/datastructure/TVList.java | 5 +
.../db/engine/memtable/PrimitiveMemTableTest.java | 12 +-
.../engine/storagegroup/TsFileProcessorTest.java | 4 +-
.../iotdb/db/integration/IOTDBGroupByIT.java | 20 +--
.../integration/IOTDBGroupByInnerIntervalIT.java | 26 +--
.../iotdb/db/integration/IoTDBAggregationIT.java | 44 ++++-
...upbyDeviceIT.java => IoTDBAlignByDeviceIT.java} | 50 +++---
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 1 +
.../db/integration/IoTDBDeleteStorageGroupIT.java | 33 ++--
.../iotdb/db/integration/IoTDBDisableAlignIT.java | 2 +-
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 2 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 4 +-
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 6 +-
.../PriorityMergeReaderByTimestampTest.java | 178 ---------------------
.../apache/iotdb/db/utils/EnvironmentUtils.java | 4 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 4 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 6 +-
server/src/test/resources/logback.xml | 4 +-
.../org/apache/iotdb/session/IoTDBSessionIT.java | 44 ++---
.../apache/iotdb/tsfile/common/cache/LRUCache.java | 8 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 8 +-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 28 +---
.../apache/iotdb/tsfile/read/ReadOnlyTsFile.java | 4 +-
.../apache/iotdb/tsfile/read/common/BatchData.java | 34 ++--
.../org/apache/iotdb/tsfile/read/common/Field.java | 12 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 1 -
...kLoaderImpl.java => CachedChunkLoaderImpl.java} | 16 +-
.../iotdb/tsfile/read/controller/IChunkLoader.java | 8 +-
.../org/apache/iotdb/tsfile/read/ReadTest.java | 18 +--
.../tsfile/read/controller/ChunkLoaderTest.java | 2 +-
.../read/query/executor/QueryExecutorTest.java | 4 +-
.../query/timegenerator/ReaderByTimestampTest.java | 4 +-
.../query/timegenerator/TimeGeneratorTest.java | 4 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 6 +-
104 files changed, 1112 insertions(+), 1007 deletions(-)
create mode 100644
server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairInMemTable.java
delete mode 100644
server/src/main/java/org/apache/iotdb/db/engine/memtable/TimeValuePairSorter.java
rename
server/src/main/java/org/apache/iotdb/db/query/dataset/{EngineDataSetWithValueFilter.java
=> RawQueryDataSetWithValueFilter.java} (95%)
copy
server/src/main/java/org/apache/iotdb/db/query/reader/chunk/{MemChunkLoader.java
=> DiskChunkLoader.java} (69%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java
rename
server/src/test/java/org/apache/iotdb/db/integration/{IoTDBGroupbyDeviceIT.java
=> IoTDBAlignByDeviceIT.java} (98%)
delete mode 100644
server/src/test/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestampTest.java
rename
tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/{ChunkLoaderImpl.java
=> CachedChunkLoaderImpl.java} (86%)
