You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2020/09/17 09:18:16 UTC

[incubator-iotdb] branch master_with_chunk_size updated (20db36f -> 885ab8b)

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a change to branch master_with_chunk_size
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from 20db36f  master with chunk size log
     add 7834fc8  [IOTDB-881] Fix Double quotes bug in Align by device (#1717)
     add 42e3c16  fix importCsvIT bug (#1730)
     add 3aaf7de  [IOTDB-840] Encode the three enum fields in MeasurementSchema to save memory (#1724)
     add 2323f26  fix bug that cross-test generates data out of the target folder (#1738)
     add da54ec5  [IOTDB-850] check list user/role privilege  (#1698)
     add fc795d3  [IOTDB-848] support order by time asc/desc (#1650)
     add 4e4df33  [IOTDB-877] fix prefix bug on show storage group and show devices (#1723)
     add e9defff  [Doc]Add wal test doc (#1735)
     new e9336bc  Merge branch 'master' of https://github.com/apache/incubator-iotdb into master_with_chunk_size
     new 885ab8b  conf

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |  22 +-
 cross-tests/pom.xml                                |  39 +--
 .../tests/tools/importCsv/AbstractScript.java      |   1 -
 .../tests/tools/importCsv/ImportCsvTestIT.java     |   4 +-
 .../iotdb/cross/tests/utils/EnvironmentUtils.java  | 279 -----------------
 .../iotdb/cross/tests/utils/TestConstant.java      | 107 -------
 .../src/test/resources/iotdb-engine.properties     |   0
 docs/SystemDesign/DataQuery/AlignByDeviceQuery.md  |  10 +-
 docs/SystemDesign/StorageEngine/WAL.md             |  24 +-
 .../Concept/Data Model and Terminology.md          |   2 +-
 .../DML Data Manipulation Language.md              |  11 +-
 docs/UserGuide/Operation Manual/SQL Reference.md   |  13 +
 .../SystemDesign/DataQuery/AlignByDeviceQuery.md   |  10 +-
 docs/zh/SystemDesign/DataQuery/DataQuery.md        |   2 +
 docs/zh/SystemDesign/DataQuery/OrderByTimeQuery.md | 190 +++++++++++
 docs/zh/SystemDesign/StorageEngine/WAL.md          |  23 ++
 .../Concept/Data Model and Terminology.md          |   2 +-
 .../DML Data Manipulation Language.md              |  10 +-
 .../zh/UserGuide/Operation Manual/SQL Reference.md |  13 +
 .../resources/conf/iotdb-engine.properties         |   4 +-
 .../java/org/apache/iotdb/db/metadata/MTree.java   |   8 +-
 .../org/apache/iotdb/db/metadata/MetaUtils.java    |   6 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  29 +-
 .../iotdb/db/qp/logical/crud/QueryOperator.java    |  20 ++
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |  11 +
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  10 +
 .../iotdb/db/qp/physical/sys/AuthorPlan.java       |  10 +-
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  13 +
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  98 +++---
 .../db/query/aggregation/AggregateResult.java      |   7 +-
 .../db/query/aggregation/impl/AvgAggrResult.java   |   7 +-
 .../db/query/aggregation/impl/CountAggrResult.java |   4 +-
 .../aggregation/impl/FirstValueAggrResult.java     |   9 +-
 .../aggregation/impl/LastValueAggrResult.java      |  15 +-
 .../query/aggregation/impl/MaxTimeAggrResult.java  |   7 +-
 .../query/aggregation/impl/MaxValueAggrResult.java |  13 +-
 .../query/aggregation/impl/MinTimeAggrResult.java  |   9 +-
 .../query/aggregation/impl/MinValueAggrResult.java |  11 +-
 .../db/query/aggregation/impl/SumAggrResult.java   |   7 +-
 .../db/query/dataset/AlignByDeviceDataSet.java     |   4 +
 .../apache/iotdb/db/query/dataset/ListDataSet.java |   4 +
 .../dataset/RawQueryDataSetWithValueFilter.java    |   7 +-
 .../dataset/RawQueryDataSetWithoutValueFilter.java |  39 ++-
 .../dataset/groupby/GroupByEngineDataSet.java      |  45 ++-
 .../db/query/dataset/groupby/GroupByExecutor.java  |   3 +
 .../query/dataset/groupby/GroupByFillDataSet.java  |  58 +++-
 .../groupby/GroupByWithValueFilterDataSet.java     | 118 +++++--
 .../groupby/GroupByWithoutValueFilterDataSet.java  |  57 ++--
 .../dataset/groupby/LocalGroupByExecutor.java      | 108 +++++--
 .../db/query/executor/AggregationExecutor.java     |  58 ++--
 .../iotdb/db/query/executor/LastQueryExecutor.java |  18 +-
 .../iotdb/db/query/executor/QueryRouter.java       |   6 +-
 .../db/query/executor/RawDataQueryExecutor.java    |  73 ++---
 .../iotdb/db/query/executor/fill/LinearFill.java   |   8 +-
 .../db/query/reader/chunk/MemChunkReader.java      |  28 +-
 .../iotdb/db/query/reader/chunk/MemPageReader.java |  38 ++-
 .../reader/series/DescSeriesReaderByTimestamp.java |  53 ++++
 .../db/query/reader/series/IReaderByTimestamp.java |  15 +-
 .../query/reader/series/SeriesAggregateReader.java |   6 +-
 .../reader/series/SeriesRawDataBatchReader.java    |   9 +-
 .../iotdb/db/query/reader/series/SeriesReader.java | 347 ++++++++++++++++-----
 .../reader/series/SeriesReaderByTimestamp.java     |  26 +-
 .../universal/DescPriorityMergeReader.java}        |  39 ++-
 .../reader/universal/PriorityMergeReader.java      |  28 +-
 .../query/timegenerator/ServerTimeGenerator.java   |  15 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   4 +
 .../iotdb/db/engine/merge/MergeManagerTest.java    |   8 +-
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |   2 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       |  14 +-
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   2 +-
 .../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 164 +++++-----
 .../iotdb/db/integration/IoTDBAuthorizationIT.java |  60 +++-
 .../apache/iotdb/db/integration/IoTDBLastIT.java   | 109 ++++---
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java |  17 +-
 .../iotdb/db/integration/IoTDBQuotedPathIT.java    |  93 +++---
 .../iotdb/db/integration/IoTDBSimpleQueryIT.java   | 166 +++++-----
 .../apache/iotdb/db/metadata/MetaUtilsTest.java    |   3 +
 .../dataset/EngineDataSetWithValueFilterTest.java  |  25 +-
 .../db/query/dataset/GroupByFillDataSetTest.java   | 188 +++++++++++
 .../db/query/dataset/GroupByTimeDataSetTest.java   | 150 ++++++---
 .../query/executor/GroupByEngineDataSetTest.java   |   9 +-
 .../reader/series/SeriesAggregateReaderTest.java   |   5 +-
 .../db/query/reader/series/SeriesReaderTest.java   |  37 ++-
 .../apache/iotdb/tsfile/read/common/BatchData.java |  40 ++-
 .../iotdb/tsfile/read/common/BatchDataFactory.java |  23 +-
 .../iotdb/tsfile/read/common/DescBatchData.java    |  66 ++++
 .../org/apache/iotdb/tsfile/read/common/Path.java  |   4 +
 .../iotdb/tsfile/read/common/TimeColumn.java       | 111 -------
 .../tsfile/read/query/dataset/QueryDataSet.java    |   8 +
 .../read/query/timegenerator/TimeGenerator.java    |   6 +-
 .../query/timegenerator/TsFileTimeGenerator.java   |   5 +
 .../read/query/timegenerator/node/AndNode.java     |  57 ++--
 .../read/query/timegenerator/node/LeafNode.java    |   1 -
 .../read/query/timegenerator/node/OrNode.java      |  38 ++-
 .../iotdb/tsfile/read/reader/IPageReader.java      |   7 +-
 .../iotdb/tsfile/read/reader/page/PageReader.java  |   7 +-
 .../tsfile/write/schema/MeasurementSchema.java     |  49 +--
 .../apache/iotdb/tsfile/read/common/PathTest.java  |   3 +
 .../tsfile/read/query/timegenerator/NodeTest.java  |   2 -
 .../tsfile/read/reader/FakedTimeGenerator.java     |   4 +
 100 files changed, 2364 insertions(+), 1393 deletions(-)
 delete mode 100644 cross-tests/src/test/java/org/apache/iotdb/cross/tests/utils/EnvironmentUtils.java
 delete mode 100644 cross-tests/src/test/java/org/apache/iotdb/cross/tests/utils/TestConstant.java
 copy {server => cross-tests}/src/test/resources/iotdb-engine.properties (100%)
 create mode 100644 docs/zh/SystemDesign/DataQuery/OrderByTimeQuery.md
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/DescSeriesReaderByTimestamp.java
 copy server/src/main/java/org/apache/iotdb/db/query/{externalsort/ExternalSortJob.java => reader/universal/DescPriorityMergeReader.java} (51%)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/query/dataset/GroupByFillDataSetTest.java
 copy server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java => tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/BatchDataFactory.java (65%)
 create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/DescBatchData.java
 delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/TimeColumn.java


[incubator-iotdb] 01/02: Merge branch 'master' of https://github.com/apache/incubator-iotdb into master_with_chunk_size

Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch master_with_chunk_size
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit e9336bc4e70f46db84ea63fd26cf32a286651c42
Merge: 20db36f e9defff
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Sep 17 17:07:00 2020 +0800

    Merge branch 'master' of https://github.com/apache/incubator-iotdb into master_with_chunk_size

 .../org/apache/iotdb/db/qp/strategy/SqlBase.g4     |  22 +-
 cross-tests/pom.xml                                |  39 +--
 .../tests/tools/importCsv/AbstractScript.java      |   1 -
 .../tests/tools/importCsv/ImportCsvTestIT.java     |   4 +-
 .../iotdb/cross/tests/utils/EnvironmentUtils.java  | 279 -----------------
 .../iotdb/cross/tests/utils/TestConstant.java      | 107 -------
 .../src/test/resources/iotdb-engine.properties     |  21 ++
 docs/SystemDesign/DataQuery/AlignByDeviceQuery.md  |  10 +-
 docs/SystemDesign/StorageEngine/WAL.md             |  24 +-
 .../Concept/Data Model and Terminology.md          |   2 +-
 .../DML Data Manipulation Language.md              |  11 +-
 docs/UserGuide/Operation Manual/SQL Reference.md   |  13 +
 .../SystemDesign/DataQuery/AlignByDeviceQuery.md   |  10 +-
 docs/zh/SystemDesign/DataQuery/DataQuery.md        |   2 +
 docs/zh/SystemDesign/DataQuery/OrderByTimeQuery.md | 190 +++++++++++
 docs/zh/SystemDesign/StorageEngine/WAL.md          |  23 ++
 .../Concept/Data Model and Terminology.md          |   2 +-
 .../DML Data Manipulation Language.md              |  10 +-
 .../zh/UserGuide/Operation Manual/SQL Reference.md |  13 +
 .../java/org/apache/iotdb/db/metadata/MTree.java   |   8 +-
 .../org/apache/iotdb/db/metadata/MetaUtils.java    |   6 +-
 .../apache/iotdb/db/qp/executor/PlanExecutor.java  |  29 +-
 .../iotdb/db/qp/logical/crud/QueryOperator.java    |  20 ++
 .../apache/iotdb/db/qp/physical/PhysicalPlan.java  |  11 +
 .../iotdb/db/qp/physical/crud/QueryPlan.java       |  10 +
 .../iotdb/db/qp/physical/sys/AuthorPlan.java       |  10 +-
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |  13 +
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  98 +++---
 .../db/query/aggregation/AggregateResult.java      |   7 +-
 .../db/query/aggregation/impl/AvgAggrResult.java   |   7 +-
 .../db/query/aggregation/impl/CountAggrResult.java |   4 +-
 .../aggregation/impl/FirstValueAggrResult.java     |   9 +-
 .../aggregation/impl/LastValueAggrResult.java      |  15 +-
 .../query/aggregation/impl/MaxTimeAggrResult.java  |   7 +-
 .../query/aggregation/impl/MaxValueAggrResult.java |  13 +-
 .../query/aggregation/impl/MinTimeAggrResult.java  |   9 +-
 .../query/aggregation/impl/MinValueAggrResult.java |  11 +-
 .../db/query/aggregation/impl/SumAggrResult.java   |   7 +-
 .../db/query/dataset/AlignByDeviceDataSet.java     |   4 +
 .../apache/iotdb/db/query/dataset/ListDataSet.java |   4 +
 .../dataset/RawQueryDataSetWithValueFilter.java    |   7 +-
 .../dataset/RawQueryDataSetWithoutValueFilter.java |  39 ++-
 .../dataset/groupby/GroupByEngineDataSet.java      |  45 ++-
 .../db/query/dataset/groupby/GroupByExecutor.java  |   3 +
 .../query/dataset/groupby/GroupByFillDataSet.java  |  58 +++-
 .../groupby/GroupByWithValueFilterDataSet.java     | 118 +++++--
 .../groupby/GroupByWithoutValueFilterDataSet.java  |  57 ++--
 .../dataset/groupby/LocalGroupByExecutor.java      | 108 +++++--
 .../db/query/executor/AggregationExecutor.java     |  58 ++--
 .../iotdb/db/query/executor/LastQueryExecutor.java |  18 +-
 .../iotdb/db/query/executor/QueryRouter.java       |   6 +-
 .../db/query/executor/RawDataQueryExecutor.java    |  73 ++---
 .../iotdb/db/query/executor/fill/LinearFill.java   |   8 +-
 .../db/query/reader/chunk/MemChunkReader.java      |  28 +-
 .../iotdb/db/query/reader/chunk/MemPageReader.java |  38 ++-
 .../reader/series/DescSeriesReaderByTimestamp.java |  53 ++++
 .../db/query/reader/series/IReaderByTimestamp.java |  15 +-
 .../query/reader/series/SeriesAggregateReader.java |   6 +-
 .../reader/series/SeriesRawDataBatchReader.java    |   9 +-
 .../iotdb/db/query/reader/series/SeriesReader.java | 347 ++++++++++++++++-----
 .../reader/series/SeriesReaderByTimestamp.java     |  26 +-
 .../reader/universal/DescPriorityMergeReader.java  |  51 +++
 .../reader/universal/PriorityMergeReader.java      |  28 +-
 .../query/timegenerator/ServerTimeGenerator.java   |  15 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   4 +
 .../iotdb/db/engine/merge/MergeManagerTest.java    |   8 +-
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |   2 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       |  14 +-
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   2 +-
 .../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 164 +++++-----
 .../iotdb/db/integration/IoTDBAuthorizationIT.java |  60 +++-
 .../apache/iotdb/db/integration/IoTDBLastIT.java   | 109 ++++---
 .../iotdb/db/integration/IoTDBMetadataFetchIT.java |  17 +-
 .../iotdb/db/integration/IoTDBQuotedPathIT.java    |  93 +++---
 .../iotdb/db/integration/IoTDBSimpleQueryIT.java   | 166 +++++-----
 .../apache/iotdb/db/metadata/MetaUtilsTest.java    |   3 +
 .../dataset/EngineDataSetWithValueFilterTest.java  |  25 +-
 .../db/query/dataset/GroupByFillDataSetTest.java   | 188 +++++++++++
 .../db/query/dataset/GroupByTimeDataSetTest.java   | 150 ++++++---
 .../query/executor/GroupByEngineDataSetTest.java   |   9 +-
 .../reader/series/SeriesAggregateReaderTest.java   |   5 +-
 .../db/query/reader/series/SeriesReaderTest.java   |  37 ++-
 .../apache/iotdb/tsfile/read/common/BatchData.java |  40 ++-
 .../BatchDataFactory.java}                         |  25 +-
 .../iotdb/tsfile/read/common/DescBatchData.java    |  66 ++++
 .../org/apache/iotdb/tsfile/read/common/Path.java  |   4 +
 .../iotdb/tsfile/read/common/TimeColumn.java       | 111 -------
 .../tsfile/read/query/dataset/QueryDataSet.java    |   8 +
 .../read/query/timegenerator/TimeGenerator.java    |   6 +-
 .../query/timegenerator/TsFileTimeGenerator.java   |   5 +
 .../read/query/timegenerator/node/AndNode.java     |  57 ++--
 .../read/query/timegenerator/node/LeafNode.java    |   1 -
 .../read/query/timegenerator/node/OrNode.java      |  38 ++-
 .../iotdb/tsfile/read/reader/IPageReader.java      |   7 +-
 .../iotdb/tsfile/read/reader/page/PageReader.java  |   7 +-
 .../tsfile/write/schema/MeasurementSchema.java     |  49 +--
 .../apache/iotdb/tsfile/read/common/PathTest.java  |   3 +
 .../tsfile/read/query/timegenerator/NodeTest.java  |   2 -
 .../tsfile/read/reader/FakedTimeGenerator.java     |   4 +
 99 files changed, 2410 insertions(+), 1378 deletions(-)


[incubator-iotdb] 02/02: conf

Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch master_with_chunk_size
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 885ab8bfeadb111f98656d1d76fb8686377e9c33
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Sep 17 17:17:49 2020 +0800

    conf
---
 server/src/assembly/resources/conf/iotdb-engine.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index c74f541..91840ad 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -227,10 +227,10 @@ enable_parameter_adapter=true
 
 # Memory Allocation Ratio: Write, Read, and Free Memory.
 # The parameter form is a:b:c, where a, b and c are integers. for example: 1:1:1 , 6:3:1
-write_read_free_memory_proportion=5:3:2
+write_read_free_memory_proportion=4:3:3
 
 # primitive array size (length of each array) in array pool
-primitive_array_size=128
+primitive_array_size=32
 
 ####################
 ### Upgrade Configurations