You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@paimon.apache.org by cz...@apache.org on 2023/03/27 03:16:49 UTC
[incubator-paimon] branch master updated: [typo] Rename paimon-common's 'RowDataUtils' to 'InternalRowUtils' (#707)
This is an automated email from the ASF dual-hosted git repository.
czweng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 7fbef6ca9 [typo] Rename paimon-common's 'RowDataUtils' to 'InternalRowUtils' (#707)
7fbef6ca9 is described below
commit 7fbef6ca9e419462277798cff34d126d6e39289d
Author: yuzelin <33...@users.noreply.github.com>
AuthorDate: Mon Mar 27 11:16:45 2023 +0800
[typo] Rename paimon-common's 'RowDataUtils' to 'InternalRowUtils' (#707)
---
.../{RowDataUtils.java => InternalRowUtils.java} | 7 +++----
.../paimon/utils/RowDataToObjectArrayConverter.java | 2 +-
...owDataUtilsTest.java => InternalRowUtilsTest.java} | 19 ++++++++++---------
.../src/main/java/org/apache/paimon/KeyValue.java | 4 ++--
.../org/apache/paimon/io/DataFileMetaSerializer.java | 4 ++--
.../mergetree/compact/PartialUpdateMergeFunction.java | 2 +-
.../compact/aggregate/AggregateMergeFunction.java | 2 +-
.../mergetree/compact/aggregate/FieldMaxAgg.java | 4 ++--
.../mergetree/compact/aggregate/FieldMinAgg.java | 4 ++--
.../org/apache/paimon/schema/SchemaEvolutionUtil.java | 8 +++++---
.../paimon/stats/FieldStatsArraySerializer.java | 4 ++--
.../apache/paimon/table/sink/SequenceGenerator.java | 4 ++--
.../apache/paimon/utils/RowDataPartitionComputer.java | 2 +-
.../paimon/table/ColumnTypeFileDataTestBase.java | 4 ++--
.../main/java/org/apache/paimon/hive/PaimonSerDe.java | 6 +++---
...tor.java => PaimonInternalRowObjectInspector.java} | 16 ++++++++--------
.../java/org/apache/paimon/hive/PaimonSerDeTest.java | 6 +++---
...java => PaimonInternalRowObjectInspectorTest.java} | 16 ++++++++--------
.../java/org/apache/paimon/spark/SparkArrayData.java | 6 +++---
.../org/apache/paimon/spark/SparkInternalRow.java | 4 ++--
20 files changed, 63 insertions(+), 61 deletions(-)
diff --git a/paimon-common/src/main/java/org/apache/paimon/utils/RowDataUtils.java b/paimon-common/src/main/java/org/apache/paimon/utils/InternalRowUtils.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/paimon/utils/RowDataUtils.java
rename to paimon-common/src/main/java/org/apache/paimon/utils/InternalRowUtils.java
index ac26c0429..1a0b67e6b 100644
--- a/paimon-common/src/main/java/org/apache/paimon/utils/RowDataUtils.java
+++ b/paimon-common/src/main/java/org/apache/paimon/utils/InternalRowUtils.java
@@ -50,9 +50,9 @@ import java.util.List;
import java.util.Map;
/** Utils for {@link InternalRow} structures. */
-public class RowDataUtils {
+public class InternalRowUtils {
- public static InternalRow copyRowData(InternalRow row, RowType rowType) {
+ public static InternalRow copyInternalRow(InternalRow row, RowType rowType) {
if (row instanceof BinaryRow) {
return ((BinaryRow) row).copy();
} else if (row instanceof NestedRow) {
@@ -125,12 +125,11 @@ public class RowDataUtils {
return new GenericMap(javaMap);
}
- @SuppressWarnings({"rawtypes", "unchecked"})
public static Object copy(Object o, DataType type) {
if (o instanceof BinaryString) {
return ((BinaryString) o).copy();
} else if (o instanceof InternalRow) {
- return copyRowData((InternalRow) o, (RowType) type);
+ return copyInternalRow((InternalRow) o, (RowType) type);
} else if (o instanceof InternalArray) {
return copyArray((InternalArray) o, ((ArrayType) type).getElementType());
} else if (o instanceof InternalMap) {
diff --git a/paimon-common/src/main/java/org/apache/paimon/utils/RowDataToObjectArrayConverter.java b/paimon-common/src/main/java/org/apache/paimon/utils/RowDataToObjectArrayConverter.java
index 7ef96eaec..30d026429 100644
--- a/paimon-common/src/main/java/org/apache/paimon/utils/RowDataToObjectArrayConverter.java
+++ b/paimon-common/src/main/java/org/apache/paimon/utils/RowDataToObjectArrayConverter.java
@@ -35,7 +35,7 @@ public class RowDataToObjectArrayConverter {
IntStream.range(0, rowType.getFieldCount())
.mapToObj(
i ->
- RowDataUtils.createNullCheckingFieldGetter(
+ InternalRowUtils.createNullCheckingFieldGetter(
rowType.getTypeAt(i), i))
.toArray(InternalRow.FieldGetter[]::new);
}
diff --git a/paimon-common/src/test/java/org/apache/paimon/utils/RowDataUtilsTest.java b/paimon-common/src/test/java/org/apache/paimon/utils/InternalRowUtilsTest.java
similarity index 88%
rename from paimon-common/src/test/java/org/apache/paimon/utils/RowDataUtilsTest.java
rename to paimon-common/src/test/java/org/apache/paimon/utils/InternalRowUtilsTest.java
index 9116fa962..09a9c7bb0 100644
--- a/paimon-common/src/test/java/org/apache/paimon/utils/RowDataUtilsTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/utils/InternalRowUtilsTest.java
@@ -39,8 +39,8 @@ import java.time.LocalDateTime;
import static org.assertj.core.api.Assertions.assertThat;
-/** Test for {@link RowDataUtils}. */
-public class RowDataUtilsTest {
+/** Test for {@link InternalRowUtils}. */
+public class InternalRowUtilsTest {
public static final RowType ROW_TYPE =
RowType.builder()
@@ -88,15 +88,15 @@ public class RowDataUtilsTest {
public void testCopy() {
for (int i = 0; i < 10; i++) {
InternalRow row = rowDataGenerator.next();
- InternalRow copied = RowDataUtils.copyRowData(row, ROW_TYPE);
+ InternalRow copied = InternalRowUtils.copyInternalRow(row, ROW_TYPE);
assertThat(toBinary(copied)).isEqualTo(toBinary(row));
InternalRow copied2 = serializer.copy(row);
// check copied
for (int j = 0; j < copied.getFieldCount(); j++) {
- Object origin = RowDataUtils.get(row, j, ROW_TYPE.getTypeAt(j));
- Object field1 = RowDataUtils.get(copied, j, ROW_TYPE.getTypeAt(j));
- Object field2 = RowDataUtils.get(copied2, j, ROW_TYPE.getTypeAt(j));
+ Object origin = InternalRowUtils.get(row, j, ROW_TYPE.getTypeAt(j));
+ Object field1 = InternalRowUtils.get(copied, j, ROW_TYPE.getTypeAt(j));
+ Object field2 = InternalRowUtils.get(copied2, j, ROW_TYPE.getTypeAt(j));
if (field2 != origin) {
assertThat(field1).isNotSameAs(origin);
@@ -114,19 +114,20 @@ public class RowDataUtilsTest {
// test DECIMAL data type
Decimal xDecimalData = Decimal.fromBigDecimal(new BigDecimal("12.34"), 4, 2);
Decimal yDecimalData = Decimal.fromBigDecimal(new BigDecimal("13.14"), 4, 2);
- assertThat(RowDataUtils.compare(xDecimalData, yDecimalData, DataTypeRoot.DECIMAL))
+ assertThat(InternalRowUtils.compare(xDecimalData, yDecimalData, DataTypeRoot.DECIMAL))
.isLessThan(0);
// test DOUBLE data type
double xDouble = 13.14;
double yDouble = 12.13;
- assertThat(RowDataUtils.compare(xDouble, yDouble, DataTypeRoot.DOUBLE)).isGreaterThan(0);
+ assertThat(InternalRowUtils.compare(xDouble, yDouble, DataTypeRoot.DOUBLE))
+ .isGreaterThan(0);
// test TIMESTAMP_WITHOUT_TIME_ZONE data type
Timestamp xTimestamp = Timestamp.fromLocalDateTime(LocalDateTime.now());
Timestamp yTimestamp = Timestamp.fromSQLTimestamp(xTimestamp.toSQLTimestamp());
assertThat(
- RowDataUtils.compare(
+ InternalRowUtils.compare(
xTimestamp, yTimestamp, DataTypeRoot.TIMESTAMP_WITHOUT_TIME_ZONE))
.isEqualTo(0);
}
diff --git a/paimon-core/src/main/java/org/apache/paimon/KeyValue.java b/paimon-core/src/main/java/org/apache/paimon/KeyValue.java
index 8afc27a87..eee937e46 100644
--- a/paimon-core/src/main/java/org/apache/paimon/KeyValue.java
+++ b/paimon-core/src/main/java/org/apache/paimon/KeyValue.java
@@ -26,7 +26,7 @@ import org.apache.paimon.types.DataField;
import org.apache.paimon.types.RowKind;
import org.apache.paimon.types.RowType;
import org.apache.paimon.types.TinyIntType;
-import org.apache.paimon.utils.RowDataUtils;
+import org.apache.paimon.utils.InternalRowUtils;
import java.util.ArrayList;
import java.util.List;
@@ -215,7 +215,7 @@ public class KeyValue {
.mapToObj(
i ->
String.valueOf(
- RowDataUtils.createNullCheckingFieldGetter(
+ InternalRowUtils.createNullCheckingFieldGetter(
type.getTypeAt(i), i)
.getFieldOrNull(row)))
.collect(Collectors.joining(", "));
diff --git a/paimon-core/src/main/java/org/apache/paimon/io/DataFileMetaSerializer.java b/paimon-core/src/main/java/org/apache/paimon/io/DataFileMetaSerializer.java
index 764741763..dad2bc973 100644
--- a/paimon-core/src/main/java/org/apache/paimon/io/DataFileMetaSerializer.java
+++ b/paimon-core/src/main/java/org/apache/paimon/io/DataFileMetaSerializer.java
@@ -24,8 +24,8 @@ import org.apache.paimon.data.InternalRow;
import org.apache.paimon.stats.BinaryTableStats;
import org.apache.paimon.utils.ObjectSerializer;
-import static org.apache.paimon.utils.RowDataUtils.fromStringArrayData;
-import static org.apache.paimon.utils.RowDataUtils.toStringArrayData;
+import static org.apache.paimon.utils.InternalRowUtils.fromStringArrayData;
+import static org.apache.paimon.utils.InternalRowUtils.toStringArrayData;
import static org.apache.paimon.utils.SerializationUtils.deserializeBinaryRow;
import static org.apache.paimon.utils.SerializationUtils.serializeBinaryRow;
diff --git a/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/PartialUpdateMergeFunction.java b/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/PartialUpdateMergeFunction.java
index fe15d3e1c..34ebd6f67 100644
--- a/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/PartialUpdateMergeFunction.java
+++ b/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/PartialUpdateMergeFunction.java
@@ -29,7 +29,7 @@ import javax.annotation.Nullable;
import java.util.List;
-import static org.apache.paimon.utils.RowDataUtils.createFieldGetters;
+import static org.apache.paimon.utils.InternalRowUtils.createFieldGetters;
/**
* A {@link MergeFunction} where key is primary key (unique) and value is the partial record, update
diff --git a/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/AggregateMergeFunction.java b/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/AggregateMergeFunction.java
index d4fff82ea..a37751739 100644
--- a/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/AggregateMergeFunction.java
+++ b/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/AggregateMergeFunction.java
@@ -33,8 +33,8 @@ import javax.annotation.Nullable;
import java.util.List;
import static org.apache.paimon.options.ConfigOptions.key;
+import static org.apache.paimon.utils.InternalRowUtils.createFieldGetters;
import static org.apache.paimon.utils.Preconditions.checkNotNull;
-import static org.apache.paimon.utils.RowDataUtils.createFieldGetters;
/**
* A {@link MergeFunction} where key is primary key (unique) and value is the partial record,
diff --git a/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldMaxAgg.java b/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldMaxAgg.java
index 4ec2a2fe7..3f28d0c0a 100644
--- a/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldMaxAgg.java
+++ b/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldMaxAgg.java
@@ -20,7 +20,7 @@ package org.apache.paimon.mergetree.compact.aggregate;
import org.apache.paimon.types.DataType;
import org.apache.paimon.types.DataTypeRoot;
-import org.apache.paimon.utils.RowDataUtils;
+import org.apache.paimon.utils.InternalRowUtils;
/** max aggregate a field of a row. */
public class FieldMaxAgg extends FieldAggregator {
@@ -44,7 +44,7 @@ public class FieldMaxAgg extends FieldAggregator {
max = (accumulator == null ? inputField : accumulator);
} else {
DataTypeRoot type = fieldType.getTypeRoot();
- if (RowDataUtils.compare(accumulator, inputField, type) < 0) {
+ if (InternalRowUtils.compare(accumulator, inputField, type) < 0) {
max = inputField;
} else {
max = accumulator;
diff --git a/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldMinAgg.java b/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldMinAgg.java
index c350401c1..f4b846f76 100644
--- a/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldMinAgg.java
+++ b/paimon-core/src/main/java/org/apache/paimon/mergetree/compact/aggregate/FieldMinAgg.java
@@ -20,7 +20,7 @@ package org.apache.paimon.mergetree.compact.aggregate;
import org.apache.paimon.types.DataType;
import org.apache.paimon.types.DataTypeRoot;
-import org.apache.paimon.utils.RowDataUtils;
+import org.apache.paimon.utils.InternalRowUtils;
/** min aggregate a field of a row. */
public class FieldMinAgg extends FieldAggregator {
@@ -44,7 +44,7 @@ public class FieldMinAgg extends FieldAggregator {
min = (accumulator == null ? inputField : accumulator);
} else {
DataTypeRoot type = fieldType.getTypeRoot();
- if (RowDataUtils.compare(accumulator, inputField, type) < 0) {
+ if (InternalRowUtils.compare(accumulator, inputField, type) < 0) {
min = accumulator;
} else {
min = inputField;
diff --git a/paimon-core/src/main/java/org/apache/paimon/schema/SchemaEvolutionUtil.java b/paimon-core/src/main/java/org/apache/paimon/schema/SchemaEvolutionUtil.java
index 69000f26b..ad119f772 100644
--- a/paimon-core/src/main/java/org/apache/paimon/schema/SchemaEvolutionUtil.java
+++ b/paimon-core/src/main/java/org/apache/paimon/schema/SchemaEvolutionUtil.java
@@ -33,8 +33,8 @@ import org.apache.paimon.types.DataTypeFamily;
import org.apache.paimon.types.MapType;
import org.apache.paimon.types.MultisetType;
import org.apache.paimon.types.RowType;
+import org.apache.paimon.utils.InternalRowUtils;
import org.apache.paimon.utils.ProjectedRow;
-import org.apache.paimon.utils.RowDataUtils;
import javax.annotation.Nullable;
@@ -436,7 +436,8 @@ public class SchemaEvolutionUtil {
// data
converterMapping[i] =
new CastFieldGetter(
- RowDataUtils.createNullCheckingFieldGetter(dataField.type(), i),
+ InternalRowUtils.createNullCheckingFieldGetter(
+ dataField.type(), i),
CastExecutors.identityCastExecutor());
} else {
// TODO support column type evolution in nested type
@@ -450,7 +451,8 @@ public class SchemaEvolutionUtil {
// data
converterMapping[i] =
new CastFieldGetter(
- RowDataUtils.createNullCheckingFieldGetter(dataField.type(), i),
+ InternalRowUtils.createNullCheckingFieldGetter(
+ dataField.type(), i),
checkNotNull(
CastExecutors.resolve(
dataField.type(), tableField.type())));
diff --git a/paimon-core/src/main/java/org/apache/paimon/stats/FieldStatsArraySerializer.java b/paimon-core/src/main/java/org/apache/paimon/stats/FieldStatsArraySerializer.java
index 741f7ee33..17db3a53e 100644
--- a/paimon-core/src/main/java/org/apache/paimon/stats/FieldStatsArraySerializer.java
+++ b/paimon-core/src/main/java/org/apache/paimon/stats/FieldStatsArraySerializer.java
@@ -28,7 +28,7 @@ import org.apache.paimon.types.BigIntType;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DataType;
import org.apache.paimon.types.RowType;
-import org.apache.paimon.utils.RowDataUtils;
+import org.apache.paimon.utils.InternalRowUtils;
import javax.annotation.Nullable;
@@ -60,7 +60,7 @@ public class FieldStatsArraySerializer {
IntStream.range(0, safeType.getFieldCount())
.mapToObj(
i ->
- RowDataUtils.createNullCheckingFieldGetter(
+ InternalRowUtils.createNullCheckingFieldGetter(
safeType.getTypeAt(i), i))
.toArray(InternalRow.FieldGetter[]::new);
this.indexMapping = indexMapping;
diff --git a/paimon-core/src/main/java/org/apache/paimon/table/sink/SequenceGenerator.java b/paimon-core/src/main/java/org/apache/paimon/table/sink/SequenceGenerator.java
index c492af8db..a4326f4a4 100644
--- a/paimon-core/src/main/java/org/apache/paimon/table/sink/SequenceGenerator.java
+++ b/paimon-core/src/main/java/org/apache/paimon/table/sink/SequenceGenerator.java
@@ -34,7 +34,7 @@ import org.apache.paimon.types.SmallIntType;
import org.apache.paimon.types.TimestampType;
import org.apache.paimon.types.TinyIntType;
import org.apache.paimon.types.VarCharType;
-import org.apache.paimon.utils.RowDataUtils;
+import org.apache.paimon.utils.InternalRowUtils;
/** Generate sequence number. */
public class SequenceGenerator {
@@ -80,7 +80,7 @@ public class SequenceGenerator {
@Override
public Generator visit(DecimalType decimalType) {
return (row, i) ->
- RowDataUtils.castToIntegral(
+ InternalRowUtils.castToIntegral(
row.getDecimal(i, decimalType.getPrecision(), decimalType.getScale()));
}
diff --git a/paimon-core/src/main/java/org/apache/paimon/utils/RowDataPartitionComputer.java b/paimon-core/src/main/java/org/apache/paimon/utils/RowDataPartitionComputer.java
index 33e49851e..a5a9c21fe 100644
--- a/paimon-core/src/main/java/org/apache/paimon/utils/RowDataPartitionComputer.java
+++ b/paimon-core/src/main/java/org/apache/paimon/utils/RowDataPartitionComputer.java
@@ -42,7 +42,7 @@ public class RowDataPartitionComputer {
.mapToInt(columnList::indexOf)
.mapToObj(
i ->
- RowDataUtils.createNullCheckingFieldGetter(
+ InternalRowUtils.createNullCheckingFieldGetter(
rowType.getTypeAt(i), i))
.toArray(InternalRow.FieldGetter[]::new);
}
diff --git a/paimon-core/src/test/java/org/apache/paimon/table/ColumnTypeFileDataTestBase.java b/paimon-core/src/test/java/org/apache/paimon/table/ColumnTypeFileDataTestBase.java
index 090f80b2f..4e074aa86 100644
--- a/paimon-core/src/test/java/org/apache/paimon/table/ColumnTypeFileDataTestBase.java
+++ b/paimon-core/src/test/java/org/apache/paimon/table/ColumnTypeFileDataTestBase.java
@@ -24,7 +24,7 @@ import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.predicate.PredicateBuilder;
import org.apache.paimon.table.source.Split;
import org.apache.paimon.types.DataField;
-import org.apache.paimon.utils.RowDataUtils;
+import org.apache.paimon.utils.InternalRowUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat;
public abstract class ColumnTypeFileDataTestBase extends SchemaEvolutionTableTestBase {
protected static List<InternalRow.FieldGetter> getFieldGetterList(FileStoreTable table) {
return Arrays.asList(
- RowDataUtils.createFieldGetters(
+ InternalRowUtils.createFieldGetters(
table.schema().fields().stream()
.map(DataField::type)
.collect(Collectors.toList())));
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonSerDe.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonSerDe.java
index 9147b4f5a..3bf5bd9ae 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonSerDe.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonSerDe.java
@@ -18,7 +18,7 @@
package org.apache.paimon.hive;
-import org.apache.paimon.hive.objectinspector.PaimonRowDataObjectInspector;
+import org.apache.paimon.hive.objectinspector.PaimonInternalRowObjectInspector;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.serde2.AbstractSerDe;
@@ -38,14 +38,14 @@ import java.util.Properties;
*/
public class PaimonSerDe extends AbstractSerDe {
- private PaimonRowDataObjectInspector inspector;
+ private PaimonInternalRowObjectInspector inspector;
@Override
public void initialize(@Nullable Configuration configuration, Properties properties)
throws SerDeException {
HiveSchema schema = HiveSchema.extract(configuration, properties);
inspector =
- new PaimonRowDataObjectInspector(
+ new PaimonInternalRowObjectInspector(
schema.fieldNames(), schema.fieldTypes(), schema.fieldComments());
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonInternalRowObjectInspector.java
similarity index 90%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspector.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonInternalRowObjectInspector.java
index 498e4eed3..776dc4f68 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonInternalRowObjectInspector.java
@@ -21,7 +21,7 @@ package org.apache.paimon.hive.objectinspector;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.hive.HiveTypeUtils;
import org.apache.paimon.types.DataType;
-import org.apache.paimon.utils.RowDataUtils;
+import org.apache.paimon.utils.InternalRowUtils;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.StructField;
@@ -34,13 +34,13 @@ import java.util.Map;
import java.util.stream.Collectors;
/** {@link StructObjectInspector} for {@link InternalRow}. */
-public class PaimonRowDataObjectInspector extends StructObjectInspector {
+public class PaimonInternalRowObjectInspector extends StructObjectInspector {
private final List<PaimonStructField> structFields;
private final Map<String, PaimonStructField> structFieldMap;
private final String typeName;
- public PaimonRowDataObjectInspector(
+ public PaimonInternalRowObjectInspector(
List<String> fieldNames, List<DataType> fieldTypes, List<String> fieldComments) {
this.structFields = new ArrayList<>();
this.structFieldMap = new HashMap<>();
@@ -54,7 +54,7 @@ public class PaimonRowDataObjectInspector extends StructObjectInspector {
name,
PaimonObjectInspectorFactory.create(logicalType),
i,
- RowDataUtils.createNullCheckingFieldGetter(logicalType, i),
+ InternalRowUtils.createNullCheckingFieldGetter(logicalType, i),
fieldComments.get(i));
structFields.add(structField);
structFieldMap.put(name, structField);
@@ -84,15 +84,15 @@ public class PaimonRowDataObjectInspector extends StructObjectInspector {
@Override
public Object getStructFieldData(Object o, StructField structField) {
- InternalRow rowData = (InternalRow) o;
- return ((PaimonStructField) structField).fieldGetter.getFieldOrNull(rowData);
+ InternalRow internalRow = (InternalRow) o;
+ return ((PaimonStructField) structField).fieldGetter.getFieldOrNull(internalRow);
}
@Override
public List<Object> getStructFieldsDataAsList(Object o) {
- InternalRow rowData = (InternalRow) o;
+ InternalRow internalRow = (InternalRow) o;
return structFields.stream()
- .map(f -> f.fieldGetter.getFieldOrNull(rowData))
+ .map(f -> f.fieldGetter.getFieldOrNull(internalRow))
.collect(Collectors.toList());
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/PaimonSerDeTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/PaimonSerDeTest.java
index 1af7e0a19..688dff7f0 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/PaimonSerDeTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/PaimonSerDeTest.java
@@ -21,7 +21,7 @@ package org.apache.paimon.hive;
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.fs.Path;
import org.apache.paimon.fs.local.LocalFileIO;
-import org.apache.paimon.hive.objectinspector.PaimonRowDataObjectInspector;
+import org.apache.paimon.hive.objectinspector.PaimonInternalRowObjectInspector;
import org.apache.paimon.schema.Schema;
import org.apache.paimon.schema.SchemaManager;
@@ -50,8 +50,8 @@ public class PaimonSerDeTest {
public void testInitialize() throws Exception {
PaimonSerDe serDe = createInitializedSerDe();
ObjectInspector o = serDe.getObjectInspector();
- assertThat(o).isInstanceOf(PaimonRowDataObjectInspector.class);
- PaimonRowDataObjectInspector oi = (PaimonRowDataObjectInspector) o;
+ assertThat(o).isInstanceOf(PaimonInternalRowObjectInspector.class);
+ PaimonInternalRowObjectInspector oi = (PaimonInternalRowObjectInspector) o;
GenericRow rowData = generate();
List<? extends StructField> structFields = oi.getAllStructFieldRefs();
for (int i = 0; i < structFields.size(); i++) {
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonInternalRowObjectInspectorTest.java
similarity index 90%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspectorTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonInternalRowObjectInspectorTest.java
index 1b34e6bcf..774e71df3 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspectorTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonInternalRowObjectInspectorTest.java
@@ -34,13 +34,13 @@ import static org.apache.paimon.hive.RandomGenericRowDataGenerator.TYPE_NAMES;
import static org.apache.paimon.hive.RandomGenericRowDataGenerator.generate;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link PaimonRowDataObjectInspector}. */
-public class PaimonRowDataObjectInspectorTest {
+/** Tests for {@link PaimonInternalRowObjectInspector}. */
+public class PaimonInternalRowObjectInspectorTest {
@Test
public void testGetStructFieldRef() {
- PaimonRowDataObjectInspector oi =
- new PaimonRowDataObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
+ PaimonInternalRowObjectInspector oi =
+ new PaimonInternalRowObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
List<? extends StructField> structFields = oi.getAllStructFieldRefs();
List<ObjectInspector.Category> expectedOiCategories =
Arrays.asList(
@@ -76,8 +76,8 @@ public class PaimonRowDataObjectInspectorTest {
@Test
public void testGetTypeName() {
- PaimonRowDataObjectInspector oi =
- new PaimonRowDataObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
+ PaimonInternalRowObjectInspector oi =
+ new PaimonInternalRowObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
String expected =
"struct<"
+ String.join(
@@ -106,8 +106,8 @@ public class PaimonRowDataObjectInspectorTest {
@Test
public void testGetStructFieldData() {
- PaimonRowDataObjectInspector oi =
- new PaimonRowDataObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
+ PaimonInternalRowObjectInspector oi =
+ new PaimonInternalRowObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
GenericRow rowData = generate();
List<Object> structFieldsData = oi.getStructFieldsDataAsList(rowData);
for (int i = 0; i < structFieldsData.size(); i++) {
diff --git a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkArrayData.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkArrayData.java
index c99f857c9..644783b69 100644
--- a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkArrayData.java
+++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkArrayData.java
@@ -23,7 +23,7 @@ import org.apache.paimon.types.ArrayType;
import org.apache.paimon.types.BigIntType;
import org.apache.paimon.types.DataType;
import org.apache.paimon.types.RowType;
-import org.apache.paimon.utils.RowDataUtils;
+import org.apache.paimon.utils.InternalRowUtils;
import org.apache.spark.sql.catalyst.InternalRow;
import org.apache.spark.sql.catalyst.expressions.SpecializedGettersReader;
@@ -34,7 +34,7 @@ import org.apache.spark.unsafe.types.CalendarInterval;
import org.apache.spark.unsafe.types.UTF8String;
import static org.apache.paimon.spark.SparkInternalRow.fromPaimon;
-import static org.apache.paimon.utils.RowDataUtils.copyArray;
+import static org.apache.paimon.utils.InternalRowUtils.copyArray;
import static org.apache.paimon.utils.TypeUtils.timestampPrecision;
/** Spark {@link ArrayData} to wrap Paimon {@link InternalArray}. */
@@ -67,7 +67,7 @@ public class SparkArrayData extends ArrayData {
public Object[] array() {
Object[] objects = new Object[numElements()];
for (int i = 0; i < objects.length; i++) {
- objects[i] = fromPaimon(RowDataUtils.get(array, i, elementType), elementType);
+ objects[i] = fromPaimon(InternalRowUtils.get(array, i, elementType), elementType);
}
return objects;
}
diff --git a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkInternalRow.java b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkInternalRow.java
index f330435a6..b61d7a98b 100644
--- a/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkInternalRow.java
+++ b/paimon-spark/paimon-spark-common/src/main/java/org/apache/paimon/spark/SparkInternalRow.java
@@ -39,7 +39,7 @@ import org.apache.spark.sql.types.Decimal;
import org.apache.spark.unsafe.types.CalendarInterval;
import org.apache.spark.unsafe.types.UTF8String;
-import static org.apache.paimon.utils.RowDataUtils.copyRowData;
+import static org.apache.paimon.utils.InternalRowUtils.copyInternalRow;
import static org.apache.paimon.utils.TypeUtils.timestampPrecision;
/** Spark {@link org.apache.spark.sql.catalyst.InternalRow} to wrap {@link InternalRow}. */
@@ -75,7 +75,7 @@ public class SparkInternalRow extends org.apache.spark.sql.catalyst.InternalRow
@Override
public org.apache.spark.sql.catalyst.InternalRow copy() {
- return new SparkInternalRow(rowType).replace(copyRowData(row, rowType));
+ return new SparkInternalRow(rowType).replace(copyInternalRow(row, rowType));
}
@Override