xiangfu0 commented on code in PR #19998:
URL: https://github.com/apache/pinot/pull/19998#discussion_r4364821422
##########
pinot-segment-local/src/main/java/org/apache/pinot/segment/local/indexsegment/immutable/ImmutableSegmentImpl.java:
##########
@@ -333,12 +333,12 @@ public DataSource getDataSource(String column, Schema
schema) {
@Override
public Set<String> getColumnNames() {
- return _segmentMetadata.getSchema().getColumnNames();
+ return _dataSources.keySet();
Review Comment:
Fixed in a03ee9d: getColumnNames() again returns schema names, preserving
the prior OPEN_STRUCT behavior. The focused regression passes.
##########
pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/index/metadata/SegmentMetadataImpl.java:
##########
@@ -483,21 +585,95 @@ public String getEndOffset() {
@Override
public TreeMap<String, ColumnMetadata> getColumnMetadataMap() {
- return _columnMetadataMap;
+ if (_mappedStore == null) {
+ return _columnMetadataMap;
+ }
+ // Compatibility API for metadata/admin callers. The serving path uses
column names and direct lookup instead.
+ TreeMap<String, ColumnMetadata> result = new TreeMap<>();
+ for (String column : getPhysicalColumnNames()) {
+ result.put(column, getColumnMetadataFor(column));
+ }
+ result.putAll(_virtualColumnMetadata);
+ return result;
+ }
+
+ /// Returns the physical column names without materializing a metadata map
or Schema on mapped segments.
+ public Set<String> getPhysicalColumnNames() {
+ return _mappedStore != null ? _physicalColumnNames :
_schema.getPhysicalColumnNames();
+ }
+
+ /// Indicates whether the immutable segment is reading its metadata from the
binary mapping.
+ public boolean isMapped() {
+ return _mappedStore != null;
+ }
+
+ @Nullable
+ @Override
+ public ColumnMetadata getColumnMetadataFor(String column) {
+ if (_mappedStore == null) {
+ return _columnMetadataMap != null ? _columnMetadataMap.get(column) :
null;
Review Comment:
Fixed in a03ee9d: the eager branch delegates through getColumnMetadataMap(),
preserving subclass overrides.
##########
pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/readers/PinotSegmentColumnReaderImpl.java:
##########
@@ -61,7 +61,7 @@ public PinotSegmentColumnReaderImpl(IndexSegment
indexSegment, String columnName
boolean skipDefaultNullValues) {
this(new PinotSegmentColumnReader(indexSegment, columnName), columnName,
indexSegment.getSegmentMetadata().getTotalDocs(),
-
indexSegment.getSegmentMetadata().getSchema().getFieldSpecFor(columnName).getDataType(),
+
indexSegment.getSegmentMetadata().getColumnMetadataFor(columnName).getFieldSpec().getDataType(),
Review Comment:
Fixed in a03ee9d: when consuming-segment column metadata is absent, the
reader gets the type from the schema as before. The consuming regression passes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
