[hotfix] Change 'toLowerCase' to 'allowUpperCase' (#4271)

apache · Sep 27, 2024 · ce56759 · ce56759
1 parent f394501
commit ce56759
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/paimon-arrow/src/main/java/org/apache/paimon/arrow/ArrowBundleRecords.java b/paimon-arrow/src/main/java/org/apache/paimon/arrow/ArrowBundleRecords.java
@@ -32,13 +32,13 @@ public class ArrowBundleRecords implements BundleRecords {
 
  private final VectorSchemaRoot vectorSchemaRoot;
  private final RowType rowType;
- private final boolean onlyLowerCase;
+ private final boolean allowUpperCase;
 
  public ArrowBundleRecords(
- VectorSchemaRoot vectorSchemaRoot, RowType rowType, boolean onlyLowerCase) {
+ VectorSchemaRoot vectorSchemaRoot, RowType rowType, boolean allowUpperCase) {
  this.vectorSchemaRoot = vectorSchemaRoot;
  this.rowType = rowType;
- this.onlyLowerCase = onlyLowerCase;
+ this.allowUpperCase = allowUpperCase;
  }
 
  public VectorSchemaRoot getVectorSchemaRoot() {
@@ -52,7 +52,7 @@ public long rowCount() {
 
  @Override
  public Iterator<InternalRow> iterator() {
- ArrowBatchReader arrowBatchReader = new ArrowBatchReader(rowType, onlyLowerCase);
+ ArrowBatchReader arrowBatchReader = new ArrowBatchReader(rowType, allowUpperCase);
  return arrowBatchReader.readBatch(vectorSchemaRoot).iterator();
  }
 }
diff --git a/paimon-arrow/src/main/java/org/apache/paimon/arrow/reader/ArrowBatchReader.java b/paimon-arrow/src/main/java/org/apache/paimon/arrow/reader/ArrowBatchReader.java
@@ -41,9 +41,9 @@ public class ArrowBatchReader {
  private final VectorizedColumnBatch batch;
  private final Arrow2PaimonVectorConverter[] convertors;
  private final RowType projectedRowType;
- private final boolean toLowerCase;
+ private final boolean allowUpperCase;
 
- public ArrowBatchReader(RowType rowType, boolean toLowerCase) {
+ public ArrowBatchReader(RowType rowType, boolean allowUpperCase) {
  this.internalRowSerializer = new InternalRowSerializer(rowType);
  ColumnVector[] columnVectors = new ColumnVector[rowType.getFieldCount()];
  this.convertors = new Arrow2PaimonVectorConverter[rowType.getFieldCount()];
@@ -53,7 +53,7 @@ public ArrowBatchReader(RowType rowType, boolean toLowerCase) {
  for (int i = 0; i < columnVectors.length; i++) {
  this.convertors[i] = Arrow2PaimonVectorConverter.construct(rowType.getTypeAt(i));
  }
- this.toLowerCase = toLowerCase;
+ this.allowUpperCase = allowUpperCase;
  }
 
  public Iterable<InternalRow> readBatch(VectorSchemaRoot vsr) {
@@ -64,7 +64,7 @@ public Iterable<InternalRow> readBatch(VectorSchemaRoot vsr) {
  try {
  String fieldName = dataFields.get(i).name();
  Field field =
- arrowSchema.findField(toLowerCase ? fieldName.toLowerCase() : fieldName);
+ arrowSchema.findField(allowUpperCase ? fieldName : fieldName.toLowerCase());
  int idx = arrowSchema.getFields().indexOf(field);
  mapping[i] = idx;
  } catch (IllegalArgumentException e) {

diff --git a/paimon-arrow/src/test/java/org/apache/paimon/arrow/vector/ArrowFormatWriterTest.java b/paimon-arrow/src/test/java/org/apache/paimon/arrow/vector/ArrowFormatWriterTest.java
@@ -84,7 +84,7 @@ public class ArrowFormatWriterTest {
 
  @Test
  public void testWrite() {
- try (ArrowFormatWriter writer = new ArrowFormatWriter(PRIMITIVE_TYPE, 4096, false)) {
+ try (ArrowFormatWriter writer = new ArrowFormatWriter(PRIMITIVE_TYPE, 4096, true)) {
  List<InternalRow> list = new ArrayList<>();
  List<InternalRow.FieldGetter> fieldGetters = new ArrayList<>();
 
@@ -118,7 +118,7 @@ public void testWrite() {
 
  @Test
  public void testReadWithSchemaMessUp() {
- try (ArrowFormatWriter writer = new ArrowFormatWriter(PRIMITIVE_TYPE, 4096, false)) {
+ try (ArrowFormatWriter writer = new ArrowFormatWriter(PRIMITIVE_TYPE, 4096, true)) {
  List<InternalRow> list = new ArrayList<>();
  List<InternalRow.FieldGetter> fieldGetters = new ArrayList<>();
 
@@ -160,7 +160,7 @@ public void testReadWithSchemaMessUp() {
 
  @Test
  public void testArrowBundleRecords() {
- try (ArrowFormatWriter writer = new ArrowFormatWriter(PRIMITIVE_TYPE, 4096, false)) {
+ try (ArrowFormatWriter writer = new ArrowFormatWriter(PRIMITIVE_TYPE, 4096, true)) {
  List<InternalRow> list = new ArrayList<>();
  List<InternalRow.FieldGetter> fieldGetters = new ArrayList<>();
 
@@ -192,7 +192,7 @@ public void testArrowBundleRecords() {
 
  @Test
  public void testCWriter() {
- try (ArrowFormatCWriter writer = new ArrowFormatCWriter(PRIMITIVE_TYPE, 4096, false)) {
+ try (ArrowFormatCWriter writer = new ArrowFormatCWriter(PRIMITIVE_TYPE, 4096, true)) {
  List<InternalRow> list = new ArrayList<>();
  List<InternalRow.FieldGetter> fieldGetters = new ArrayList<>();