Merge remote-tracking branch 'apache/df52' into fix/schema-adapter-nested-types

Author: andygrove

common/src/main/java/org/apache/comet/parquet/ArrowConstantColumnReader.java

@@ -448,8 +448,7 @@ public void init() throws Throwable {
           // TODO(SPARK-40059): Allow users to include columns named
           //                    FileFormat.ROW_INDEX_TEMPORARY_COLUMN_NAME in their schemas.
           long[] rowIndices = FileReader.getRowIndices(blocks);
-          columnReaders[i] =
-              new ArrowRowIndexColumnReader(nonPartitionFields[i], capacity, rowIndices);
+          columnReaders[i] = new RowIndexColumnReader(nonPartitionFields[i], capacity, rowIndices);
           hasRowIndexColumn = true;
           missingColumns[i] = true;
         } else if (optFileField.isPresent()) {
@@ -474,8 +473,8 @@ public void init() throws Throwable {
                       + filePath);
             }
             if (field.isPrimitive()) {
-              ArrowConstantColumnReader reader =
-                  new ArrowConstantColumnReader(nonPartitionFields[i], capacity, useDecimal128);
+              ConstantColumnReader reader =
+                  new ConstantColumnReader(nonPartitionFields[i], capacity, useDecimal128);
               columnReaders[i] = reader;
               missingColumns[i] = true;
             } else {
@@ -493,9 +492,8 @@ public void init() throws Throwable {
         for (int i = fields.size(); i < columnReaders.length; i++) {
           int fieldIndex = i - fields.size();
           StructField field = partitionFields[fieldIndex];
-          ArrowConstantColumnReader reader =
-              new ArrowConstantColumnReader(
-                  field, capacity, partitionValues, fieldIndex, useDecimal128);
+          ConstantColumnReader reader =
+              new ConstantColumnReader(field, capacity, partitionValues, fieldIndex, useDecimal128);
           columnReaders[i] = reader;
         }
       }