This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_TTL
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 499de7b fix losing ttl after restart add show ttl
add 6849f79 fix ignoreTimeStamp IOTDB-214; simplify some jdbc interfaces
(#392)
add efe249b using String.getBytes(utf-9).length to replace
string.length() in ChunkGroupMetadata for supporting Chinese (#396)
add 0c57d25 [IOTDB-222] Fix changing to read-only mode when flushing
Tsfile on HDFS (#397)
add 978338a fix rpc error (#401)
add c566bf5 [IOTDB-223]Add a TsFile sketch tool (#398)
add 62f8f2f [IOTDB-224] fix buffer size and remove cache (#400)
add 2b5da1a Rename some varaible names and struct names in RPC (#404)
add 8ea1fc6 Remove static, add getter and setter. (#403)
add 1769a7c Update document affected by renaming RPC (#405)
add 2a60c14 update servlet-api version (#407)
add 767a4aa exclusion servlet in iotdb-jdbc (#408)
add 1776c30 add flush and close log in StorageGroupProcessor
add 9358431 catch runtime exception when inserting memtable
add 9a2507a remove unthrowed exception
add 5d4edb5 remove author
add ab3e684 remove deprecated
add 9de6e12 Merge pull request #410 from apache/improve_log
add 8195a08 rename delete to deleteData in session
add 3a281cf add delete timeseries in session
add ad3b924 Merge pull request #411 from
apache/delete_timeseries_in_session
new 6d72f01 Merge branch 'master' into dev_TTL
The 1 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:
.gitignore | 2 +
.../org/apache/iotdb/client/AbstractClient.java | 12 +-
.../main/java/org/apache/iotdb/tool/ExportCsv.java | 1 -
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 2 -
.../UserGuide/6-JDBC API/2-Status Code.md | 2 +-
.../UserGuide/7-Session API/1-Session API.md | 30 +-
.../UserGuide/6-JDBC API/2-Status Code.md | 2 +-
.../UserGuide/7-Session API/1-Session API.md | 30 +-
.../UserGuide/8-TsFile/3-Hierarchy.md | 86 ++++-
.../main/java/org/apache/iotdb/kafka/Constant.java | 3 -
.../java/org/apache/iotdb/kafka/KafkaConsumer.java | 2 -
.../apache/iotdb/kafka/KafkaConsumerThread.java | 3 -
.../java/org/apache/iotdb/kafka/KafkaProducer.java | 2 -
.../java/org/apache/iotdb/rocketmq/Constant.java | 3 -
.../apache/iotdb/rocketmq/RocketMQConsumer.java | 3 -
.../apache/iotdb/rocketmq/RocketMQProducer.java | 3 -
.../main/java/org/apache/iotdb/rocketmq/Utils.java | 3 -
.../main/java/org/apache/iotdb/SessionExample.java | 26 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 2 +-
.../org/apache/iotdb/tsfile/TsFileSketchTool.java | 220 +++++++++++++
grafana/pom.xml | 6 +
.../iotdb/tsfile/hadoop/TSFHadoopException.java | 3 -
.../apache/iotdb/tsfile/hadoop/TSFInputFormat.java | 3 -
.../apache/iotdb/tsfile/hadoop/TSFInputSplit.java | 2 -
.../iotdb/tsfile/hadoop/TSFRecordReader.java | 3 -
.../tsfile/hadoop/example/TSFMRReadExample.java | 2 -
.../iotdb/tsfile/hadoop/io/HDFSInputStream.java | 2 -
.../iotdb/tsfile/hadoop/io/HDFSOutputStream.java | 2 -
.../edu/thu/tsfile/hadoop/TSFInputSplitTest.java | 2 -
.../main/java/org/apache/iotdb/jdbc/Constant.java | 2 +
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 4 +-
.../jdbc/IoTDBPreparedInsertionStatement.java | 4 +-
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 357 +++++++++++----------
.../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 62 ++--
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 39 +--
.../test/java/org/apache/iotdb/jdbc/BatchTest.java | 10 +-
.../org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 8 +-
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 6 +-
.../iotdb/jdbc/IoTDBPreparedStatementTest.java | 9 +-
.../apache/iotdb/jdbc/IoTDBQueryResultSetTest.java | 11 +-
.../apache/iotdb/jdbc/IoTDBResultMetadataTest.java | 24 +-
.../org/apache/iotdb/jdbc/IoTDBStatementTest.java | 6 +-
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 15 +-
.../org/apache/iotdb/db/auth/AuthException.java | 2 -
.../db/concurrent/IoTDBThreadPoolFactory.java | 2 -
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 7 +-
.../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 7 +-
.../directories/strategy/DirectoryStrategy.java | 2 -
.../org/apache/iotdb/db/engine/StorageEngine.java | 15 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 3 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 29 +-
.../iotdb/db/engine/memtable/ChunkBufferPool.java | 2 -
.../apache/iotdb/db/engine/memtable/IMemTable.java | 5 +-
.../db/engine/merge/manage/MergeResource.java | 4 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 3 +-
.../engine/storagegroup/StorageGroupProcessor.java | 29 +-
.../db/engine/storagegroup/TsFileProcessor.java | 9 +-
.../db/engine/storagegroup/TsFileResource.java | 11 +-
.../db/exception/DeltaEngineRunningException.java | 2 -
.../iotdb/db/exception/MetadataErrorException.java | 2 -
.../iotdb/db/exception/OutOfTTLException.java | 3 +-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 3 +-
.../org/apache/iotdb/db/metadata/MManager.java | 3 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 3 +-
.../iotdb/db/monitor/collector/FileSize.java | 3 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 4 +-
.../iotdb/db/qp/physical/crud/DeletePlan.java | 4 +
.../iotdb/db/qp/physical/sys/MetadataPlan.java | 12 +
.../iotdb/db/qp/strategy/LogicalGenerator.java | 3 +-
.../org/apache/iotdb/db/service/TSServiceImpl.java | 312 +++++++++++-------
.../java/org/apache/iotdb/db/utils/MathUtils.java | 13 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 5 +-
.../iotdb/db/engine/MetadataManagerHelper.java | 10 +-
.../db/engine/cache/DeviceMetaDataCacheTest.java | 7 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 3 +-
.../engine/modification/DeletionFileNodeTest.java | 3 +-
.../db/engine/modification/DeletionQueryTest.java | 3 +-
.../storagegroup/StorageGroupProcessorTest.java | 10 +-
.../engine/storagegroup/TsFileProcessorTest.java | 13 +-
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 18 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 18 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 18 +-
.../db/integration/IoTDBSequenceDataQueryIT.java | 18 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 18 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 3 +-
.../org/apache/iotdb/db/qp/QueryProcessorTest.java | 5 +-
.../db/qp/other/TSPlanContextPropertyTest.java | 3 -
.../iotdb/db/query/reader/ReaderTestHelper.java | 8 +-
.../fileRelated/UnSealedTsFileReaderTest.java | 14 +-
.../resourceRelated/SeqResourceReaderTest.java | 4 +-
.../resourceRelated/UnseqResourceReaderTest.java | 4 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 3 -
.../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 7 +-
service-rpc/rpc-changelist.md | 10 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 6 +-
.../rpc/{TSStatusType.java => TSStatusCode.java} | 4 +-
service-rpc/src/main/thrift/rpc.thrift | 50 ++-
.../java/org/apache/iotdb/session/Session.java | 65 +++-
.../org/apache/iotdb/session/IoTDBSessionIT.java | 58 +++-
.../iotdb/session/utils/EnvironmentUtils.java | 14 +-
.../java/org/apache/iotdb/sparkdb/SQLConstant.java | 1 -
.../scala/org/apache/iotdb/sparkdb/Converter.scala | 13 +-
.../org/apache/iotdb/sparkdb/EnvironmentUtils.java | 3 -
.../scala/org/apache/iotdb/sparkdb/IoTDBTest.scala | 63 +++-
.../org/apache/iotdb/tool/TsFileWriteTool.java | 2 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 205 ++++++++++--
.../iotdb/tsfile/common/conf/TSFileDescriptor.java | 48 ++-
.../tsfile/encoding/bitpacking/IntPacker.java | 1 -
.../tsfile/encoding/bitpacking/LongPacker.java | 1 -
.../tsfile/encoding/common/EncodingConfig.java | 2 -
.../iotdb/tsfile/encoding/common/EndianType.java | 2 -
.../encoding/decoder/DeltaBinaryDecoder.java | 1 -
.../tsfile/encoding/decoder/PlainDecoder.java | 3 -
.../encoding/decoder/RegularDataDecoder.java | 1 -
.../tsfile/encoding/encoder/BitmapEncoder.java | 3 -
.../encoding/encoder/DeltaBinaryEncoder.java | 2 -
.../iotdb/tsfile/encoding/encoder/Encoder.java | 2 -
.../encoding/encoder/RegularDataEncoder.java | 2 -
.../tsfile/encoding/encoder/TSEncodingBuilder.java | 16 +-
.../tsfile/exception/TsFileRuntimeException.java | 2 -
.../encoding/TsFileDecodingException.java | 2 -
.../encoding/TsFileEncodingException.java | 2 -
.../exception/filter/FilterDataTypeException.java | 43 ---
.../exception/filter/FilterInvokeException.java | 42 ---
.../metadata/MetadataArgsErrorException.java | 35 --
.../write/InvalidJsonSchemaException.java | 34 --
.../write/UnknownColumnTypeException.java | 2 -
.../exception/write/WriteProcessException.java | 2 -
.../iotdb/tsfile/file/footer/ChunkGroupFooter.java | 2 +-
.../iotdb/tsfile/file/header/ChunkHeader.java | 7 +-
.../tsfile/file/metadata/ChunkGroupMetaData.java | 12 +-
.../iotdb/tsfile/file/metadata/ChunkMetaData.java | 8 +-
.../file/metadata/statistics/BinaryStatistics.java | 2 -
.../metadata/statistics/BooleanStatistics.java | 2 -
.../file/metadata/statistics/DoubleStatistics.java | 2 -
.../file/metadata/statistics/FloatStatistics.java | 2 -
.../metadata/statistics/IntegerStatistics.java | 2 -
.../file/metadata/statistics/LongStatistics.java | 2 -
.../file/metadata/statistics/NoStatistics.java | 2 -
.../file/metadata/statistics/Statistics.java | 2 -
.../apache/iotdb/tsfile/fileSystem/HDFSFile.java | 27 +-
.../iotdb/tsfile/fileSystem/TSFileFactory.java | 49 ++-
.../org/apache/iotdb/tsfile/read/common/Path.java | 2 -
.../apache/iotdb/tsfile/read/common/TimeRange.java | 2 -
.../tsfile/read/expression/IBinaryExpression.java | 3 -
.../tsfile/read/filter/basic/UnaryFilter.java | 1 -
.../read/query/timegenerator/node/NodeType.java | 2 -
.../tsfile/read/reader/chunk/ChunkReader.java | 3 +-
.../java/org/apache/iotdb/tsfile/utils/Binary.java | 12 +-
.../org/apache/iotdb/tsfile/utils/BytesUtils.java | 14 +-
.../java/org/apache/iotdb/tsfile/utils/Pair.java | 1 -
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 2 -
.../apache/iotdb/tsfile/utils/StringContainer.java | 2 -
.../apache/iotdb/tsfile/write/TsFileWriter.java | 4 +-
.../iotdb/tsfile/write/chunk/ChunkBuffer.java | 2 -
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 4 +-
.../tsfile/write/chunk/IChunkGroupWriter.java | 2 -
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 2 -
.../apache/iotdb/tsfile/write/page/PageWriter.java | 2 -
.../apache/iotdb/tsfile/write/record/RowBatch.java | 6 +-
.../write/record/datapoint/BooleanDataPoint.java | 1 -
.../tsfile/write/record/datapoint/DataPoint.java | 2 -
.../write/record/datapoint/DoubleDataPoint.java | 1 -
.../write/record/datapoint/FloatDataPoint.java | 1 -
.../write/record/datapoint/IntDataPoint.java | 1 -
.../write/record/datapoint/LongDataPoint.java | 1 -
.../write/record/datapoint/StringDataPoint.java | 1 -
.../tsfile/write/schema/MeasurementSchema.java | 9 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 2 -
.../apache/iotdb/tsfile/compress/CompressTest.java | 5 -
.../apache/iotdb/tsfile/compress/SnappyTest.java | 3 -
.../tsfile/constant/TimeseriesTestConstant.java | 3 -
.../metadata/statistics/BooleanStatisticsTest.java | 3 -
.../iotdb/tsfile/read/ReadOnlyTsFileTest.java | 4 +-
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 2 +-
.../read/query/executor/QueryExecutorTest.java | 2 +-
.../query/timegenerator/ReaderByTimestampTest.java | 2 +-
.../query/timegenerator/TimeGeneratorTest.java | 2 +-
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 18 +-
.../iotdb/tsfile/read/reader/ReaderTest.java | 2 +-
.../iotdb/tsfile/utils/CommonTestConstant.java | 3 -
.../apache/iotdb/tsfile/utils/FileGenerator.java | 15 +-
.../org/apache/iotdb/tsfile/utils/FileUtils.java | 2 -
.../apache/iotdb/tsfile/utils/FileUtilsTest.java | 3 -
.../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 17 +-
.../iotdb/tsfile/utils/StringContainerTest.java | 5 -
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 10 +-
.../org/apache/iotdb/tsfile/write/PerfTest.java | 11 +-
.../iotdb/tsfile/write/ReadPageInMemTest.java | 36 ++-
.../iotdb/tsfile/write/TsFileReadWriteTest.java | 5 +-
.../org/apache/iotdb/tsfile/write/WriteTest.java | 18 +-
.../write/schema/converter/SchemaBuilderTest.java | 3 -
193 files changed, 1603 insertions(+), 1232 deletions(-)
create mode 100644
example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileSketchTool.java
rename service-rpc/src/main/java/org/apache/iotdb/rpc/{TSStatusType.java =>
TSStatusCode.java} (96%)
delete mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterDataTypeException.java
delete mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/exception/filter/FilterInvokeException.java
delete mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/exception/metadata/MetadataArgsErrorException.java
delete mode 100644
tsfile/src/main/java/org/apache/iotdb/tsfile/exception/write/InvalidJsonSchemaException.java
