This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a change to branch new_vector
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 50fb89c  Fix query vector select ** from root
     new b763e96  remove if instance of
     new 45cc059  resolve conflicts

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../iotdb/db/engine/memtable/AbstractMemTable.java |   3 +-
 .../db/engine/memtable/PrimitiveMemTable.java      |   1 +
 .../db/engine/querycontext/ReadOnlyMemChunk.java   |   5 +-
 .../db/engine/storagegroup/TsFileProcessor.java    |   2 +-
 .../db/engine/storagegroup/TsFileResource.java     | 123 +--------------------
 .../apache/iotdb/db/metadata/path/AlignedPath.java |  79 ++++++++++++-
 .../iotdb/db/metadata/path/MeasurementPath.java    |  46 ++++++++
 .../apache/iotdb/db/metadata/path/PartialPath.java |   8 ++
 .../iotdb/db/query/reader/chunk/MemPageReader.java |   8 +-
 .../iotdb/db/query/reader/series/SeriesReader.java |  20 ++--
 .../org/apache/iotdb/db/utils/FileLoaderUtils.java |  44 ++++----
 ...hunkMetadata.java => AlignedChunkMetadata.java} |   4 +-
 ...etadata.java => AlignedTimeSeriesMetadata.java} |   6 +-
 ...torChunkReader.java => AlignedChunkReader.java} |  16 +--
 ...ectorPageReader.java => AlignedPageReader.java} |   4 +-
 .../write/schema/VectorMeasurementSchema.java      |   4 +-
 16 files changed, 197 insertions(+), 176 deletions(-)
 rename 
tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/{VectorChunkMetadata.java
 => AlignedChunkMetadata.java} (98%)
 rename 
tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/{VectorTimeSeriesMetadata.java
 => AlignedTimeSeriesMetadata.java} (95%)
 rename 
tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/chunk/{VectorChunkReader.java
 => AlignedChunkReader.java} (95%)
 rename 
tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/{VectorPageReader.java
 => AlignedPageReader.java} (98%)

Reply via email to