You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2019/07/15 13:45:46 UTC
[incubator-iotdb] branch fix_create_timeseries_check updated
(2bf13d2 -> 4fb2818)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch fix_create_timeseries_check
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 2bf13d2 add read-only log
add e734368 fix getting timeseries list error in grafana connector
add b018288 [IOTDB-134]Add default parameters for client (#244)
add 2678988 [IOTDB-130]Dynamic parameters adapter (#232)
add 4fb2818 fix conflict after merging master
No new revisions were added by this update.
Summary of changes:
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 3 +-
iotdb-cli/cli/bin/start-client.bat | 6 +-
iotdb-cli/cli/bin/start-client.sh | 9 +-
iotdb/iotdb/conf/iotdb-engine.properties | 23 +-
.../iotdb/db/auth/role/LocalFileRoleAccessor.java | 10 +-
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 7 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 69 +++++-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 1 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 51 +++-
.../iotdb/db/conf/adapter/CompressionRatio.java | 184 ++++++++++++++
.../adapter/IDynamicAdapter.java} | 34 ++-
.../db/conf/adapter/IoTDBConfigDynamicAdapter.java | 275 +++++++++++++++++++++
.../db/conf/directories/DirectoryManager.java | 3 +
.../iotdb/db/cost/statistic/Measurement.java | 29 +--
.../org/apache/iotdb/db/engine/StorageEngine.java | 41 ++-
.../iotdb/db/engine/memtable/ChunkBufferPool.java | 4 +-
.../db/engine/querycontext/ReadOnlyMemChunk.java | 2 +-
.../iotdb/db/engine/storagegroup/FlushManager.java | 2 +-
.../engine/storagegroup/StorageGroupProcessor.java | 40 +--
.../db/engine/storagegroup/TsFileProcessor.java | 36 ++-
...Exception.java => ConfigAdjusterException.java} | 11 +-
.../org/apache/iotdb/db/metadata/MManager.java | 88 ++++---
.../org/apache/iotdb/db/rescon/MemTablePool.java | 23 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 17 +-
.../org/apache/iotdb/db/service/JDBCService.java | 2 +-
.../db/writelog/node/ExclusiveWriteLogNode.java | 8 +-
.../db/conf/adapter/CompressionRatioTest.java | 115 +++++++++
.../adapter/IoTDBConfigDynamicAdapterTest.java | 148 +++++++++++
.../db/cost/statistic/PerformanceStatTest.java | 2 +-
.../iotdb/db/engine/MetadataManagerHelper.java | 1 +
.../iotdb/db/engine/memtable/MemTablePoolTest.java | 20 +-
.../engine/modification/DeletionFileNodeTest.java | 1 +
.../db/engine/modification/DeletionQueryTest.java | 3 +-
.../engine/modification/ModificationFileTest.java | 1 +
.../integration/IoTDBAggregationSmallDataIT.java | 2 +-
.../db/integration/IoTDBEngineTimeGeneratorIT.java | 3 +
.../iotdb/db/integration/IoTDBLargeDataIT.java | 3 +
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 3 +
.../db/integration/IoTDBSequenceDataQueryIT.java | 3 +
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 3 +
.../org/apache/iotdb/db/metadata/MGraphTest.java | 1 +
.../iotdb/db/metadata/MManagerAdvancedTest.java | 2 +
.../iotdb/db/metadata/MManagerBasicTest.java | 1 +
.../iotdb/db/metadata/MManagerImproveTest.java | 1 +
.../org/apache/iotdb/db/metadata/MTreeTest.java | 1 +
.../org/apache/iotdb/db/metadata/MetadataTest.java | 1 +
.../org/apache/iotdb/db/qp/QueryProcessorTest.java | 4 +
.../dataset/EngineDataSetWithValueFilterTest.java | 5 +
.../iotdb/db/query/reader/ReaderTestHelper.java | 7 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 18 ++
.../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 3 +
.../write/writer/RestorableTsFileIOWriter.java | 3 +-
52 files changed, 1153 insertions(+), 180 deletions(-)
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
copy iotdb/src/main/java/org/apache/iotdb/db/{writelog/manager/WriteLogNodeManager.java => conf/adapter/IDynamicAdapter.java} (51%)
create mode 100644 iotdb/src/main/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapter.java
copy iotdb/src/main/java/org/apache/iotdb/db/exception/{FlushRunTimeException.java => ConfigAdjusterException.java} (77%)
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
create mode 100644 iotdb/src/test/java/org/apache/iotdb/db/conf/adapter/IoTDBConfigDynamicAdapterTest.java