Fix default column handling when forward index is disabled

pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/IndexLoadingConfig.java

@@ -83,7 +83,6 @@ public class IndexLoadingConfig {
   private final Map<String, String> _noDictionaryConfig = new HashMap<>();
   private final Set<String> _varLengthDictionaryColumns = new HashSet<>();
   private Set<String> _onHeapDictionaryColumns = new HashSet<>();
-  private final Set<String> _forwardIndexDisabledColumns = new HashSet<>();
   private Map<String, BloomFilterConfig> _bloomFilterConfigs = new HashMap<>();
   private boolean _enableDynamicStarTreeCreation;
   private List<StarTreeIndexConfig> _starTreeIndexConfigs;
@@ -540,10 +539,6 @@ public Set<String> getOnHeapDictionaryColumns() {
     return unmodifiable(_onHeapDictionaryColumns);
   }
 
-  public Set<String> getForwardIndexDisabledColumns() {
-    return unmodifiable(_forwardIndexDisabledColumns);
-  }
-
   public Map<String, BloomFilterConfig> getBloomFilterConfigs() {
     return unmodifiable(_bloomFilterConfigs);
   }

pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/loader/defaultcolumn/BaseDefaultColumnHandler.java

@@ -411,7 +411,7 @@ protected boolean createColumnV1Indices(String column)
           }
 
           // TODO: Support forward index disabled derived column
-          if (_indexLoadingConfig.getForwardIndexDisabledColumns().contains(column)) {
+          if (isForwardIndexDisabled(column)) {
             LOGGER.warn("Skip creating forward index disabled derived column: {}", column);
             if (errorOnFailure) {
               throw new UnsupportedOperationException(
@@ -443,8 +443,8 @@ protected boolean createColumnV1Indices(String column)
    * Check and return whether the forward index is disabled for a given column
    */
   protected boolean isForwardIndexDisabled(String column) {
-    return _indexLoadingConfig.getForwardIndexDisabledColumns() != null
-        && _indexLoadingConfig.getForwardIndexDisabledColumns().contains(column);
+    FieldIndexConfigs fieldIndexConfig = _indexLoadingConfig.getFieldIndexConfig(column);
+    return fieldIndexConfig != null && fieldIndexConfig.getConfig(StandardIndexes.forward()).isDisabled();
   }
 
   /**

pinot-segment-local/src/test/java/org/apache/pinot/segment/local/segment/index/loader/SegmentPreProcessorTest.java

@@ -783,7 +783,7 @@ private void validateIndex(IndexType<?, ?, ?> indexType, String column, int card
           assertFalse(reader.hasIndexFor(column, StandardIndexes.inverted()));
         } else {
           // Updating dictionary or forward index for existing columns not supported for v1 segments yet
-          if (segmentMetadata.getVersion() == SegmentVersion.v3) {
+          if (segmentMetadata.getVersion() == SegmentVersion.v3 || isAutoGenerated) {
             assertFalse(reader.hasIndexFor(column, StandardIndexes.forward()));
           } else {
             assertTrue(reader.hasIndexFor(column, StandardIndexes.forward()));