You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/07/18 11:41:53 UTC
[incubator-iotdb] branch dev_memory_estimate_tool updated (8ec3f56
-> b196596)
This is an automated email from the ASF dual-hosted git repository.
lta pushed a change to branch dev_memory_estimate_tool
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
omit 8ec3f56 add sync CHN docu and memory tool docu
add 9813bb0 add sync CHN docu and memory tool docu
add 4c67e79 refactor readonly mode check
add 2bf13d2 add read-only log
add 4fb2818 fix conflict after merging master
add 7e04cd6 Merge pull request #245 from apache/fix_create_timeseries_check
add 3e95348 [IOTDB-73]Add new encoding method for regular timestamp column
add 78f0ac5 Delete TSRecordBatch.java
add 43271bb Update documentation
add d1522e7 Code reformat
add 19c56aa Merge pull request #231 from jack870131/missing_point_encoding
add 0c37235 [release preparation] Updated scm information in pom
add 1884dd2 [maven-release-plugin] prepare branch rel/0.8
add 88f8e5b [maven-release-plugin] prepare for next development iteration
add 647c11a perfect documents * Fix words that are inconsistent with the document * Update some screenshots * Modify the layout of some content
add 9ed439b Synchronized Modification of Chinese Documents
add f16ea72 perfect the README.md document of JDBC project
add 67714b8 Update docs/Documentation-CHN/UserGuideV0.7.0/4-Deployment and Management/2-Configuration.md
add 33af5f1 Merge pull request #249 from lvpengze/perfect_documents
add f967491 Tried to solve issue 140
add 176288e Update 0-Content.md
add c9e2bfa Merge pull request #251 from samperson1997/update_content
add d728162 Fix errors in 1-Deployment.md
add 4e0f99a Merge pull request #252 from y-wan/patch-2
add d977e45 Fixed minor formatting issues in pom files.
add 923d8d9 Fixed a bug where CompressionRatioTest fail on a System with Locale different than English.
add 3c09832 Fixed a bug where all tests in IoTDBAggregationIT fail on a System with Locale different than English.
add d47c41b Fixed a bug where tests in IoTDBDeletionIT fail on a System with Locale different than English.
add a4593e3 Refactor the reader package for readability (#241)
add cd83557 Merge pull request #255 from LeiRui/cherrypick07171438
add ee7390c add documents to explain how to use IDEA/Eclipse to develop IoTDB
add d4e397e add mark antlr and thrift directories as source code
add 29523ea fix grammar issues
add 5c03444 Merge pull request #259 from apache/doc_add_how_to_import_iotdb_to_ide
add 327d2b2 Change String literal "UTF-8" into StandardCharsets.UTF_8
add 6d297df Merge pull request #257 from Genius-pig/master
add f5caa99 improve some code in UnseqResourceMergeReader
add 99c37c9 Merge pull request #263 from LeiRui/improveReader
add a1b906d TsFile Docs (#247)
add b196596 merge master
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8ec3f56)
\
N -- N -- N refs/heads/dev_memory_estimate_tool (b196596)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
docs/Development.md | 80 +++-
.../2-Data Type.md | 12 +-
.../3-Encoding.md | 10 +-
.../3-Operation Manual/3-Data Import.md | 2 +-
.../3-Operation Manual/4-Data Query.md | 6 +-
.../4-Deployment and Management/1-Deployment.md | 4 +-
.../4-Deployment and Management/2-Configuration.md | 20 +-
.../3-System Monitor.md | 4 +-
.../1-IoTDB Query Statement.md | 2 +-
.../{7-System Tools => 8-System Tools}/1-Sync.md | 0
.../2-Memory Estimation Tool.md | 0
.../{7-Tools-Cli.md => 8-Tools-Cli.md} | 0
.../{7-Tools-Grafana.md => 8-Tools-Grafana.md} | 0
.../{7-Tools-Hadoop.md => 8-Tools-Hadoop.md} | 0
.../{7-Tools-spark.md => 8-Tools-spark.md} | 0
docs/Documentation/UserGuideV0.7.0/0-Content.md | 15 +-
.../2-Data Type.md | 10 +-
.../3-Encoding.md | 10 +-
.../3-Operation Manual/3-Data Import.md | 4 +-
.../3-Operation Manual/4-Data Query.md | 6 +-
.../4-Deployment and Management/2-Configuration.md | 18 +-
.../3-System Monitor.md | 6 +-
.../1-IoTDB Query Statement.md | 2 +-
.../UserGuideV0.7.0/7-TsFile/1-Installation.md | 93 ++++
.../UserGuideV0.7.0/7-TsFile/2-Usage.md | 525 +++++++++++++++++++++
.../{7-System Tools => 8-System Tools}/1-Sync.md | 0
.../2-Memory Estimation Tool.md | 0
.../{7-Tools-Cli.md => 8-Tools-Cli.md} | 0
.../{7-Tools-Grafana.md => 8-Tools-Grafana.md} | 0
.../{7-Tools-Hadoop.md => 8-Tools-Hadoop.md} | 0
.../{7-Tools-spark.md => 8-Tools-spark.md} | 0
example/kafka/pom.xml | 2 +-
example/pom.xml | 2 +-
example/rocketmq/pom.xml | 2 +-
grafana/pom.xml | 4 +-
iotdb-cli/pom.xml | 4 +-
iotdb/pom.xml | 2 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +
.../iotdb/db/conf/adapter/CompressionRatio.java | 6 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 27 +-
.../engine/storagegroup/StorageGroupProcessor.java | 4 +-
.../db/engine/storagegroup/TsFileProcessor.java | 6 +-
.../db/exception/builder/ExceptionBuilder.java | 3 +-
.../org/apache/iotdb/db/metadata/MManager.java | 5 -
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 62 ++-
.../db/query/aggregation/AggregateFunction.java | 4 +-
.../db/query/aggregation/impl/CountAggrFunc.java | 4 +-
.../db/query/aggregation/impl/FirstAggrFunc.java | 4 +-
.../db/query/aggregation/impl/LastAggrFunc.java | 4 +-
.../db/query/aggregation/impl/MaxTimeAggrFunc.java | 4 +-
.../query/aggregation/impl/MaxValueAggrFunc.java | 4 +-
.../db/query/aggregation/impl/MeanAggrFunc.java | 4 +-
.../db/query/aggregation/impl/MinTimeAggrFunc.java | 4 +-
.../query/aggregation/impl/MinValueAggrFunc.java | 4 +-
.../dataset/EngineDataSetWithValueFilter.java | 10 +-
.../groupby/GroupByWithValueFilterDataSet.java | 15 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 25 +-
.../db/query/executor/AggregateEngineExecutor.java | 40 +-
.../iotdb/db/query/executor/EngineExecutor.java | 32 +-
.../db/query/factory/ISeriesReaderFactory.java | 90 ----
.../db/query/factory/SeriesReaderFactoryImpl.java | 286 -----------
.../java/org/apache/iotdb/db/query/fill/IFill.java | 5 +-
.../iotdb/db/query/reader/IAggregateReader.java | 7 +-
.../apache/iotdb/db/query/reader/IBatchReader.java | 1 -
.../apache/iotdb/db/query/reader/IPointReader.java | 3 +-
...derByTimeStamp.java => IReaderByTimestamp.java} | 17 +-
.../reader/SeriesReaderWithoutValueFilter.java | 134 ------
.../DiskChunkReader.java | 16 +-
.../DiskChunkReaderByTimestamp.java | 36 +-
.../{mem => chunkRelated}/MemChunkReader.java | 19 +-
.../MemChunkReaderByTimestamp.java | 19 +-
.../FileSeriesReaderAdapter.java | 11 +-
.../FileSeriesReaderByTimestampAdapter.java | 15 +-
.../fileRelated/UnSealedTsFileIterateReader.java | 130 +++++
.../UnSealedTsFileReaderByTimestamp.java | 96 ++++
.../reader/merge/SeriesReaderByTimestamp.java | 72 ---
.../resourceRelated/SeqResourceIterateReader.java | 186 ++++++++
.../SeqResourceReaderByTimestamp.java | 189 ++++++++
.../resourceRelated/UnseqResourceMergeReader.java | 143 ++++++
.../UnseqResourceReaderByTimestamp.java | 97 ++++
.../reader/sequence/SequenceSeriesReader.java | 155 ------
.../sequence/SequenceSeriesReaderByTimestamp.java | 156 ------
.../reader/sequence/UnSealedTsFileReader.java | 96 ----
.../sequence/UnSealedTsFileReaderByTimestamp.java | 93 ----
.../seriesRelated/SeriesReaderByTimestamp.java | 57 +++
.../SeriesReaderWithValueFilter.java | 42 +-
.../SeriesReaderWithoutValueFilter.java | 171 +++++++
.../{sequence => universal}/IterateReader.java | 20 +-
.../PriorityMergeReader.java} | 26 +-
.../universal/PriorityMergeReaderByTimestamp.java | 75 +++
.../query/timegenerator/EngineNodeConstructor.java | 6 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 75 ++-
.../writelog/manager/MultiFileLogNodeManager.java | 3 +-
.../db/writelog/node/ExclusiveWriteLogNode.java | 4 +-
.../db/conf/adapter/CompressionRatioTest.java | 14 +-
.../iotdb/db/exception/ExceptionBuilderTest.java | 5 +-
.../iotdb/db/integration/IoTDBAggregationIT.java | 14 +-
.../iotdb/db/integration/IoTDBDeletionIT.java | 10 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 1 +
.../UnSealedTsFileReaderTest.java} | 23 +-
.../SeqResourceReaderTest.java} | 46 +-
.../resourceRelated/UnseqResourceReaderTest.java | 141 ++++++
.../{ => seriesRelated}/FakedIBatchPoint.java | 26 +-
.../{ => seriesRelated}/FakedIPointReader.java | 9 +-
.../SeriesReaderWithValueFilterTest.java | 61 +++
.../SeriesReaderWithoutValueFilterTest.java | 14 +-
.../FakedSeriesReaderByTimestamp.java | 9 +-
.../PriorityMergeReaderByTimestampTest.java} | 30 +-
.../PriorityMergeReaderTest.java} | 15 +-
.../PriorityMergeReaderTest2.java} | 21 +-
.../UnseqSeriesReaderByTimestampTest.java | 97 ----
.../unsequence/UnsequenceSeriesReaderTest.java | 95 ----
.../apache/iotdb/db/utils/EnvironmentUtils.java | 1 +
.../writelog/recover/UnseqTsFileRecoverTest.java | 12 +-
jdbc/README.md | 157 +++++-
jdbc/pom.xml | 7 +-
pom.xml | 10 +-
service-rpc/pom.xml | 2 +-
spark/pom.xml | 2 +-
tsfile/example/readme.md | 15 +-
.../java/org/apache/iotdb/tsfile/TsFileRead.java | 86 ++--
.../java/org/apache/iotdb/tsfile/TsFileWrite.java | 233 +++------
tsfile/pom.xml | 2 +-
.../iotdb/tsfile/encoding/decoder/Decoder.java | 10 +
...aBinaryDecoder.java => RegularDataDecoder.java} | 160 ++++---
.../encoding/encoder/RegularDataEncoder.java | 361 ++++++++++++++
.../tsfile/encoding/encoder/TSEncodingBuilder.java | 27 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 2 +-
.../tsfile/file/metadata/enums/TSEncoding.java | 6 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 4 +-
.../apache/iotdb/tsfile/write/TsFileWriter.java | 5 -
.../iotdb/tsfile/write/schema/FileSchema.java | 17 -
.../iotdb/tsfile/write/schema/JsonConverter.java | 203 --------
.../apache/iotdb/tsfile/compress/CompressTest.java | 13 +-
.../apache/iotdb/tsfile/compress/SnappyTest.java | 3 +-
.../decoder/delta/DeltaBinaryEncoderLongTest.java | 32 +-
.../regular/RegularDataEncoderIntegerTest.java | 145 ++++++
.../regular/RegularDataEncoderLongTest.java | 223 +++++++++
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 63 +--
.../apache/iotdb/tsfile/utils/FileGenerator.java | 60 +--
.../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 52 +-
.../org/apache/iotdb/tsfile/write/PerfTest.java | 38 +-
.../iotdb/tsfile/write/ReadPageInMemTest.java | 59 +--
.../iotdb/tsfile/write/TsFileReadWriteTest.java | 24 +-
.../org/apache/iotdb/tsfile/write/WriteTest.java | 46 +-
.../write/schema/converter/JsonConverterTest.java | 126 -----
tsfile/src/test/resources/test_schema.json | 25 -
tsfile/src/test/resources/test_write_schema.json | 31 --
148 files changed, 3823 insertions(+), 2747 deletions(-)
rename docs/Documentation-CHN/UserGuideV0.7.0/{7-System Tools => 8-System Tools}/1-Sync.md (100%)
rename docs/Documentation-CHN/UserGuideV0.7.0/{7-System Tools => 8-System Tools}/2-Memory Estimation Tool.md (100%)
rename docs/Documentation-CHN/UserGuideV0.7.0/{7-Tools-Cli.md => 8-Tools-Cli.md} (100%)
rename docs/Documentation-CHN/UserGuideV0.7.0/{7-Tools-Grafana.md => 8-Tools-Grafana.md} (100%)
rename docs/Documentation-CHN/UserGuideV0.7.0/{7-Tools-Hadoop.md => 8-Tools-Hadoop.md} (100%)
rename docs/Documentation-CHN/UserGuideV0.7.0/{7-Tools-spark.md => 8-Tools-spark.md} (100%)
create mode 100644 docs/Documentation/UserGuideV0.7.0/7-TsFile/1-Installation.md
create mode 100644 docs/Documentation/UserGuideV0.7.0/7-TsFile/2-Usage.md
rename docs/Documentation/UserGuideV0.7.0/{7-System Tools => 8-System Tools}/1-Sync.md (100%)
rename docs/Documentation/UserGuideV0.7.0/{7-System Tools => 8-System Tools}/2-Memory Estimation Tool.md (100%)
rename docs/Documentation/UserGuideV0.7.0/{7-Tools-Cli.md => 8-Tools-Cli.md} (100%)
rename docs/Documentation/UserGuideV0.7.0/{7-Tools-Grafana.md => 8-Tools-Grafana.md} (100%)
rename docs/Documentation/UserGuideV0.7.0/{7-Tools-Hadoop.md => 8-Tools-Hadoop.md} (100%)
rename docs/Documentation/UserGuideV0.7.0/{7-Tools-spark.md => 8-Tools-spark.md} (100%)
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/factory/ISeriesReaderFactory.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactoryImpl.java
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/{IReaderByTimeStamp.java => IReaderByTimestamp.java} (60%)
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/SeriesReaderWithoutValueFilter.java
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/{unsequence => chunkRelated}/DiskChunkReader.java (78%)
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/{unsequence => chunkRelated}/DiskChunkReaderByTimestamp.java (67%)
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/{mem => chunkRelated}/MemChunkReader.java (88%)
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/{mem => chunkRelated}/MemChunkReaderByTimestamp.java (73%)
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/{sequence/adapter => fileRelated}/FileSeriesReaderAdapter.java (76%)
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/{sequence/adapter => fileRelated}/FileSeriesReaderByTimestampAdapter.java (72%)
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderByTimestamp.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/merge/SeriesReaderByTimestamp.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderByTimestamp.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceMergeReader.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderByTimestamp.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceSeriesReader.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/SequenceSeriesReaderByTimestamp.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/UnSealedTsFileReader.java
delete mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/sequence/UnSealedTsFileReaderByTimestamp.java
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderByTimestamp.java
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/{ => seriesRelated}/SeriesReaderWithValueFilter.java (54%)
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/{sequence => universal}/IterateReader.java (74%)
rename iotdb/src/main/java/org/apache/iotdb/db/query/reader/{unsequence/UnsequenceSeriesReader.java => universal/PriorityMergeReader.java} (79%)
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReaderByTimestamp.java
rename iotdb/src/test/java/org/apache/iotdb/db/query/reader/{sequence/UnsealedSeqReaderTest.java => fileRelated/UnSealedTsFileReaderTest.java} (81%)
rename iotdb/src/test/java/org/apache/iotdb/db/query/reader/{sequence/SeqDataReaderTest.java => resourceRelated/SeqResourceReaderTest.java} (68%)
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/UnseqResourceReaderTest.java
rename iotdb/src/test/java/org/apache/iotdb/db/query/reader/{ => seriesRelated}/FakedIBatchPoint.java (92%)
rename iotdb/src/test/java/org/apache/iotdb/db/query/reader/{ => seriesRelated}/FakedIPointReader.java (90%)
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java
rename iotdb/src/test/java/org/apache/iotdb/db/query/reader/{ => seriesRelated}/SeriesReaderWithoutValueFilterTest.java (90%)
rename iotdb/src/test/java/org/apache/iotdb/db/query/reader/{ => universal}/FakedSeriesReaderByTimestamp.java (93%)
rename iotdb/src/test/java/org/apache/iotdb/db/query/reader/{merge/SeriesReaderByTimestampTest.java => universal/PriorityMergeReaderByTimestampTest.java} (85%)
rename iotdb/src/test/java/org/apache/iotdb/db/query/reader/{merge/SeriesMergeSortReaderTest.java => universal/PriorityMergeReaderTest.java} (86%)
rename iotdb/src/test/java/org/apache/iotdb/db/query/reader/{merge/UnsequenceSeriesReaderTest.java => universal/PriorityMergeReaderTest2.java} (83%)
delete mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/reader/unsequence/UnseqSeriesReaderByTimestampTest.java
delete mode 100644 iotdb/src/test/java/org/apache/iotdb/db/query/reader/unsequence/UnsequenceSeriesReaderTest.java
copy tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/{DeltaBinaryDecoder.java => RegularDataDecoder.java} (60%)
create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/RegularDataEncoder.java
delete mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/JsonConverter.java
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/regular/RegularDataEncoderIntegerTest.java
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/encoding/decoder/regular/RegularDataEncoderLongTest.java
delete mode 100755 tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/JsonConverterTest.java
delete mode 100644 tsfile/src/test/resources/test_schema.json
delete mode 100644 tsfile/src/test/resources/test_write_schema.json