You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2022/04/12 15:58:17 UTC
[iotdb] 01/01: merge master and fix conflicts
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch udf-operator
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 48a59180d66b3c115ee2cd2623c36a4381dfee37
Merge: ead674615e f0ff5510a6
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Tue Apr 12 23:57:58 2022 +0800
merge master and fix conflicts
.github/workflows/influxdb-protocol.yml | 2 +-
.github/workflows/main-unix.yml | 3 +-
.github/workflows/main-win.yml | 3 +-
.../apache/iotdb/db/qp/sql/InfluxDBSqlParser.g4 | 2 +-
client-cpp/pom.xml | 4 +
.../java/org/apache/iotdb/cluster/ClientMain.java | 2 +-
.../cluster/client/sync/SyncClientAdaptor.java | 2 +-
.../iotdb/cluster/coordinator/Coordinator.java | 4 +-
.../iotdb/cluster/log/applier/BaseApplier.java | 4 +-
.../iotdb/cluster/metadata/CSchemaProcessor.java | 5 +-
.../iotdb/cluster/server/ClusterTSServiceImpl.java | 2 +-
.../server/basic/ClusterServiceProvider.java | 2 +-
.../handlers/forwarder/ForwardPlanHandler.java | 2 +-
.../cluster/server/member/DataGroupMember.java | 4 +-
.../cluster/server/member/MetaGroupMember.java | 4 +-
.../iotdb/cluster/server/member/RaftMember.java | 4 +-
.../cluster/server/service/BaseAsyncService.java | 4 +-
.../cluster/server/service/BaseSyncService.java | 2 +-
.../server/service/DataGroupServiceImpls.java | 2 +-
.../apache/iotdb/cluster/utils/PartitionUtils.java | 2 +-
.../apache/iotdb/cluster/utils/StatusUtils.java | 4 +-
.../cluster/client/sync/SyncClientAdaptorTest.java | 2 +-
.../iotdb/cluster/common/TestAsyncDataClient.java | 2 +-
.../log/snapshot/MetaSimpleSnapshotTest.java | 2 +-
.../handlers/forwarder/ForwardPlanHandlerTest.java | 2 +-
.../cluster/server/member/MetaGroupMemberTest.java | 2 +-
confignode/pom.xml | 5 +
confignode/src/assembly/confignode.xml | 9 +-
.../resources/conf/iotdb-confignode.properties | 20 +-
.../iotdb/confignode/conf/ConfigNodeConf.java | 25 +-
.../iotdb/confignode/conf/ConfigNodeConfCheck.java | 29 +-
.../confignode/conf/ConfigNodeDescriptor.java | 8 +-
.../response/DataNodeConfigurationDataSet.java | 66 +
.../consensus/response/DataNodesInfoDataSet.java | 33 +-
.../consensus/response/DataPartitionDataSet.java | 108 +-
.../consensus/response/SchemaPartitionDataSet.java | 94 +-
.../response/StorageGroupSchemaDataSet.java | 27 +-
.../statemachine/PartitionRegionStateMachine.java | 2 +-
.../iotdb/confignode/manager/ConfigManager.java | 126 +-
.../iotdb/confignode/manager/ConsensusManager.java | 37 +-
.../iotdb/confignode/manager/DataNodeManager.java | 91 +-
.../apache/iotdb/confignode/manager/Manager.java | 90 +-
.../iotdb/confignode/manager/PartitionManager.java | 193 +-
.../confignode/manager/PermissionManager.java | 2 +-
.../iotdb/confignode/manager/RegionManager.java | 128 +-
.../iotdb/confignode/partition/DataRegionInfo.java | 66 -
.../confignode/partition/SchemaRegionInfo.java | 59 -
.../confignode/partition/StorageGroupSchema.java | 77 +-
.../persistence/AuthorInfoPersistence.java | 2 +-
.../persistence/DataNodeInfoPersistence.java | 124 +-
.../persistence/PartitionInfoPersistence.java | 145 +-
.../persistence/RegionInfoPersistence.java | 213 ++-
.../iotdb/confignode/physical/PhysicalPlan.java | 32 +-
.../confignode/physical/PhysicalPlanType.java | 12 +-
.../physical/crud/CreateDataPartitionPlan.java | 128 ++
.../physical/crud/CreateRegionsPlan.java | 96 +
.../physical/crud/CreateSchemaPartitionPlan.java | 25 +-
.../crud/GetOrCreateDataPartitionPlan.java | 139 ++
.../GetOrCreateSchemaPartitionPlan.java} | 50 +-
.../iotdb/confignode/physical/sys/AuthorPlan.java | 20 +
.../confignode/physical/sys/DataPartitionPlan.java | 78 -
.../physical/sys/QueryDataNodeInfoPlan.java | 14 +
.../physical/sys/RegisterDataNodePlan.java | 22 +-
.../physical/sys/SetStorageGroupPlan.java | 43 +-
.../confignode/service/executor/PlanExecutor.java | 29 +-
.../server/ConfigNodeRPCServerProcessor.java | 237 +--
.../confignode/consensus/RatisConsensusDemo.java | 43 +-
.../manager/ConfigManagerManualTest.java | 31 +-
.../hash/DeviceGroupHashExecutorManualTest.java | 2 +-
.../physical/SerializeDeserializeUT.java | 346 ++++
.../server/ConfigNodeRPCServerProcessorTest.java | 386 ++--
.../org/apache/iotdb/consensus/IConsensus.java | 2 +
.../common/response/ConsensusWriteResponse.java | 6 +-
.../ratis/ApplicationStateMachineProxy.java | 2 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 19 +-
.../iotdb/consensus/ratis/RequestMessage.java | 1 +
.../iotdb/consensus/ratis/ResponseMessage.java | 2 +-
.../org/apache/iotdb/consensus/ratis/Utils.java | 14 +-
.../consensus/standalone/StandAloneConsensus.java | 10 +-
.../consensus/standalone/StandAloneServerImpl.java | 2 +-
.../consensus/statemachine/EmptyStateMachine.java | 2 +-
.../consensus/statemachine/IStateMachine.java | 2 +-
.../iotdb/consensus/ratis/RatisConsensusTest.java | 3 +-
.../standalone/StandAloneConsensusTest.java | 2 +-
distribution/pom.xml | 6 +
.../rest-client-c-example/CMakeLists.txt | 15 +-
influxdb-protocol/pom.xml | 38 +-
.../iotdb/influxdb/protocol/dto/SessionPoint.java | 6 +-
.../protocol/impl/IoTDBInfluxDBService.java | 12 +-
.../iotdb/influxdb/session/InfluxDBSession.java | 42 +-
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 2 +-
.../IoTDBQueryVersionAdaptionIT.java | 1 -
.../org/apache/iotdb/jdbc/IoTDBConnection.java | 2 +-
.../org/apache/iotdb/jdbc/IoTDBSQLException.java | 2 +-
.../java/org/apache/iotdb/jdbc/IoTDBStatement.java | 2 +-
.../test/java/org/apache/iotdb/jdbc/BatchTest.java | 2 +-
.../org/apache/iotdb/jdbc/IoTDBConnectionTest.java | 2 +-
.../iotdb/jdbc/IoTDBDatabaseMetadataTest.java | 2 +-
.../apache/iotdb/jdbc/IoTDBJDBCResultSetTest.java | 2 +-
.../iotdb/jdbc/IoTDBPreparedStatementTest.java | 1 +
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 2 +-
.../{Endpoint.java => DataNodeLocation.java} | 59 +-
.../org/apache/iotdb/commons/cluster/Endpoint.java | 6 +-
.../commons/concurrent/IoTDBThreadPoolFactory.java | 12 +
.../apache/iotdb/commons/conf/IoTDBConstant.java | 1 +
.../iotdb/commons/consensus/ConsensusGroupId.java | 27 +-
.../iotdb/commons/consensus/DataRegionId.java | 5 +
.../iotdb/commons/consensus/PartitionRegionId.java | 5 +
.../iotdb/commons/consensus/SchemaRegionId.java | 5 +
.../commons/hash/DeviceGroupHashExecutor.java | 31 -
.../iotdb/commons/partition/DataNodeLocation.java | 104 --
.../iotdb/commons/partition/DataPartition.java | 128 +-
.../iotdb/commons/partition/RegionReplicaSet.java | 42 +-
.../iotdb/commons/partition/SchemaPartition.java | 49 +-
.../commons/partition/SeriesPartitionSlot.java | 35 +-
.../iotdb/commons/partition/TimePartitionSlot.java | 33 +
.../executor/SeriesPartitionExecutor.java} | 25 +-
.../executor}/hash/APHashExecutor.java | 11 +-
.../executor}/hash/BKDRHashExecutor.java | 11 +-
.../executor}/hash/JSHashExecutor.java | 11 +-
.../executor}/hash/SDBMHashExecutor.java | 11 +-
.../apache/iotdb/commons/utils/CommonUtils.java | 4 +-
.../apache/iotdb/commons}/utils/StatusUtils.java | 48 +-
.../apache/iotdb/commons/ConsensusGroupIdTest.java | 53 +
pom.xml | 3 +-
server/pom.xml | 15 +-
.../resources/conf/iotdb-engine.properties | 68 +-
.../assembly/resources/tools/rocksdb-transfer.bat | 126 ++
.../assembly/resources/tools/rocksdb-transfer.sh | 82 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 160 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 77 +-
.../iotdb/db/consensus/ConsensusManager.java | 72 +
.../consensus/statemachine/BaseStateMachine.java | 14 +-
.../statemachine/DataRegionStateMachine.java | 46 +-
.../statemachine/SchemaRegionStateMachine.java | 17 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 2 +-
.../apache/iotdb/db/engine/StorageEngineV2.java | 2 +-
.../{task => }/CompactionExceptionHandler.java | 3 +-
.../compaction/CompactionMetricsManager.java | 12 +-
.../{task => }/CompactionRecoverManager.java | 9 +-
.../db/engine/compaction/CompactionScheduler.java | 165 +-
.../engine/compaction/CompactionTaskManager.java | 5 +-
.../db/engine/compaction/CompactionUtils.java | 371 +---
.../DefaultCompactionTaskComparatorImpl.java} | 34 +-
.../comparator/ICompactionTaskComparator.java | 22 +-
.../constant/CrossCompactionPerformer.java | 33 +-
.../CrossCompactionSelector.java} | 40 +-
.../constant/InnerSeqCompactionPerformer.java | 33 +-
.../constant/InnerSequenceCompactionSelector.java} | 41 +-
.../constant/InnerUnseqCompactionPerformer.java | 33 +-
.../InnerUnsequenceCompactionSelector.java} | 43 +-
.../AbstractCrossSpaceCompactionSelector.java | 56 -
.../cross/AbstractCrossSpaceCompactionTask.java | 113 --
.../compaction/cross/CrossSpaceCompactionTask.java | 281 +++
.../compaction/cross/ICrossSpaceSelector.java | 17 +-
...va => RewriteCrossSpaceCompactionResource.java} | 8 +-
.../RewriteCrossSpaceCompactionSelector.java | 60 +-
.../selector/ICrossSpaceMergeFileSelector.java | 2 -
.../cross/rewrite/selector/NaivePathSelector.java | 55 -
.../selector/RewriteCompactionFileSelector.java | 12 +-
...ionTask.java => ReadPointPerformerSubTask.java} | 10 +-
.../task/RewriteCrossSpaceCompactionTask.java | 254 ---
.../AbstractInnerSpaceCompactionSelector.java | 59 -
.../inner/AbstractInnerSpaceCompactionTask.java | 160 --
.../compaction/inner/IInnerSeqSpaceSelector.java | 15 +-
.../IInnerUnseqSpaceSelector.java} | 15 +-
.../compaction/inner/InnerCompactionStrategy.java | 80 -
...tionTask.java => InnerSpaceCompactionTask.java} | 225 ++-
.../inner/InnerSpaceCompactionTaskFactory.java | 48 -
.../sizetiered/SizeTieredCompactionSelector.java | 70 +-
.../inner/utils/InnerSpaceCompactionUtils.java | 302 ---
.../{utils => }/log/CompactionLogAnalyzer.java | 21 +-
.../{utils => }/log/CompactionLogger.java | 3 +-
.../compaction/{ => log}/TsFileIdentifier.java | 2 +-
.../compaction/performer/ICompactionPerformer.java | 49 +
.../performer/ICrossCompactionPerformer.java} | 14 +-
.../performer/ISeqCompactionPerformer.java | 11 +-
.../performer/IUnseqCompactionPerformer.java} | 12 +-
.../impl/ReadChunkCompactionPerformer.java | 166 ++
.../impl/ReadPointCompactionPerformer.java} | 270 +--
.../task/AbstractCompactionSelector.java | 29 -
.../compaction/task/AbstractCompactionTask.java | 4 +-
.../compaction/task/CompactionRecoverTask.java | 6 +-
.../compaction/task/ICompactionSelector.java | 54 +
.../iotdb/db/engine/storagegroup/DataRegion.java | 132 +-
.../db/engine/storagegroup/TsFileProcessor.java | 2 +-
.../service/TriggerRegistrationService.java | 10 +-
.../iotdb/db/exception/BatchProcessException.java | 2 +-
.../metadata/AcquireLockTimeoutException.java} | 11 +-
.../metadata/StorageGroupNotSetException.java | 6 +
.../metadata/cache/MNodeNotCachedException.java} | 11 +-
.../metadata/cache/MNodeNotPinnedException.java} | 12 +-
.../RecordDuplicatedException.java} | 11 +-
.../SchemaFileNotExists.java} | 11 +-
.../SchemaPageOverflowException.java} | 13 +-
.../SegmentNotFoundException.java} | 18 +-
.../SegmentOverflowException.java} | 18 +-
.../{ => template}/DifferentTemplateException.java | 3 +-
.../DuplicatedTemplateException.java | 3 +-
.../{ => template}/NoTemplateOnMNodeException.java | 3 +-
.../TemplateImcompatibeException.java | 3 +-
.../{ => template}/TemplateIsInUseException.java | 3 +-
.../{ => template}/UndefinedTemplateException.java | 3 +-
.../iotdb/db/metadata/Executor/SchemaVisitor.java | 55 +
.../iotdb/db/metadata/LocalConfigManager.java | 60 +-
.../iotdb/db/metadata/LocalSchemaProcessor.java | 71 +-
.../apache/iotdb/db/metadata/MetadataConstant.java | 4 +
.../iotdb/db/metadata/idtable/IDTableManager.java | 19 +-
.../iotdb/db/metadata/idtable/entry/IDeviceID.java | 4 +
.../idtable/entry/InsertMeasurementMNode.java | 23 +-
.../db/metadata/idtable/entry/PlainDeviceID.java | 12 +
.../db/metadata/idtable/entry/SHA256DeviceID.java | 21 +
.../db/metadata/lastCache/LastCacheManager.java | 2 +-
.../iotdb/db/metadata/mnode/EntityMNode.java | 8 +
.../org/apache/iotdb/db/metadata/mnode/IMNode.java | 17 +-
.../iotdb/db/metadata/mnode/InternalMNode.java | 29 +-
.../org/apache/iotdb/db/metadata/mnode/MNode.java | 25 +-
.../apache/iotdb/db/metadata/mnode/MNodeUtils.java | 1 +
.../iotdb/db/metadata/mnode/MeasurementMNode.java | 16 +-
.../db/metadata/mnode/StorageGroupEntityMNode.java | 11 +-
.../iotdb/db/metadata/mnode/StorageGroupMNode.java | 8 +
.../metadata/mnode/container/IMNodeContainer.java | 11 +-
.../mnode/container/MNodeContainerMapImpl.java} | 13 +-
.../metadata/mnode/container/MNodeContainers.java | 103 +
.../mnode/estimator/BasicMNodSizeEstimator.java | 117 ++
.../estimator/IMNodeSizeEstimator.java} | 22 +-
.../db/metadata/mnode/iterator/IMNodeIterator.java | 10 +-
.../mnode/iterator/MNodeIterator.java} | 33 +-
.../iotdb/db/metadata/mtree/MTreeAboveSG.java | 46 +-
.../iotdb/db/metadata/mtree/MTreeBelowSG.java | 854 ++++++---
.../db/metadata/mtree/store/CachedMTreeStore.java | 590 ++++++
.../iotdb/db/metadata/mtree/store/IMTreeStore.java | 61 +
.../db/metadata/mtree/store/MemMTreeStore.java | 170 ++
.../mtree/store/disk/CachedMNodeContainer.java | 428 +++++
.../mtree/store/disk/ICachedMNodeContainer.java | 80 +
.../mtree/store/disk/MTreeFlushTaskManager.java | 75 +
.../mtree/store/disk/MTreeReleaseTaskManager.java | 74 +
.../db/metadata/mtree/store/disk/SegmentLock.java | 91 +
.../mtree/store/disk/cache/CacheEntry.java | 29 +-
.../mtree/store/disk/cache/CacheManager.java | 537 ++++++
.../disk/cache/ICacheManager.java} | 56 +-
.../mtree/store/disk/cache/LRUCacheManager.java | 256 +++
.../mtree/store/disk/cache/PlainCacheManager.java | 72 +
.../disk/memcontrol/CachedMNodeSizeEstimator.java | 71 +
.../disk/memcontrol/IMemManager.java} | 40 +-
.../store/disk/memcontrol/MemManagerHolder.java | 27 +-
.../MemManagerNodeEstimatedSizeBasedImpl.java | 132 ++
.../memcontrol/MemManagerNodeNumBasedImpl.java | 105 ++
.../mtree/store/disk/schemafile/ISchemaFile.java | 63 +
.../mtree/store/disk/schemafile/ISchemaPage.java | 125 ++
.../mtree/store/disk/schemafile/ISegment.java | 95 +
.../store/disk/schemafile/MockSchemaFile.java | 235 +++
.../mtree/store/disk/schemafile/RecordUtils.java | 339 ++++
.../mtree/store/disk/schemafile/SchemaFile.java | 937 ++++++++++
.../mtree/store/disk/schemafile/SchemaPage.java | 623 +++++++
.../mtree/store/disk/schemafile/Segment.java | 708 +++++++
.../db/metadata/mtree/traverser/Traverser.java | 169 +-
.../traverser/collector/CollectorTraverser.java | 11 +-
.../mtree/traverser/collector/EntityCollector.java | 11 +-
.../traverser/collector/MNodeAboveSGCollector.java | 6 +-
.../mtree/traverser/collector/MNodeCollector.java | 6 +-
.../traverser/collector/MeasurementCollector.java | 11 +-
.../traverser/collector/StorageGroupCollector.java | 6 +-
.../mtree/traverser/counter/CounterTraverser.java | 6 +-
.../mtree/traverser/counter/EntityCounter.java | 6 +-
.../counter/MNodeAboveSGLevelCounter.java | 6 +-
.../mtree/traverser/counter/MNodeLevelCounter.java | 5 +-
.../traverser/counter/MeasurementCounter.java | 6 +-
.../counter/MeasurementGroupByLevelCounter.java | 6 +-
.../traverser/counter/StorageGroupCounter.java | 6 +-
.../apache/iotdb/db/metadata/path/AlignedPath.java | 55 +
.../iotdb/db/metadata/path/MeasurementPath.java | 41 +
.../apache/iotdb/db/metadata/path/PartialPath.java | 30 +
.../db/metadata/path/PathDeserializeUtil.java | 59 +
.../iotdb/db/metadata/rescon/MemoryStatistics.java | 97 +
.../db/metadata/rescon/SchemaResourceManager.java | 67 +
.../db/metadata/rescon/TimeseriesStatistics.java | 38 +-
.../db/metadata/schemaregion/ISchemaRegion.java | 193 ++
.../db/metadata/schemaregion/SchemaEngine.java | 38 +-
.../schemaregion/SchemaEngineMode.java} | 11 +-
.../db/metadata/schemaregion/SchemaRegion.java | 627 ++++---
.../metadata/schemaregion/SchemaRegionUtils.java | 59 +
.../schemaregion/rocksdb/CheckKeyResult.java | 34 +-
.../schemaregion/rocksdb/RSchemaConstants.java | 76 +
.../schemaregion/rocksdb/RSchemaLogger.java | 61 +
.../rocksdb/RSchemaReadWriteHandler.java | 514 +++++
.../schemaregion/rocksdb/RSchemaRegion.java | 1962 ++++++++++++++++++++
.../schemaregion/rocksdb/RSchemaUtils.java | 592 ++++++
.../schemaregion/rocksdb/mnode/REntityMNode.java | 124 ++
.../schemaregion/rocksdb/mnode/RInternalMNode.java | 197 ++
.../schemaregion/rocksdb/mnode/RMNode.java | 234 +++
.../schemaregion/rocksdb/mnode/RMNodeType.java | 49 +
.../rocksdb/mnode/RMNodeValueType.java | 47 +
.../rocksdb/mnode/RMeasurementMNode.java | 262 +++
.../rocksdb/mnode/RStorageGroupMNode.java | 102 +
.../storagegroup/IStorageGroupSchemaManager.java | 2 +-
.../storagegroup/StorageGroupSchemaManager.java | 2 +-
.../apache/iotdb/db/metadata/tag/TagManager.java | 10 +-
.../iotdb/db/metadata/template/Template.java | 51 +-
.../db/metadata/template/TemplateManager.java | 61 +-
.../db/metadata/upgrade/MetadataUpgrader.java | 5 +-
.../iotdb/db/mpp/buffer/DataBlockManager.java | 16 +-
.../iotdb/db/mpp/buffer/IDataBlockManager.java | 5 +
.../org/apache/iotdb/db/mpp/buffer/SinkHandle.java | 5 +-
.../apache/iotdb/db/mpp/buffer/SourceHandle.java | 1 +
.../iotdb/db/mpp/buffer/TsBlockSerdeFactory.java | 2 +
.../org/apache/iotdb/db/mpp/common/DataRegion.java | 58 -
.../iotdb/db/mpp/common/FragmentInstanceId.java | 42 +-
.../apache/iotdb/db/mpp/common/PlanFragmentId.java | 25 +
.../org/apache/iotdb/db/mpp/common/QueryId.java | 4 +
.../db/mpp/common/filter/BasicFunctionFilter.java | 20 +
.../mpp/common/filter/FilterDeserializeUtil.java | 63 +
.../iotdb/db/mpp/common/filter/FunctionFilter.java | 43 +
.../iotdb/db/mpp/common/filter/InFilter.java | 23 +
.../iotdb/db/mpp/common/filter/LikeFilter.java | 18 +
.../iotdb/db/mpp/common/filter/QueryFilter.java | 60 +
.../iotdb/db/mpp/common/filter/RegexpFilter.java | 16 +
...aMeasurementNode.java => DeviceSchemaInfo.java} | 38 +-
.../db/mpp/common/schematree/PathPatternNode.java | 35 +-
.../db/mpp/common/schematree/PathPatternTree.java | 85 +-
.../db/mpp/common/schematree/SchemaEntityNode.java | 27 +
.../mpp/common/schematree/SchemaInternalNode.java | 30 +-
.../common/schematree/SchemaMeasurementNode.java | 27 +
.../iotdb/db/mpp/common/schematree/SchemaNode.java | 9 +
.../iotdb/db/mpp/common/schematree/SchemaTree.java | 68 +-
.../apache/iotdb/db/mpp/execution/DataDriver.java | 4 +-
.../iotdb/db/mpp/execution/DataDriverContext.java | 8 +-
.../iotdb/db/mpp/execution/ExecutionResult.java | 2 +-
.../db/mpp/execution/FragmentInstanceInfo.java | 3 +-
.../iotdb/db/mpp/execution/QueryExecution.java | 22 +-
.../scheduler/AbstractFragInsStateTracker.java | 2 +-
.../scheduler/SimpleFragInstanceDispatcher.java | 18 +-
...SourceOperator.java => DataSourceOperator.java} | 8 +-
...gateScanOperator.java => ExchangeOperator.java} | 61 +-
.../source/SeriesAggregateScanOperator.java | 6 +-
.../db/mpp/operator/source/SeriesScanOperator.java | 7 +-
.../db/mpp/operator/source/SourceOperator.java | 3 -
.../db/mpp/schedule/FragmentInstanceScheduler.java | 2 +-
.../apache/iotdb/db/mpp/sql/analyze/Analyzer.java | 15 +-
.../db/mpp/sql/analyze/ClusterSchemaFetcher.java | 7 +-
.../mpp/sql/analyze/FakePartitionFetcherImpl.java | 1 +
.../db/mpp/sql/analyze/FakeSchemaFetcherImpl.java | 7 +-
.../iotdb/db/mpp/sql/analyze/ISchemaFetcher.java | 7 +-
.../mpp/sql/analyze/StandaloneSchemaFetcher.java | 7 +-
.../iotdb/db/mpp/sql/constant/StatementType.java | 5 +-
.../apache/iotdb/db/mpp/sql/parser/ASTVisitor.java | 3 +-
.../db/mpp/sql/planner/DistributionPlanner.java | 3 +-
.../db/mpp/sql/planner/LocalExecutionPlanner.java | 45 +-
.../iotdb/db/mpp/sql/planner/LogicalPlanner.java | 27 +-
.../db/mpp/sql/planner/plan/FragmentInstance.java | 105 +-
.../db/mpp/sql/planner/plan/PlanFragment.java | 26 +-
.../plan/SimpleFragmentParallelPlanner.java | 23 +-
.../db/mpp/sql/planner/plan/node/ColumnHeader.java | 18 +
.../db/mpp/sql/planner/plan/node/PlanNode.java | 42 +-
.../db/mpp/sql/planner/plan/node/PlanNodeId.java | 14 +
.../db/mpp/sql/planner/plan/node/PlanNodeType.java | 5 +-
.../db/mpp/sql/planner/plan/node/PlanNodeUtil.java | 3 +
.../db/mpp/sql/planner/plan/node/PlanVisitor.java | 5 +
.../plan/node/metedata/read/ShowDevicesNode.java | 15 +-
.../planner/plan/node/metedata/read/ShowNode.java | 4 +-
.../node/metedata/write/AlterTimeSeriesNode.java | 50 +-
.../plan/node/metedata/write/AuthorNode.java | 159 +-
.../write/CreateAlignedTimeSeriesNode.java | 36 +-
.../node/metedata/write/CreateTimeSeriesNode.java | 159 +-
.../planner/plan/node/process/AggregateNode.java | 47 +-
.../planner/plan/node/process/DeviceMergeNode.java | 52 +-
.../planner/plan/node/process/ExchangeNode.java | 58 +-
.../sql/planner/plan/node/process/FillNode.java | 36 +-
.../sql/planner/plan/node/process/FilterNode.java | 34 +-
.../planner/plan/node/process/FilterNullNode.java | 32 +-
.../plan/node/process/GroupByLevelNode.java | 42 +-
.../sql/planner/plan/node/process/LimitNode.java | 15 +-
.../sql/planner/plan/node/process/OffsetNode.java | 19 +-
.../sql/planner/plan/node/process/SortNode.java | 47 +-
.../planner/plan/node/process/TimeJoinNode.java | 31 +-
.../planner/plan/node/sink/FragmentSinkNode.java | 47 +-
.../plan/node/source/SeriesAggregateScanNode.java | 54 +-
.../planner/plan/node/source/SeriesScanNode.java | 75 +-
.../plan/node/write/InsertMultiTabletsNode.java | 7 +-
.../sql/planner/plan/node/write/InsertNode.java | 5 +-
.../sql/planner/plan/node/write/InsertRowNode.java | 8 +-
.../planner/plan/node/write/InsertRowsNode.java | 7 +-
.../plan/node/write/InsertRowsOfOneDeviceNode.java | 7 +-
.../planner/plan/node/write/InsertTabletNode.java | 8 +-
.../db/mpp/sql/statement/component/FillPolicy.java | 2 +-
.../statement/component/FilterNullComponent.java | 44 +
.../crud/InsertMultiTabletsStatement.java | 8 +
.../mpp/sql/statement/crud/InsertRowStatement.java | 8 +-
.../crud/InsertRowsOfOneDeviceStatement.java | 1 +
.../sql/statement/crud/InsertRowsStatement.java | 8 +
.../sql/statement/crud/InsertTabletStatement.java | 4 +-
.../db/mpp/sql/statement/sys/AuthorStatement.java | 4 +-
.../db/protocol/influxdb/handler/QueryHandler.java | 8 +-
.../iotdb/db/protocol/mqtt/PublishHandler.java | 2 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +-
.../org/apache/iotdb/db/qp/physical/BatchPlan.java | 2 +-
.../qp/physical/crud/InsertMultiTabletsPlan.java | 4 +-
.../physical/crud/InsertRowsOfOneDevicePlan.java | 2 +-
.../iotdb/db/qp/physical/crud/InsertRowsPlan.java | 4 +-
.../qp/physical/sys/CreateMultiTimeSeriesPlan.java | 4 +-
.../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 4 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 3 +-
.../iotdb/db/qp/utils/GroupByLevelController.java | 90 +
.../db/query/aggregation/AggregateResult.java | 9 +
.../iotdb/db/query/control/SessionManager.java | 14 +-
.../db/query/dataset/AlignByDeviceDataSet.java | 4 +-
.../iotdb/db/query/expression/Expression.java | 6 +
.../iotdb/db/query/expression/ExpressionType.java | 115 ++
.../iotdb/db/query/expression/ResultColumn.java | 17 +
.../expression/binary/AdditionExpression.java | 19 +
.../query/expression/binary/BinaryExpression.java | 8 +
.../expression/binary/DivisionExpression.java | 19 +
.../query/expression/binary/EqualToExpression.java | 19 +
.../expression/binary/GreaterEqualExpression.java | 19 +
.../expression/binary/GreaterThanExpression.java | 19 +
.../expression/binary/LessEqualExpression.java | 19 +
.../expression/binary/LessThanExpression.java | 19 +
.../expression/binary/LogicAndExpression.java | 19 +
.../query/expression/binary/LogicOrExpression.java | 19 +
.../query/expression/binary/ModuloExpression.java | 19 +
.../binary/MultiplicationExpression.java | 19 +
.../expression/binary/NonEqualExpression.java | 19 +
.../expression/binary/SubtractionExpression.java | 19 +
.../db/query/expression/unary/ConstantOperand.java | 22 +-
.../query/expression/unary/FunctionExpression.java | 31 +
.../query/expression/unary/LogicNotExpression.java | 18 +
.../query/expression/unary/NegationExpression.java | 18 +
.../query/expression/unary/TimeSeriesOperand.java | 19 +
.../java/org/apache/iotdb/db/service/DataNode.java | 12 +-
.../iotdb/db/service/InternalServiceImpl.java | 83 +-
.../apache/iotdb/db/service/IoTDBShutdownHook.java | 6 +
.../db/service/basic/BasicOpenSessionResp.java | 2 +-
.../thrift/impl/DataNodeManagementServiceImpl.java | 1 +
.../service/thrift/impl/InfluxDBServiceImpl.java | 44 +-
.../db/service/thrift/impl/TSServiceImpl.java | 4 +-
.../org/apache/iotdb/db/utils/DataTypeUtils.java | 8 +-
.../apache/iotdb/db/utils/ErrorHandlingUtils.java | 2 +-
.../iotdb/db/utils/IExpressionDeserializeUtil.java | 51 +
.../apache/iotdb/db/utils/QueryDataSetUtils.java | 181 +-
.../org/apache/iotdb/db/utils/StatusUtils.java | 46 -
.../db/utils/writelog/SingleFileLogReader.java | 9 +-
.../compaction/CompactionTaskComparatorTest.java | 31 +-
.../compaction/CompactionTaskManagerTest.java | 101 +-
....java => ReadPointCompactionPerformerTest.java} | 57 +-
.../db/engine/compaction/TsFileIdentifierUT.java | 3 +-
.../cross/CrossSpaceCompactionExceptionTest.java | 23 +-
.../compaction/cross/CrossSpaceCompactionTest.java | 81 +-
.../engine/compaction/cross/MergeUpgradeTest.java | 6 +-
.../cross/RewriteCompactionFileSelectorTest.java | 58 +-
.../RewriteCrossSpaceCompactionRecoverTest.java | 25 +-
.../cross/RewriteCrossSpaceCompactionTest.java | 46 +-
.../compaction/inner/InnerCompactionLogTest.java | 2 +-
.../inner/InnerCompactionSchedulerTest.java | 18 +-
.../compaction/inner/InnerSeqCompactionTest.java | 40 +-
.../inner/InnerSpaceCompactionExceptionTest.java | 44 +-
.../compaction/inner/InnerUnseqCompactionTest.java | 14 +-
...> ReadChunkCompactionPerformerAlignedTest.java} | 18 +-
...ReadChunkCompactionPerformerNoAlignedTest.java} | 22 +-
...va => ReadChunkCompactionPerformerOldTest.java} | 17 +-
.../SizeTieredCompactionRecoverTest.java | 77 +-
...eCrossSpaceCompactionRecoverCompatibleTest.java | 2 +-
.../SizeTieredCompactionRecoverCompatibleTest.java | 20 +-
.../recover/SizeTieredCompactionRecoverTest.java | 49 +-
.../task/FakedCrossSpaceCompactionTask.java | 62 -
.../task/FakedInnerSpaceCompactionTask.java | 97 -
.../task/FakedInnerSpaceCompactionTaskFactory.java | 50 -
.../compaction/utils/CompactionClearUtils.java | 2 +-
.../compaction/utils/CompactionConfigRestorer.java | 13 +-
.../storagegroup/StorageGroupProcessorTest.java | 12 +-
.../engine/storagegroup/TsFileProcessorTest.java | 2 +-
.../apache/iotdb/db/metadata/SchemaBasicTest.java | 79 +-
.../iotdb/db/metadata/mtree/MTreeAboveSGTest.java | 4 +-
.../iotdb/db/metadata/mtree/MTreeBelowSGTest.java | 58 +-
.../mtree/disk/CachedMNodeContainerTest.java | 51 +
.../db/metadata/mtree/disk/MemManagerTest.java | 112 ++
.../mtree/multimode/MTreeDiskModeTest.java} | 45 +-
.../mtree/multimode/MTreeFullMemoryTest.java} | 11 +-
.../mtree/multimode/MTreeMemoryModeTest.java | 27 +-
.../mtree/multimode/MTreeNonMemoryTest.java} | 11 +-
.../mtree/multimode/MTreePartialMemoryTest.java} | 11 +-
.../metadata/mtree/schemafile/RecordUtilTests.java | 78 +
.../metadata/mtree/schemafile/SchemaFileTest.java | 787 ++++++++
.../metadata/mtree/schemafile/SchemaPageTest.java | 130 ++
.../db/metadata/mtree/schemafile/SegmentTest.java | 148 ++
.../db/metadata/multimode/SchemaDiskModeTest.java | 32 +-
.../metadata/multimode/SchemaFullMemoryTest.java} | 10 +-
.../metadata/multimode/SchemaMemoryModeTest.java | 25 +-
.../metadata/multimode/SchemaNonMemoryTest.java} | 10 +-
.../multimode/SchemaPartialMemoryTest.java} | 11 +-
.../schemaregion/rocksdb/MRocksDBBenchmark.java | 98 +
.../schemaregion/rocksdb/MRocksDBUnitTest.java | 238 +++
.../rocksdb/RSchemaReadWriteHandlerTest.java | 77 +
.../rocksdb/RSchemaRegionAdvancedTest.java | 167 ++
.../rocksdb/RocksDBBenchmarkEngine.java | 153 ++
.../schemaregion/rocksdb/RocksDBBenchmarkTask.java | 109 ++
.../schemaregion/rocksdb/RocksDBTestUtils.java | 72 +
.../apache/iotdb/db/mpp/buffer/SinkHandleTest.java | 42 +-
.../iotdb/db/mpp/buffer/SourceHandleTest.java | 21 +-
.../java/org/apache/iotdb/db/mpp/buffer/Utils.java | 1 +
.../iotdb/db/mpp/common/PathPatternTreeTest.java | 199 +-
.../apache/iotdb/db/mpp/common/SchemaTreeTest.java | 65 +-
.../iotdb/db/mpp/execution/DataDriverTest.java | 8 +-
.../iotdb/db/mpp/operator/LimitOperatorTest.java | 8 +-
.../db/mpp/operator/SeriesScanOperatorTest.java | 4 +-
.../db/mpp/operator/TimeJoinOperatorTest.java | 8 +-
.../db/mpp/sql/plan/DistributionPlannerTest.java | 2 +-
.../db/mpp/sql/plan/FragmentInstanceIdTest.java | 33 +-
.../db/mpp/sql/plan/FragmentInstanceSerdeTest.java | 147 ++
.../iotdb/db/mpp/sql/plan/LogicalPlannerTest.java | 433 ++++-
.../sql/plan/node/PlanNodeDeserializeHelper.java} | 19 +-
.../metadata/read/ShowDevicesNodeSerdeTest.java} | 24 +-
.../plan/node/process/AggregateNodeSerdeTest.java | 58 +
.../node/process/DeviceMergeNodeSerdeTest.java | 81 +
.../plan/node/process/ExchangeNodeSerdeTest.java | 101 +
.../sql/plan/node/process/FillNodeSerdeTest.java | 85 +
.../sql/plan/node/process/FilterNodeSerdeTest.java | 97 +
.../plan/node/process/FilterNullNodeSerdeTest.java | 102 +
.../node/process/GroupByLevelNodeSerdeTest.java | 117 ++
.../sql/plan/node/process/LimitNodeSerdeTest.java | 119 ++
.../sql/plan/node/process/OffsetNodeSerdeTest.java | 186 ++
.../sql/plan/node/process/SortNodeSerdeTest.java | 130 ++
.../plan/node/process/TimeJoinNodeSerdeTest.java | 135 ++
.../plan/node/sink/FragmentSinkNodeSerdeTest.java | 53 +
.../source/SeriesAggregateScanNodeSerdeTest.java | 69 +
.../plan/node/source/SeriesScanNodeSerdeTest.java | 55 +
.../iotdb/db/service/InternalServiceImplTest.java | 138 ++
server/src/test/resources/iotdb-engine.properties | 2 +
.../apache/iotdb/rpc/BatchExecutionException.java | 2 +-
.../org/apache/iotdb/rpc/IoTDBJDBCDataSet.java | 2 +-
.../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java | 2 +-
.../org/apache/iotdb/rpc/RedirectException.java | 2 +-
.../main/java/org/apache/iotdb/rpc/RpcUtils.java | 19 +-
.../iotdb/rpc/StatementExecutionException.java | 6 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 14 +-
.../java/org/apache/iotdb/session/Session.java | 2 +-
.../apache/iotdb/session/SessionConnection.java | 4 +-
.../apache/iotdb/session/util/SessionUtils.java | 2 +-
.../apache/iotdb/session/SessionCacheLeaderUT.java | 2 +-
thrift-cluster/src/main/thrift/cluster.thrift | 4 +-
.../src/main/thrift/confignode.thrift | 146 +-
thrift-datanode/pom.xml | 67 -
thrift-influxdb/src/main/thrift/influxdb.thrift | 36 +-
.../src/main/thrift/common.thrift | 43 +-
.../src/main/thrift/management.thrift | 23 +-
thrift/src/main/thrift/mpp.thrift | 9 +-
thrift/src/main/thrift/rpc.thrift | 92 +-
tsfile/pom.xml | 22 +
.../org/apache/iotdb/tsfile/read/common/Path.java | 21 +
.../read/common/block/column/BinaryColumn.java | 16 +
.../common/block/column/BinaryColumnBuilder.java | 6 +
.../read/common/block/column/BooleanColumn.java | 16 +
.../common/block/column/BooleanColumnBuilder.java | 6 +
.../tsfile/read/common/block/column/Column.java | 13 +
.../read/common/block/column/ColumnBuilder.java | 4 +
.../read/common/block/column/ColumnEncoder.java | 108 ++
.../common/block/column/ColumnEncoderFactory.java | 35 +-
.../read/common/block/column/ColumnEncoding.java | 64 +
.../read/common/block/column/DoubleColumn.java | 16 +
.../common/block/column/DoubleColumnBuilder.java | 6 +
.../read/common/block/column/FloatColumn.java | 16 +
.../common/block/column/FloatColumnBuilder.java | 6 +
.../block/column/Int32ArrayColumnEncoder.java | 90 +
.../block/column/Int64ArrayColumnEncoder.java | 90 +
.../tsfile/read/common/block/column/IntColumn.java | 16 +
.../read/common/block/column/IntColumnBuilder.java | 6 +
.../read/common/block/column/LongColumn.java | 16 +
.../common/block/column/LongColumnBuilder.java | 6 +
.../block/column/RunLengthEncodedColumn.java | 16 +
.../read/common/block/column/TimeColumn.java | 16 +
.../common/block/column/TimeColumnBuilder.java | 7 +
.../read/common/block/column/TsBlockSerde.java | 125 ++
.../iotdb/tsfile/read/expression/IExpression.java | 3 +
.../read/expression/impl/BinaryExpression.java | 16 +
.../read/expression/impl/GlobalTimeExpression.java | 13 +
.../expression/impl/SingleSeriesExpression.java | 9 +
.../iotdb/tsfile/read/filter/basic/Filter.java | 8 +
.../org/apache/iotdb/tsfile/utils/BloomFilter.java | 7 +-
.../iotdb/tsfile/utils/ReadWriteIOUtils.java | 39 +-
.../tsfile/common/block/ColumnEncoderTest.java | 144 ++
.../common/block/Int32ArrayColumnEncoderTest.java | 113 ++
.../common/block/Int64ArrayColumnEncoderTest.java | 114 ++
.../tsfile/common/block/TsBlockSerdeTest.java | 97 +
582 files changed, 27189 insertions(+), 6519 deletions(-)
diff --cc server/src/main/java/org/apache/iotdb/db/query/expression/unary/ConstantOperand.java
index e8e0088599,1b423055cf..93e0c947e5
--- a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/ConstantOperand.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/ConstantOperand.java
@@@ -25,7 -25,7 +25,8 @@@ import org.apache.iotdb.db.mpp.common.s
import org.apache.iotdb.db.mpp.sql.rewriter.WildcardsRemover;
import org.apache.iotdb.db.qp.physical.crud.UDTFPlan;
import org.apache.iotdb.db.query.expression.Expression;
+ import org.apache.iotdb.db.query.expression.ExpressionType;
+import org.apache.iotdb.db.query.udf.core.executor.UDTFContext;
import org.apache.iotdb.db.query.udf.core.executor.UDTFExecutor;
import org.apache.iotdb.db.query.udf.core.layer.ConstantIntermediateLayer;
import org.apache.iotdb.db.query.udf.core.layer.IntermediateLayer;
diff --cc server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java
index 3683ff50fb,22532116db..8712dd5641
--- a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/FunctionExpression.java
@@@ -30,8 -30,8 +30,9 @@@ import org.apache.iotdb.db.qp.constant.
import org.apache.iotdb.db.qp.physical.crud.UDTFPlan;
import org.apache.iotdb.db.qp.strategy.optimizer.ConcatPathOptimizer;
import org.apache.iotdb.db.query.expression.Expression;
+ import org.apache.iotdb.db.query.expression.ExpressionType;
import org.apache.iotdb.db.query.udf.api.customizer.strategy.AccessStrategy;
+import org.apache.iotdb.db.query.udf.core.executor.UDTFContext;
import org.apache.iotdb.db.query.udf.core.executor.UDTFExecutor;
import org.apache.iotdb.db.query.udf.core.layer.IntermediateLayer;
import org.apache.iotdb.db.query.udf.core.layer.LayerMemoryAssigner;
diff --cc server/src/main/java/org/apache/iotdb/db/query/expression/unary/LogicNotExpression.java
index 33fb9cb5a7,3bb09b6d67..02a29a9426
--- a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/LogicNotExpression.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/LogicNotExpression.java
@@@ -27,7 -27,7 +27,8 @@@ import org.apache.iotdb.db.mpp.common.s
import org.apache.iotdb.db.qp.physical.crud.UDTFPlan;
import org.apache.iotdb.db.qp.utils.WildcardsRemover;
import org.apache.iotdb.db.query.expression.Expression;
+ import org.apache.iotdb.db.query.expression.ExpressionType;
+import org.apache.iotdb.db.query.udf.core.executor.UDTFContext;
import org.apache.iotdb.db.query.udf.core.executor.UDTFExecutor;
import org.apache.iotdb.db.query.udf.core.layer.IntermediateLayer;
import org.apache.iotdb.db.query.udf.core.layer.LayerMemoryAssigner;
@@@ -37,14 -37,12 +38,16 @@@ import org.apache.iotdb.db.query.udf.co
import org.apache.iotdb.db.query.udf.core.transformer.LogicNotTransformer;
import org.apache.iotdb.db.query.udf.core.transformer.Transformer;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+ import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import java.io.IOException;
+ import java.nio.ByteBuffer;
import java.time.ZoneId;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
public class LogicNotExpression extends Expression {
protected Expression expression;
diff --cc server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java
index 5b8dccf1ae,e4efb2bc45..fe6ed9398d
--- a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/NegationExpression.java
@@@ -27,7 -27,7 +27,8 @@@ import org.apache.iotdb.db.mpp.common.s
import org.apache.iotdb.db.mpp.sql.rewriter.WildcardsRemover;
import org.apache.iotdb.db.qp.physical.crud.UDTFPlan;
import org.apache.iotdb.db.query.expression.Expression;
+ import org.apache.iotdb.db.query.expression.ExpressionType;
+import org.apache.iotdb.db.query.udf.core.executor.UDTFContext;
import org.apache.iotdb.db.query.udf.core.executor.UDTFExecutor;
import org.apache.iotdb.db.query.udf.core.layer.IntermediateLayer;
import org.apache.iotdb.db.query.udf.core.layer.LayerMemoryAssigner;
diff --cc server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java
index adcb7dff6d,3fc663690c..4e9cfb5e11
--- a/server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/expression/unary/TimeSeriesOperand.java
@@@ -27,7 -28,7 +28,8 @@@ import org.apache.iotdb.db.mpp.common.s
import org.apache.iotdb.db.mpp.sql.rewriter.WildcardsRemover;
import org.apache.iotdb.db.qp.physical.crud.UDTFPlan;
import org.apache.iotdb.db.query.expression.Expression;
+ import org.apache.iotdb.db.query.expression.ExpressionType;
+import org.apache.iotdb.db.query.udf.core.executor.UDTFContext;
import org.apache.iotdb.db.query.udf.core.executor.UDTFExecutor;
import org.apache.iotdb.db.query.udf.core.layer.IntermediateLayer;
import org.apache.iotdb.db.query.udf.core.layer.LayerMemoryAssigner;
diff --cc tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumn.java
index e80b670f84,32de9dcec9..d10ba9fc68
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumn.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/column/TimeColumn.java
@@@ -63,10 -75,10 +75,14 @@@ public class TimeColumn implements Colu
}
@Override
+ public Object getObject(int position) {
+ return getLong(position);
+ }
+
+ public boolean mayHaveNull() {
+ return false;
+ }
+
@Override
public boolean isNull(int position) {
return false;