mcvsubbu commented on a change in pull request #4954: Support schema evolution 
for consuming segments
URL: https://github.com/apache/incubator-pinot/pull/4954#discussion_r387399966
 
 

 ##########
 File path: 
pinot-core/src/main/java/org/apache/pinot/core/indexsegment/mutable/MutableSegmentImpl.java
 ##########
 @@ -555,12 +575,27 @@ public SegmentMetadata getSegmentMetadata() {
   @Override
   public ColumnDataSource getDataSource(String columnName) {
     FieldSpec fieldSpec = _schema.getFieldSpecFor(columnName);
-    if (fieldSpec.isVirtualColumn()) {
-      VirtualColumnContext virtualColumnContext = new 
VirtualColumnContext(fieldSpec, _numDocsIndexed);
-      VirtualColumnProvider virtualColumnProvider =
-          
VirtualColumnProviderFactory.buildProvider(_schema.getFieldSpecFor(columnName).getVirtualColumnProvider());
-      return new 
ColumnDataSource(virtualColumnProvider.buildColumnIndexContainer(virtualColumnContext),
-          virtualColumnProvider.buildMetadata(virtualColumnContext));
+    if (fieldSpec == null || fieldSpec.isVirtualColumn()) {
+      // Column is either added during ingestion, or was initiated with a 
virtual column provider
+      if (fieldSpec == null) {
+        // If the column was added during ingestion, we will construct the 
virtual column provider based on its fieldSpec
+        fieldSpec = _newlyAddedColumnsFieldMap.get(columnName);
+        Preconditions.checkNotNull(fieldSpec, "FieldSpec for " + columnName + 
" should not be null");
+      }
+      ColumnContext columnContext = new ColumnContext(fieldSpec, 
_numDocsIndexed);
+      ColumnProvider columnProvider = 
_newlyAddedColumnsProviderMap.getOrDefault(columnName, 
ColumnProviderFactory.buildProvider(columnContext));
+      if (columnProvider instanceof DefaultNullValueColumnProvider) {
 
 Review comment:
   Why cache it? We construct it afresh for each query in the offline case, 
this should not be worse than that, right?

----------------------------------------------------------------
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.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to