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 2020/01/13 02:45:32 UTC
[incubator-iotdb] branch sync_minor_fix updated (2aefafe -> 3a9c00c)
This is an automated email from the ASF dual-hosted git repository.
lta pushed a change to branch sync_minor_fix
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 2aefafe catch all exception
add 9e5f4c6 add release check doc
add aa48a76 Merge branch 'master' of github.com:apache/incubator-iotdb
add 6d8413f add release check doc (#702)
add 0734ec1 Track the merge history in TsFileResource (#683)
add ba7ff96 abstract TsFileFlushPolicy and allow specifying storage groups in flush command (#685)
add d09de2c Edited the English for Readme.md (#703)
add 7a3d5fc Merge branch 'master' of github.com:apache/incubator-iotdb
add 39e811b fix doc
add b882c34 [IOTDB-138] Move All metadata query parser from Client into Server. (#697)
add 7a2e034 continue writing the last unclosed file (#700)
add 73b725e Merge branch 'master' of github.com:apache/incubator-iotdb
add 939bfde remove duplicated doc
add 6366f2b [IOTDB-402] init historicalVersion when recover the last crashed file (#706)
add 1b66c8a add_compression (#708)
add e440b8b [IOTDB-404]fix the bug when recover the last crashed file (#707)
add f10604d Set whether to ignore time in JDBC. (#714)
add 8a2205b [IOTDB-401]Correct the calculation of a chunk if there is no data in the chunk (#709)
add 9952c76 Merge branch 'master' into sync_minor_fix
add 1f2ce1c fix batch bug
add 48ab7c5 Merge pull request #720 from apache/fix_batch_bug
add 4c2c6a3 Change measures' data structure in group by device (#717)
add 2aa5e53 Fix some ResultSets that are unsafely closed (#711)
add 28987b3 Change to groupByDevice execution logic: processing filter by device … (#722)
add 1111c8f fix concurrent modification (#724)
add e8e1b7b [IOTDB-406] refactor environmentutils and IoTDBConfig (#710)
add 279ff01 [IOTDB-412]Paths are not correctly deduplicated (#727)
add 91ccddd Made all tests Locale Invariant by always explicitly defaulting to Locale.ENGLISH. (#726)
add b7a3055 fix gc log collection in start-server.sh scripts
add 0a796a2 set all gc log as info level (though some startup memory allocation log is debug and trace still)
add e9d3d96 Revert "[IOTDB-397]fix gc log collection in start-server.sh scripts" (#730)
add dfa53bc [IOTDB-414] fix the client display and add COMPRESSION keyword. (#728)
add de96790 merge master
add 3a9c00c merge log
No new revisions were added by this update.
Summary of changes:
.gitignore | 13 +-
README.md | 60 +--
.../org/apache/iotdb/client/AbstractClient.java | 107 ++---
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 5 +-
docs/Development-VoteRelease.md | 198 +++++++++
docs/Documentation/UserGuide/0-Content.md | 4 +-
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 7 +-
.../main/java/org/apache/iotdb/jdbc/Constant.java | 29 --
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 207 +--------
.../iotdb/jdbc/IoTDBMetadataResultMetadata.java | 193 ---------
.../apache/iotdb/jdbc/IoTDBMetadataResultSet.java | 427 -------------------
.../org/apache/iotdb/jdbc/IoTDBQueryResultSet.java | 24 +-
.../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 13 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 110 +----
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 463 ---------------------
.../jdbc/IoTDBMetadataResultMetadataTest.java | 108 -----
.../apache/iotdb/jdbc/IoTDBResultMetadataTest.java | 16 +-
.../org/apache/iotdb/jdbc/IoTDBStatementTest.java | 151 -------
server/pom.xml | 12 +
.../src/assembly/resources/conf/logback-sync.xml | 139 -------
server/src/assembly/resources/conf/logback.xml | 20 +
.../assembly/resources/tools/start-sync-client.bat | 2 +-
.../assembly/resources/tools/start-sync-client.sh | 2 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 83 +++-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 20 +
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 10 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 24 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 58 ++-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 12 +-
.../iotdb/db/engine/flush/TsFileFlushPolicy.java | 54 +++
.../iotdb/db/engine/merge/task/MergeFileTask.java | 18 +
.../db/engine/modification/ModificationFile.java | 2 +-
.../io/LocalTextModificationAccessor.java | 2 +-
.../engine/modification/io/ModificationWriter.java | 1 +
.../engine/storagegroup/StorageGroupProcessor.java | 141 +++++--
.../db/engine/storagegroup/TsFileProcessor.java | 27 +-
.../db/engine/storagegroup/TsFileResource.java | 102 ++++-
.../java/org/apache/iotdb/db/metadata/MGraph.java | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 2 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 5 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 7 +
.../qp/executor/AbstractQueryProcessExecutor.java | 189 +++++++--
.../db/qp/executor/IQueryProcessExecutor.java | 11 +-
.../iotdb/db/qp/executor/QueryProcessExecutor.java | 1 +
...torageGroupOperator.java => CountOperator.java} | 31 +-
...upOperator.java => ShowChildPathsOperator.java} | 17 +-
...GroupOperator.java => ShowDevicesOperator.java} | 17 +-
...upOperator.java => ShowTimeSeriesOperator.java} | 19 +-
.../iotdb/db/qp/physical/crud/QueryPlan.java | 10 +
.../sys/CountPlan.java} | 34 +-
.../physical/sys/ShowChildPathsPlan.java} | 21 +-
.../physical/sys/ShowDevicesPlan.java} | 21 +-
.../apache/iotdb/db/qp/physical/sys/ShowPlan.java | 3 +-
.../iotdb/db/qp/physical/sys/ShowTTLPlan.java | 18 +-
.../physical/sys/ShowTimeSeriesPlan.java} | 20 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 68 ++-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 128 +++++-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 93 +----
.../iotdb/db/query/context/QueryContext.java | 19 +-
.../iotdb/db/query/control/QueryFileManager.java | 10 +-
.../db/query/dataset/DeviceIterateDataSet.java | 14 +-
.../NewEngineDataSetWithoutValueFilter.java | 2 +
.../java/org/apache/iotdb/db/service/IoTDB.java | 6 +-
.../org/apache/iotdb/db/service/JDBCService.java | 9 +-
.../apache/iotdb/db/service/MetricsService.java | 43 +-
.../apache/iotdb/db/service/RegisterManager.java | 3 +
.../org/apache/iotdb/db/service/StaticResps.java | 41 ++
.../org/apache/iotdb/db/service/TSServiceImpl.java | 119 ++----
.../iotdb/db/sync/receiver/SyncServerManager.java | 9 +-
.../iotdb/db/tools/TsFileResourcePrinter.java | 8 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 10 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 31 +-
.../java/org/apache/iotdb/db/utils/FileUtils.java | 30 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 5 +
.../writelog/recover/TsFileRecoverPerformer.java | 50 ++-
.../db/conf/adapter/CompressionRatioTest.java | 6 -
.../adapter/IoTDBConfigDynamicAdapterTest.java | 6 -
.../db/engine/cache/DeviceMetaDataCacheTest.java | 3 +-
.../iotdb/db/engine/merge/MergeOverLapTest.java | 6 +
.../iotdb/db/engine/merge/MergeTaskTest.java | 9 +-
.../apache/iotdb/db/engine/merge/MergeTest.java | 6 +
.../engine/modification/DeletionFileNodeTest.java | 17 +-
.../engine/modification/ModificationFileTest.java | 8 +-
.../io/LocalTextModificationAccessorTest.java | 4 +-
.../storagegroup/StorageGroupProcessorTest.java | 3 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 6 +-
.../iotdb/db/integration/IOTDBGroupByIT.java | 5 -
.../integration/IOTDBGroupByInnerIntervalIT.java | 6 -
.../iotdb/db/integration/IoTDBAggregationIT.java | 6 -
.../integration/IoTDBAggregationLargeDataIT.java | 6 -
.../integration/IoTDBAggregationSmallDataIT.java | 6 -
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 156 ++++---
.../db/integration/IoTDBAutoCreateSchemaIT.java | 6 -
.../apache/iotdb/db/integration/IoTDBCloseIT.java | 6 -
.../iotdb/db/integration/IoTDBCompleteIT.java | 6 -
.../apache/iotdb/db/integration/IoTDBDaemonIT.java | 10 +-
.../db/integration/IoTDBDeleteStorageGroupIT.java | 6 -
.../iotdb/db/integration/IoTDBDeletionIT.java | 70 ++--
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 5 -
.../apache/iotdb/db/integration/IoTDBFillIT.java | 6 -
.../db/integration/IoTDBFloatPrecisionIT.java | 6 -
.../db/integration/IoTDBFlushQueryMergeTest.java | 71 +++-
.../iotdb/db/integration/IoTDBGroupbyDeviceIT.java | 29 +-
.../iotdb/db/integration/IoTDBLargeDataIT.java | 5 -
.../iotdb/db/integration/IoTDBLimitSlimitIT.java | 5 -
.../integration/IoTDBLoadExternalTsfileTest.java | 4 -
.../iotdb/db/integration/IoTDBMergeTest.java | 43 +-
.../iotdb/db/integration/IoTDBMetadataFetchIT.java | 281 +++++++------
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 6 -
.../db/integration/IoTDBMultiStatementsIT.java | 6 -
.../iotdb/db/integration/IoTDBNumberPathIT.java | 6 -
.../iotdb/db/integration/IoTDBQueryDemoIT.java | 4 -
.../iotdb/db/integration/IoTDBQuotedPathIT.java | 5 -
.../db/integration/IoTDBSequenceDataQueryIT.java | 5 -
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 5 -
.../iotdb/db/integration/IoTDBSimpleQueryTest.java | 5 -
.../iotdb/db/integration/IoTDBTimeZoneIT.java | 5 -
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 27 +-
.../iotdb/db/integration/IoTDBVersionIT.java | 6 -
.../apache/iotdb/db/qp/plan/PhysicalPlanTest.java | 59 ++-
.../org/apache/iotdb/db/qp/plan/QPUpdateTest.java | 9 +-
.../iotdb/db/query/reader/ReaderTestHelper.java | 3 +-
.../db/sync/receiver/load/FileLoaderTest.java | 5 -
.../recover/SyncReceiverLogAnalyzerTest.java | 5 -
.../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 16 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 59 ++-
.../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 7 -
.../apache/iotdb/db/writelog/PerformanceTest.java | 2 +
.../iotdb/db/writelog/recover/LogReplayerTest.java | 2 +-
.../db/writelog/recover/SeqTsFileRecoverTest.java | 62 ++-
.../writelog/recover/UnseqTsFileRecoverTest.java | 5 +-
server/src/test/resources/logback.xml | 2 +-
service-rpc/rpc-changelist.md | 6 +
service-rpc/src/main/thrift/rpc.thrift | 10 +-
session/pom.xml | 7 +
.../org/apache/iotdb/session/IoTDBSessionIT.java | 7 +-
.../iotdb/session/utils/EnvironmentUtils.java | 190 ---------
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 15 +-
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 2 +
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 1 +
.../iotdb/tsfile/write/TsFileWriterTest.java | 280 +++++++++++++
.../write/writer/RestorableTsFileIOWriterTest.java | 2 +-
142 files changed, 2421 insertions(+), 3223 deletions(-)
create mode 100644 docs/Development-VoteRelease.md
delete mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBMetadataResultMetadata.java
delete mode 100644 jdbc/src/main/java/org/apache/iotdb/jdbc/IoTDBMetadataResultSet.java
delete mode 100644 jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBDatabaseMetadataTest.java
delete mode 100644 jdbc/src/test/java/org/apache/iotdb/jdbc/IoTDBMetadataResultMetadataTest.java
delete mode 100644 server/src/assembly/resources/conf/logback-sync.xml
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/flush/TsFileFlushPolicy.java
copy server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{SetStorageGroupOperator.java => CountOperator.java} (71%)
copy server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{SetStorageGroupOperator.java => ShowChildPathsOperator.java} (79%)
copy server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{SetStorageGroupOperator.java => ShowDevicesOperator.java} (79%)
copy server/src/main/java/org/apache/iotdb/db/qp/logical/sys/{SetStorageGroupOperator.java => ShowTimeSeriesOperator.java} (77%)
copy server/src/main/java/org/apache/iotdb/db/qp/{logical/sys/SetStorageGroupOperator.java => physical/sys/CountPlan.java} (67%)
copy server/src/main/java/org/apache/iotdb/db/{engine/merge/selector/IMergePathSelector.java => qp/physical/sys/ShowChildPathsPlan.java} (74%)
copy server/src/main/java/org/apache/iotdb/db/{engine/merge/selector/IMergePathSelector.java => qp/physical/sys/ShowDevicesPlan.java} (74%)
copy server/src/main/java/org/apache/iotdb/db/{engine/merge/selector/IMergePathSelector.java => qp/physical/sys/ShowTimeSeriesPlan.java} (74%)
copy tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileInputFactory/LocalFSInputFactory.java => server/src/main/java/org/apache/iotdb/db/utils/FileUtils.java (60%)
delete mode 100644 session/src/test/java/org/apache/iotdb/session/utils/EnvironmentUtils.java
create mode 100644 tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriterTest.java