This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch fix_some_issues_0531
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from c64c75561a fix some issues in MPP query prepared for representation
add 2075ae8ff2 fix UT for distribution test
add fb160be99e fix IoTDBDatabaseMetadata type error. (#6125)
add 7a34696b3b revert timeseries version (#6124)
add aad6796deb [IOTDB-3364] Fix Query stucked with null valued aligned
timeseries bug (#6120)
add 7205b03d25 Merge branch 'master' into fix_some_issues_0531
No new revisions were added by this update.
Summary of changes:
.../IoTDBEmptyDataIT.java} | 45 +++++++-----------
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 54 +++++++++++-----------
.../schemaregion/rocksdb/RSchemaRegion.java | 14 ------
.../rocksdb/mnode/RMeasurementMNode.java | 10 ----
.../querycontext/AlignedReadOnlyMemChunk.java | 13 ++++--
.../db/metadata/cache/DataNodeSchemaCache.java | 6 +--
.../iotdb/db/metadata/cache/SchemaCacheEntry.java | 9 +---
.../idtable/entry/InsertMeasurementMNode.java | 10 ----
.../iotdb/db/metadata/mnode/IMeasurementMNode.java | 4 --
.../iotdb/db/metadata/mnode/MeasurementMNode.java | 12 -----
.../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 1 -
.../iotdb/db/metadata/path/MeasurementPath.java | 25 ----------
.../db/metadata/schemaregion/ISchemaRegion.java | 6 ---
.../schemaregion/SchemaRegionMemoryImpl.java | 20 --------
.../schemaregion/SchemaRegionSchemaFileImpl.java | 14 ------
.../db/metadata/utils/TimeseriesVersionUtil.java | 28 -----------
.../metadata/visitor/SchemaExecutionVisitor.java | 7 ++-
.../iotdb/db/mpp/common/schematree/SchemaTree.java | 18 ++------
.../common/schematree/node/SchemaInternalNode.java | 5 --
.../schematree/node/SchemaMeasurementNode.java | 12 +----
.../db/mpp/common/schematree/node/SchemaNode.java | 2 -
.../visitor/SchemaTreeMeasurementVisitor.java | 8 ++--
.../db/mpp/plan/analyze/FakeSchemaFetcherImpl.java | 8 ++--
.../iotdb/db/mpp/plan/analyze/SchemaValidator.java | 16 -------
.../iotdb/db/mpp/plan/planner/LogicalPlanner.java | 23 ++-------
.../write/CreateAlignedTimeSeriesNode.java | 23 +--------
.../metedata/write/CreateMultiTimeSeriesNode.java | 9 +---
.../node/metedata/write/CreateTimeSeriesNode.java | 25 +---------
.../plan/node/metedata/write/MeasurementGroup.java | 23 ++-------
.../db/metadata/cache/DataNodeSchemaCacheTest.java | 24 ++++------
.../db/mpp/common/schematree/SchemaTreeTest.java | 24 ++--------
.../schema/SchemaFetchScanOperatorTest.java | 9 ++--
.../distribution/AggregationDistributionTest.java | 2 +-
.../iotdb/db/service/InternalServiceImplTest.java | 16 +------
.../file/metadata/statistics/Statistics.java | 20 ++++----
.../file/metadata/statistics/TimeStatistics.java | 14 ++++++
36 files changed, 127 insertions(+), 432 deletions(-)
copy
integration/src/test/java/org/apache/iotdb/db/integration/{IoTDBResultMetadataIT.java
=> aligned/IoTDBEmptyDataIT.java} (59%)
delete mode 100644
server/src/main/java/org/apache/iotdb/db/metadata/utils/TimeseriesVersionUtil.java
