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 2020/09/03 13:39:10 UTC
[incubator-iotdb] branch merge updated (7422734 -> 3f97e7b)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 7422734 Compaction comflicts (#1680)
add 3f97e7b [merge]Compaction conflicts (#1686)
No new revisions were added by this update.
Summary of changes:
.mvn/wrapper/MavenWrapperDownloader.java | 10 +-
.../org/apache/iotdb/db/qp/strategy/SqlBase.g4 | 16 +-
.../java/org/apache/iotdb/cli/AbstractCli.java | 3 +
.../main/java/org/apache/iotdb/tool/ExportCsv.java | 1 +
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 51 +-
.../DML Data Manipulation Language.md | 18 +-
docs/UserGuide/Operation Manual/SQL Reference.md | 47 +
.../DML Data Manipulation Language.md | 18 +-
.../zh/UserGuide/Operation Manual/SQL Reference.md | 47 +
.../org/apache/iotdb/flink/FlinkIoTDBSink.java | 4 +-
.../iotdb/hadoop/tsfile/TSFMRReadExample.java | 3 +-
.../iotdb/hadoop/tsfile/TSMRWriteExample.java | 3 +-
.../apache/iotdb/hadoop/tsfile/TsFileHelper.java | 44 +-
.../java/org/apache/iotdb/tsfile/TsFileRead.java | 49 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 137 +--
.../iotdb/tsfile/TsFileWriteWithTSRecord.java | 46 +-
.../iotdb/flink/tsfile/TsFileInputFormat.java | 19 +-
.../iotdb/hadoop/tsfile/TSFRecordReader.java | 21 +-
.../org/apache/iotdb/hive/TSFHiveRecordReader.java | 1 +
.../org/apache/iotdb/hive/TsFileDeserializer.java | 1 +
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 1 +
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 2 +-
.../resources/conf/iotdb-engine.properties | 2 +-
.../iotdb/db/auth/role/LocalFileRoleAccessor.java | 4 +
.../iotdb/db/auth/user/LocalFileUserAccessor.java | 4 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 37 +-
.../iotdb/db/conf/adapter/CompressionRatio.java | 4 +-
.../strategy/RandomOnDiskUsableSpaceStrategy.java | 4 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 7 +-
.../db/engine/flush/pool/AbstractPoolManager.java | 1 +
.../iotdb/db/engine/merge/recover/LogAnalyzer.java | 5 +
.../db/engine/merge/task/MergeMultiChunkTask.java | 1 +
.../engine/storagegroup/StorageGroupProcessor.java | 4 +
.../iotdb/db/engine/storagegroup/TsFileLock.java | 6 +-
.../db/engine/storagegroup/TsFileProcessor.java | 2 +
.../tsfilemanagement/utils/HotCompactionUtils.java | 1 +
.../version/SimpleFileVersionController.java | 1 +
.../org/apache/iotdb/db/metadata/MManager.java | 10 +-
.../java/org/apache/iotdb/db/metadata/MTree.java | 5 +-
.../org/apache/iotdb/db/metadata/PartialPath.java | 43 +-
.../apache/iotdb/db/metrics/server/JettyUtil.java | 4 +-
.../iotdb/db/metrics/server/QueryServlet.java | 2 +-
.../iotdb/db/metrics/server/ServerArgument.java | 37 +-
.../apache/iotdb/db/metrics/ui/MetricsPage.java | 10 +-
.../apache/iotdb/db/qp/constant/DatetimeUtils.java | 14 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 1 +
.../iotdb/db/qp/logical/crud/InOperator.java | 1 +
.../db/qp/physical/crud/AlignByDevicePlan.java | 10 +
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 1 +
.../iotdb/db/qp/strategy/LogicalGenerator.java | 59 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 43 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 45 +-
.../optimizer/MergeSingleFilterOptimizer.java | 1 +
.../db/query/control/QueryResourceManager.java | 1 +
.../db/query/dataset/AlignByDeviceDataSet.java | 1 +
.../db/query/dataset/NonAlignEngineDataSet.java | 1 +
.../dataset/RawQueryDataSetWithoutValueFilter.java | 2 +
.../query/dataset/groupby/GroupByFillDataSet.java | 11 +-
.../groupby/GroupByWithValueFilterDataSet.java | 1 +
.../dataset/groupby/LocalGroupByExecutor.java | 1 +
.../db/query/executor/AggregationExecutor.java | 2 +
.../iotdb/db/query/executor/LastQueryExecutor.java | 22 +-
.../db/query/executor/fill/LastPointReader.java | 1 +
.../FixLengthIExternalSortFileDeserializer.java | 75 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 3 +
.../org/apache/iotdb/db/rescon/MemTablePool.java | 2 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 1 +
.../org/apache/iotdb/db/service/TSServiceImpl.java | 48 +-
.../iotdb/db/sync/receiver/load/FileLoader.java | 1 +
.../db/sync/receiver/load/FileLoaderManager.java | 1 +
.../receiver/recover/SyncReceiverLogAnalyzer.java | 1 +
.../db/sync/receiver/transfer/SyncServiceImpl.java | 29 +-
.../db/sync/sender/manage/SyncFileManager.java | 18 +-
.../iotdb/db/sync/sender/transfer/SyncClient.java | 8 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 254 ++--
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 1 +
.../db/tools/watermark/WatermarkDetector.java | 94 +-
.../org/apache/iotdb/db/utils/CommonUtils.java | 7 +-
.../org/apache/iotdb/db/utils/FilePathUtils.java | 1 +
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 10 +-
.../apache/iotdb/db/utils/QueryDataSetUtils.java | 2 +
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 1 +
.../org/apache/iotdb/db/utils/SchemaUtils.java | 13 +-
.../org/apache/iotdb/db/utils/UpgradeUtils.java | 1 +
.../writelog/manager/MultiFileLogNodeManager.java | 36 +-
.../iotdb/db/writelog/recover/LogReplayer.java | 1 +
.../writelog/recover/TsFileRecoverPerformer.java | 6 +-
.../iotdb/db/engine/memtable/MemTablePoolTest.java | 1 +
.../version/SysTimeVersionControllerTest.java | 1 +
.../iotdb/db/integration/IoTDBAggregationIT.java | 35 +-
.../integration/IoTDBAggregationLargeDataIT.java | 285 +++--
.../apache/iotdb/db/integration/IoTDBAliasIT.java | 49 +-
.../org/apache/iotdb/db/integration/IoTDBAsIT.java | 603 ++++++++++
.../iotdb/db/integration/IoTDBAuthorizationIT.java | 1234 ++++++++++----------
.../apache/iotdb/db/integration/IoTDBCloseIT.java | 112 +-
.../db/integration/IoTDBDeleteStorageGroupIT.java | 14 +-
.../apache/iotdb/db/integration/IoTDBFillIT.java | 283 ++---
.../db/integration/IoTDBFlushQueryMergeIT.java | 8 +-
.../IoTDBMultiOverlappedChunkInUnseqIT.java | 9 +-
.../db/integration/IoTDBMultiOverlappedPageIT.java | 20 +-
.../db/integration/IoTDBMultiStatementsIT.java | 92 +-
.../iotdb/db/integration/IoTDBNumberPathIT.java | 13 +-
.../db/integration/IoTDBOverlappedPageIT.java | 12 +-
.../iotdb/db/integration/IoTDBQuotedPathIT.java | 56 +-
.../iotdb/db/integration/IoTDBRecoverIT.java | 3 +
.../db/integration/IoTDBRemovePartitionIT.java | 2 +-
.../iotdb/db/integration/IoTDBRestartIT.java | 84 +-
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 7 +-
.../iotdb/db/integration/IoTDBSimpleQueryIT.java | 164 +--
.../iotdb/db/integration/IoTDBTagAlterIT.java | 410 ++++---
.../apache/iotdb/db/integration/IoTDBTagIT.java | 623 +++++-----
.../iotdb/db/integration/IoTDBTimeZoneIT.java | 12 +-
.../org/apache/iotdb/db/metadata/MTreeTest.java | 4 +-
.../db/query/dataset/GroupByLevelDataSetTest.java | 1 -
.../db/query/dataset/GroupByTimeDataSetTest.java | 1 -
.../db/sync/receiver/load/FileLoaderTest.java | 10 +-
.../recover/SyncReceiverLogAnalyzerTest.java | 2 +
.../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 76 +-
.../org/apache/iotdb/db/tools/WalCheckerTest.java | 7 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 5 +-
.../db/utils/datastructure/PrecisionTest.java | 2 +-
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 1 +
.../org/apache/iotdb/session/SessionUtils.java | 1 +
.../org/apache/iotdb/session/pool/SessionPool.java | 1 +
.../org/apache/iotdb/session/IoTDBSessionIT.java | 188 +--
.../iotdb/spark/tsfile/qp/QueryProcessor.java | 2 +
.../qp/optimizer/MergeSingleFilterOptimizer.java | 1 +
.../tsfile/qp/optimizer/PhysicalOptimizer.java | 2 +
.../iotdb/tsfile/encoding/encoder/RleEncoder.java | 1 +
.../file/metadata/MetadataIndexConstructor.java | 1 +
.../file/metadata/statistics/Statistics.java | 5 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 2 +-
.../org/apache/iotdb/tsfile/read/common/Path.java | 12 +-
.../apache/iotdb/tsfile/read/common/TimeRange.java | 11 +-
.../read/controller/MetadataQuerierByFileImpl.java | 2 +
.../query/dataset/DataSetWithoutTimeGenerator.java | 1 +
.../read/query/timegenerator/node/AndNode.java | 1 +
.../iotdb/tsfile/read/reader/page/PageReader.java | 1 +
.../reader/series/FileSeriesReaderByTimestamp.java | 2 +
.../iotdb/tsfile/utils/RamUsageEstimator.java | 1 +
.../iotdb/tsfile/read/TimePlainEncodeReadTest.java | 2 +-
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 79 +-
.../org/apache/iotdb/tsfile/write/PerfTest.java | 62 +-
.../org/apache/iotdb/tsfile/write/WriteTest.java | 51 +-
.../write/writer/RestorableTsFileIOWriterTest.java | 7 +-
146 files changed, 3782 insertions(+), 2467 deletions(-)
mode change 100755 => 100644 antlr/src/main/antlr4/org/apache/iotdb/db/qp/strategy/SqlBase.g4
create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBAsIT.java