This is an automated email from the ASF dual-hosted git repository.
yuzelin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new ce567590f [hotfix] Change 'toLowerCase' to 'allowUpperCase' (#4271)
ce567590f is described below
commit ce567590f9bae5ea4023fac257f2393184a3febb
Author: yuzelin <[email protected]>
AuthorDate: Fri Sep 27 11:38:55 2024 +0800
[hotfix] Change 'toLowerCase' to 'allowUpperCase' (#4271)
---
.../src/main/java/org/apache/paimon/arrow/ArrowBundleRecords.java | 8 ++++----
.../java/org/apache/paimon/arrow/reader/ArrowBatchReader.java | 8 ++++----
.../org/apache/paimon/arrow/vector/ArrowFormatWriterTest.java | 8 ++++----
3 files changed, 12 insertions(+), 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
index 84dfb875e..9627bbd85 100644
--- 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 class ArrowBundleRecords implements BundleRecords {
@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
index a349dfff0..9d20062b4 100644
---
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 class ArrowBatchReader {
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 class ArrowBatchReader {
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
index 0b6cb7eca..f4eee7518 100644
---
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 class ArrowFormatWriterTest {
@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 class ArrowFormatWriterTest {
@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 class ArrowFormatWriterTest {
@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<>();
