You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@paimon.apache.org by lz...@apache.org on 2023/03/18 04:43:11 UTC
[incubator-paimon] 30/32: [core] Rename paimon: TableStore to Paimon 1
This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git
commit bd360c62ddcbe64bb660a05e7d31a67e310278db
Author: JingsongLi <lz...@aliyun.com>
AuthorDate: Sat Mar 18 10:08:38 2023 +0800
[core] Rename paimon: TableStore to Paimon 1
---
docs/content/engines/hive.md | 2 +-
docs/content/how-to/creating-tables.md | 2 +-
.../java/org/apache/paimon/tests/HiveE2eTest.java | 2 +-
.../main/java/org/apache/paimon/hive/HiveCatalog.java | 4 ++--
...tInspector.java => PaimonDateObjectInspector.java} | 4 ++--
...ector.java => PaimonTimestampObjectInspector.java} | 4 ++--
.../{TableStoreJobConf.java => PaimonJobConf.java} | 4 ++--
...ableStoreHiveMetaHook.java => PaimonMetaHook.java} | 2 +-
.../hive/{TableStoreSerDe.java => PaimonSerDe.java} | 8 ++++----
...eStorageHandler.java => PaimonStorageHandler.java} | 9 ++++-----
.../paimon/hive/mapred/TableStoreInputFormat.java | 4 ++--
...tInspector.java => PaimonCharObjectInspector.java} | 4 ++--
...tInspector.java => PaimonDateObjectInspector.java} | 4 ++--
...spector.java => PaimonDecimalObjectInspector.java} | 4 ++--
...tInspector.java => PaimonListObjectInspector.java} | 6 +++---
...ctInspector.java => PaimonMapObjectInspector.java} | 8 ++++----
...Factory.java => PaimonObjectInspectorFactory.java} | 19 +++++++++----------
...spector.java => PaimonRowDataObjectInspector.java} | 6 +++---
...nspector.java => PaimonStringObjectInspector.java} | 4 ++--
...ector.java => PaimonTimestampObjectInspector.java} | 4 ++--
...spector.java => PaimonVarcharObjectInspector.java} | 4 ++--
...{TableStoreSerDeTest.java => PaimonSerDeTest.java} | 18 +++++++++---------
...lerITCase.java => PaimonStorageHandlerITCase.java} | 16 ++++++++--------
...orTest.java => PaimonCharObjectInspectorTest.java} | 12 ++++++------
...orTest.java => PaimonDateObjectInspectorTest.java} | 12 ++++++------
...est.java => PaimonDecimalObjectInspectorTest.java} | 12 ++++++------
...orTest.java => PaimonListObjectInspectorTest.java} | 8 ++++----
...torTest.java => PaimonMapObjectInspectorTest.java} | 12 ++++++------
...est.java => PaimonRowDataObjectInspectorTest.java} | 16 ++++++++--------
...Test.java => PaimonStringObjectInspectorTest.java} | 12 ++++++------
...t.java => PaimonTimestampObjectInspectorTest.java} | 12 ++++++------
...est.java => PaimonVarcharObjectInspectorTest.java} | 12 ++++++------
32 files changed, 124 insertions(+), 126 deletions(-)
diff --git a/docs/content/engines/hive.md b/docs/content/engines/hive.md
index 5ae357cbd..11e026552 100644
--- a/docs/content/engines/hive.md
+++ b/docs/content/engines/hive.md
@@ -164,7 +164,7 @@ To access existing paimon table, you can also register them as external tables i
-- Pointing the location to the path of table is enough.
CREATE EXTERNAL TABLE external_test_table
-STORED BY 'org.apache.paimon.hive.TableStoreHiveStorageHandler'
+STORED BY 'org.apache.paimon.hive.PaimonStorageHandler'
LOCATION '/path/to/table/store/warehouse/default.db/test_table';
-- Read records from external_test_table
diff --git a/docs/content/how-to/creating-tables.md b/docs/content/how-to/creating-tables.md
index 114e6cb1d..ab8532583 100644
--- a/docs/content/how-to/creating-tables.md
+++ b/docs/content/how-to/creating-tables.md
@@ -363,7 +363,7 @@ Hive SQL only supports reading from an external table. The following SQL creates
```sql
CREATE EXTERNAL TABLE my_table
-STORED BY 'org.apache.paimon.hive.TableStoreHiveStorageHandler'
+STORED BY 'org.apache.paimon.hive.PaimonStorageHandler'
LOCATION 'hdfs://path/to/table';
```
diff --git a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
index a3378b2ab..8155306ca 100644
--- a/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
+++ b/paimon-e2e-tests/src/test/java/org/apache/paimon/tests/HiveE2eTest.java
@@ -77,7 +77,7 @@ public class HiveE2eTest extends E2eReaderTestBase {
String externalTablePkDdl =
String.format(
"CREATE EXTERNAL TABLE IF NOT EXISTS %s\n"
- + "STORED BY 'org.apache.paimon.hive.TableStoreHiveStorageHandler'\n"
+ + "STORED BY 'org.apache.paimon.hive.PaimonStorageHandler'\n"
+ "LOCATION '%s/default.db/%s';\n",
table, tableStorePkPath, table);
diff --git a/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java
index fa35cff2b..9ff6c3d39 100644
--- a/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java
+++ b/paimon-hive/paimon-hive-catalog/src/main/java/org/apache/paimon/hive/HiveCatalog.java
@@ -75,9 +75,9 @@ public class HiveCatalog extends AbstractCatalog {
"org.apache.paimon.hive.mapred.TableStoreInputFormat";
private static final String OUTPUT_FORMAT_CLASS_NAME =
"org.apache.paimon.hive.mapred.TableStoreOutputFormat";
- private static final String SERDE_CLASS_NAME = "org.apache.paimon.hive.TableStoreSerDe";
+ private static final String SERDE_CLASS_NAME = "org.apache.paimon.hive.PaimonSerDe";
private static final String STORAGE_HANDLER_CLASS_NAME =
- "org.apache.paimon.hive.TableStoreHiveStorageHandler";
+ "org.apache.paimon.hive.PaimonStorageHandler";
private final HiveConf hiveConf;
private final String clientClassName;
diff --git a/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java b/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/PaimonDateObjectInspector.java
similarity index 93%
rename from paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java
rename to paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/PaimonDateObjectInspector.java
index fe8cb82c7..80d650f3b 100644
--- a/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/PaimonDateObjectInspector.java
@@ -25,10 +25,10 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.DateObjectInspect
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
/** {@link AbstractPrimitiveJavaObjectInspector} for DATE type. */
-public class TableStoreDateObjectInspector extends AbstractPrimitiveJavaObjectInspector
+public class PaimonDateObjectInspector extends AbstractPrimitiveJavaObjectInspector
implements DateObjectInspector {
- public TableStoreDateObjectInspector() {
+ public PaimonDateObjectInspector() {
super(TypeInfoFactory.dateTypeInfo);
}
diff --git a/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java b/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/PaimonTimestampObjectInspector.java
similarity index 93%
rename from paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java
rename to paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/PaimonTimestampObjectInspector.java
index 26bcedad3..384d5fafd 100644
--- a/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-3.1/src/main/java/org/apache/paimon/hive/objectinspector/PaimonTimestampObjectInspector.java
@@ -25,10 +25,10 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.TimestampObjectIn
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
/** {@link AbstractPrimitiveJavaObjectInspector} for TIMESTAMP type. */
-public class TableStoreTimestampObjectInspector extends AbstractPrimitiveJavaObjectInspector
+public class PaimonTimestampObjectInspector extends AbstractPrimitiveJavaObjectInspector
implements TimestampObjectInspector {
- public TableStoreTimestampObjectInspector() {
+ public PaimonTimestampObjectInspector() {
super(TypeInfoFactory.timestampTypeInfo);
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreJobConf.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonJobConf.java
similarity index 97%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreJobConf.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonJobConf.java
index 6ddded952..f733e8513 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreJobConf.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonJobConf.java
@@ -32,7 +32,7 @@ import java.util.Properties;
* Utility class to convert Hive table property keys and get file store specific configurations from
* {@link JobConf}.
*/
-public class TableStoreJobConf {
+public class PaimonJobConf {
private static final String INTERNAL_LOCATION = "paimon.internal.location";
private static final String INTERNAL_CATALOG_CONFIG = "paimon.catalog.config";
@@ -41,7 +41,7 @@ public class TableStoreJobConf {
private final JobConf jobConf;
- public TableStoreJobConf(JobConf jobConf) {
+ public PaimonJobConf(JobConf jobConf) {
this.jobConf = jobConf;
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveMetaHook.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonMetaHook.java
similarity index 97%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveMetaHook.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonMetaHook.java
index 3d6e0163b..e27292382 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveMetaHook.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonMetaHook.java
@@ -29,7 +29,7 @@ import org.apache.paimon.utils.Preconditions;
* {@link HiveMetaHook} for paimon. Currently this class is only used to set input and output
* formats.
*/
-public class TableStoreHiveMetaHook implements HiveMetaHook {
+public class PaimonMetaHook implements HiveMetaHook {
@Override
public void preCreateTable(Table table) throws MetaException {
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreSerDe.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonSerDe.java
similarity index 90%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreSerDe.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonSerDe.java
index c2818a7b2..2e4297352 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreSerDe.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonSerDe.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.hive.serde2.SerDeException;
import org.apache.hadoop.hive.serde2.SerDeStats;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
import org.apache.hadoop.io.Writable;
-import org.apache.paimon.hive.objectinspector.TableStoreRowDataObjectInspector;
+import org.apache.paimon.hive.objectinspector.PaimonRowDataObjectInspector;
import javax.annotation.Nullable;
@@ -35,16 +35,16 @@ import java.util.Properties;
*
* <p>Currently this class only supports deserialization.
*/
-public class TableStoreSerDe extends AbstractSerDe {
+public class PaimonSerDe extends AbstractSerDe {
- private TableStoreRowDataObjectInspector inspector;
+ private PaimonRowDataObjectInspector inspector;
@Override
public void initialize(@Nullable Configuration configuration, Properties properties)
throws SerDeException {
HiveSchema schema = HiveSchema.extract(configuration, properties);
inspector =
- new TableStoreRowDataObjectInspector(
+ new PaimonRowDataObjectInspector(
schema.fieldNames(), schema.fieldTypes(), schema.fieldComments());
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveStorageHandler.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonStorageHandler.java
similarity index 92%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveStorageHandler.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonStorageHandler.java
index 1f66aa92a..37cf0cf4e 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/TableStoreHiveStorageHandler.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/PaimonStorageHandler.java
@@ -39,8 +39,7 @@ import java.util.Map;
import java.util.Properties;
/** {@link HiveStorageHandler} for paimon. This is the entrance class of Hive API. */
-public class TableStoreHiveStorageHandler
- implements HiveStoragePredicateHandler, HiveStorageHandler {
+public class PaimonStorageHandler implements HiveStoragePredicateHandler, HiveStorageHandler {
private Configuration conf;
@@ -56,12 +55,12 @@ public class TableStoreHiveStorageHandler
@Override
public Class<? extends AbstractSerDe> getSerDeClass() {
- return TableStoreSerDe.class;
+ return PaimonSerDe.class;
}
@Override
public HiveMetaHook getMetaHook() {
- return new TableStoreHiveMetaHook();
+ return new PaimonMetaHook();
}
@Override
@@ -72,7 +71,7 @@ public class TableStoreHiveStorageHandler
@Override
public void configureInputJobProperties(TableDesc tableDesc, Map<String, String> map) {
Properties properties = tableDesc.getProperties();
- TableStoreJobConf.configureInputJobProperties(conf, properties, map);
+ PaimonJobConf.configureInputJobProperties(conf, properties, map);
}
public void configureInputJobCredentials(TableDesc tableDesc, Map<String, String> map) {}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java
index 09258b3fb..1712edfd4 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java
@@ -28,9 +28,9 @@ import org.apache.hadoop.mapred.RecordReader;
import org.apache.hadoop.mapred.Reporter;
import org.apache.paimon.CoreOptions;
import org.apache.paimon.catalog.CatalogContext;
+import org.apache.paimon.hive.PaimonJobConf;
import org.apache.paimon.hive.RowDataContainer;
import org.apache.paimon.hive.SearchArgumentToPredicateConverter;
-import org.apache.paimon.hive.TableStoreJobConf;
import org.apache.paimon.options.Options;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.schema.TableSchema;
@@ -74,7 +74,7 @@ public class TableStoreInputFormat implements InputFormat<Void, RowDataContainer
}
private FileStoreTable createFileStoreTable(JobConf jobConf) {
- TableStoreJobConf wrapper = new TableStoreJobConf(jobConf);
+ PaimonJobConf wrapper = new PaimonJobConf(jobConf);
Options options = new Options();
options.set(CoreOptions.PATH, wrapper.getLocation());
CatalogContext catalogContext = CatalogContext.create(options, jobConf);
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonCharObjectInspector.java
similarity index 93%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspector.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonCharObjectInspector.java
index 71e95fe90..ca297dd74 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonCharObjectInspector.java
@@ -26,12 +26,12 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.paimon.data.BinaryString;
/** {@link AbstractPrimitiveJavaObjectInspector} for CHAR type. */
-public class TableStoreCharObjectInspector extends AbstractPrimitiveJavaObjectInspector
+public class PaimonCharObjectInspector extends AbstractPrimitiveJavaObjectInspector
implements HiveCharObjectInspector {
private final int len;
- public TableStoreCharObjectInspector(int len) {
+ public PaimonCharObjectInspector(int len) {
super(TypeInfoFactory.getCharTypeInfo(len));
this.len = len;
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonDateObjectInspector.java
similarity index 93%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonDateObjectInspector.java
index 14e992a74..27b082e9a 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonDateObjectInspector.java
@@ -27,10 +27,10 @@ import org.apache.paimon.utils.DateTimeUtils;
import java.sql.Date;
/** {@link AbstractPrimitiveJavaObjectInspector} for DATE type. */
-public class TableStoreDateObjectInspector extends AbstractPrimitiveJavaObjectInspector
+public class PaimonDateObjectInspector extends AbstractPrimitiveJavaObjectInspector
implements DateObjectInspector {
- public TableStoreDateObjectInspector() {
+ public PaimonDateObjectInspector() {
super(TypeInfoFactory.dateTypeInfo);
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonDecimalObjectInspector.java
similarity index 93%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspector.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonDecimalObjectInspector.java
index 39df6181c..2d3c9fff9 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonDecimalObjectInspector.java
@@ -26,10 +26,10 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.paimon.data.Decimal;
/** {@link AbstractPrimitiveJavaObjectInspector} for DECIMAL type. */
-public class TableStoreDecimalObjectInspector extends AbstractPrimitiveJavaObjectInspector
+public class PaimonDecimalObjectInspector extends AbstractPrimitiveJavaObjectInspector
implements HiveDecimalObjectInspector {
- public TableStoreDecimalObjectInspector(int precision, int scale) {
+ public PaimonDecimalObjectInspector(int precision, int scale) {
super(TypeInfoFactory.getDecimalTypeInfo(precision, scale));
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonListObjectInspector.java
similarity index 91%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspector.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonListObjectInspector.java
index 76c8319e6..39c40c7a7 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonListObjectInspector.java
@@ -33,13 +33,13 @@ import java.util.List;
* <p>Behaviors of this class when input is null are compatible with {@link
* org.apache.hadoop.hive.serde2.objectinspector.StandardListObjectInspector}.
*/
-public class TableStoreListObjectInspector implements ListObjectInspector {
+public class PaimonListObjectInspector implements ListObjectInspector {
private final ObjectInspector elementObjectInspector;
private final InternalArray.ElementGetter elementGetter;
- public TableStoreListObjectInspector(DataType elementType) {
- this.elementObjectInspector = TableStoreObjectInspectorFactory.create(elementType);
+ public PaimonListObjectInspector(DataType elementType) {
+ this.elementObjectInspector = PaimonObjectInspectorFactory.create(elementType);
this.elementGetter = InternalArray.createElementGetter(elementType);
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonMapObjectInspector.java
similarity index 92%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspector.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonMapObjectInspector.java
index 1b1fda385..f7d6c1ea1 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonMapObjectInspector.java
@@ -35,16 +35,16 @@ import java.util.Objects;
* <p>Behaviors of this class when input is null are compatible with {@link
* org.apache.hadoop.hive.serde2.objectinspector.StandardMapObjectInspector}.
*/
-public class TableStoreMapObjectInspector implements MapObjectInspector {
+public class PaimonMapObjectInspector implements MapObjectInspector {
private final ObjectInspector keyObjectInspector;
private final ObjectInspector valueObjectInspector;
private final InternalArray.ElementGetter keyGetter;
private final InternalArray.ElementGetter valueGetter;
- public TableStoreMapObjectInspector(DataType keyType, DataType valueType) {
- this.keyObjectInspector = TableStoreObjectInspectorFactory.create(keyType);
- this.valueObjectInspector = TableStoreObjectInspectorFactory.create(valueType);
+ public PaimonMapObjectInspector(DataType keyType, DataType valueType) {
+ this.keyObjectInspector = PaimonObjectInspectorFactory.create(keyType);
+ this.valueObjectInspector = PaimonObjectInspectorFactory.create(valueType);
this.keyGetter = InternalArray.createElementGetter(keyType);
this.valueGetter = InternalArray.createElementGetter(valueType);
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreObjectInspectorFactory.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonObjectInspectorFactory.java
similarity index 80%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreObjectInspectorFactory.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonObjectInspectorFactory.java
index 975f2976d..3d5646127 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreObjectInspectorFactory.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonObjectInspectorFactory.java
@@ -30,7 +30,7 @@ import org.apache.paimon.types.MapType;
import org.apache.paimon.types.VarCharType;
/** Factory to create {@link ObjectInspector}s according to the given {@link DataType}. */
-public class TableStoreObjectInspectorFactory {
+public class PaimonObjectInspectorFactory {
public static ObjectInspector create(DataType logicalType) {
switch (logicalType.getTypeRoot()) {
@@ -47,29 +47,28 @@ public class TableStoreObjectInspectorFactory {
(PrimitiveTypeInfo) HiveTypeUtils.logicalTypeToTypeInfo(logicalType));
case DECIMAL:
DecimalType decimalType = (DecimalType) logicalType;
- return new TableStoreDecimalObjectInspector(
+ return new PaimonDecimalObjectInspector(
decimalType.getPrecision(), decimalType.getScale());
case CHAR:
CharType charType = (CharType) logicalType;
- return new TableStoreCharObjectInspector(charType.getLength());
+ return new PaimonCharObjectInspector(charType.getLength());
case VARCHAR:
VarCharType varCharType = (VarCharType) logicalType;
if (varCharType.getLength() == VarCharType.MAX_LENGTH) {
- return new TableStoreStringObjectInspector();
+ return new PaimonStringObjectInspector();
} else {
- return new TableStoreVarcharObjectInspector(varCharType.getLength());
+ return new PaimonVarcharObjectInspector(varCharType.getLength());
}
case DATE:
- return new TableStoreDateObjectInspector();
+ return new PaimonDateObjectInspector();
case TIMESTAMP_WITHOUT_TIME_ZONE:
- return new TableStoreTimestampObjectInspector();
+ return new PaimonTimestampObjectInspector();
case ARRAY:
ArrayType arrayType = (ArrayType) logicalType;
- return new TableStoreListObjectInspector(arrayType.getElementType());
+ return new PaimonListObjectInspector(arrayType.getElementType());
case MAP:
MapType mapType = (MapType) logicalType;
- return new TableStoreMapObjectInspector(
- mapType.getKeyType(), mapType.getValueType());
+ return new PaimonMapObjectInspector(mapType.getKeyType(), mapType.getValueType());
default:
throw new UnsupportedOperationException(
"Unsupported logical type " + logicalType.asSQLString());
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspector.java
similarity index 95%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspector.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspector.java
index 6f185f2ce..e9dc491ad 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspector.java
@@ -33,13 +33,13 @@ import java.util.Map;
import java.util.stream.Collectors;
/** {@link StructObjectInspector} for {@link InternalRow}. */
-public class TableStoreRowDataObjectInspector extends StructObjectInspector {
+public class PaimonRowDataObjectInspector extends StructObjectInspector {
private final List<TableStoreStructField> structFields;
private final Map<String, TableStoreStructField> structFieldMap;
private final String typeName;
- public TableStoreRowDataObjectInspector(
+ public PaimonRowDataObjectInspector(
List<String> fieldNames, List<DataType> fieldTypes, List<String> fieldComments) {
this.structFields = new ArrayList<>();
this.structFieldMap = new HashMap<>();
@@ -51,7 +51,7 @@ public class TableStoreRowDataObjectInspector extends StructObjectInspector {
TableStoreStructField structField =
new TableStoreStructField(
name,
- TableStoreObjectInspectorFactory.create(logicalType),
+ PaimonObjectInspectorFactory.create(logicalType),
i,
RowDataUtils.createNullCheckingFieldGetter(logicalType, i),
fieldComments.get(i));
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonStringObjectInspector.java
similarity index 93%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspector.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonStringObjectInspector.java
index b3dad601c..e2a92e38c 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonStringObjectInspector.java
@@ -25,10 +25,10 @@ import org.apache.hadoop.io.Text;
import org.apache.paimon.data.BinaryString;
/** {@link AbstractPrimitiveJavaObjectInspector} for STRING type. */
-public class TableStoreStringObjectInspector extends AbstractPrimitiveJavaObjectInspector
+public class PaimonStringObjectInspector extends AbstractPrimitiveJavaObjectInspector
implements StringObjectInspector {
- public TableStoreStringObjectInspector() {
+ public PaimonStringObjectInspector() {
super(TypeInfoFactory.stringTypeInfo);
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonTimestampObjectInspector.java
similarity index 93%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonTimestampObjectInspector.java
index 548f242e7..143e4fb00 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonTimestampObjectInspector.java
@@ -25,10 +25,10 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.paimon.data.Timestamp;
/** {@link AbstractPrimitiveJavaObjectInspector} for TIMESTAMP type. */
-public class TableStoreTimestampObjectInspector extends AbstractPrimitiveJavaObjectInspector
+public class PaimonTimestampObjectInspector extends AbstractPrimitiveJavaObjectInspector
implements TimestampObjectInspector {
- public TableStoreTimestampObjectInspector() {
+ public PaimonTimestampObjectInspector() {
super(TypeInfoFactory.timestampTypeInfo);
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspector.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonVarcharObjectInspector.java
similarity index 93%
rename from paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspector.java
rename to paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonVarcharObjectInspector.java
index 8ccafbc8c..b49ae1a68 100644
--- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspector.java
+++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/objectinspector/PaimonVarcharObjectInspector.java
@@ -26,12 +26,12 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.paimon.data.BinaryString;
/** {@link AbstractPrimitiveJavaObjectInspector} for VARCHAR type. */
-public class TableStoreVarcharObjectInspector extends AbstractPrimitiveJavaObjectInspector
+public class PaimonVarcharObjectInspector extends AbstractPrimitiveJavaObjectInspector
implements HiveVarcharObjectInspector {
private final int len;
- public TableStoreVarcharObjectInspector(int len) {
+ public PaimonVarcharObjectInspector(int len) {
super(TypeInfoFactory.getVarcharTypeInfo(len));
this.len = len;
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreSerDeTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/PaimonSerDeTest.java
similarity index 85%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreSerDeTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/PaimonSerDeTest.java
index 8e014d0b6..a9c719ede 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreSerDeTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/PaimonSerDeTest.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.StructField;
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.TableStoreRowDataObjectInspector;
+import org.apache.paimon.hive.objectinspector.PaimonRowDataObjectInspector;
import org.apache.paimon.schema.Schema;
import org.apache.paimon.schema.SchemaManager;
import org.junit.jupiter.api.Test;
@@ -40,17 +40,17 @@ import static org.apache.paimon.hive.RandomGenericRowDataGenerator.ROW_TYPE;
import static org.apache.paimon.hive.RandomGenericRowDataGenerator.generate;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link TableStoreSerDe}. */
-public class TableStoreSerDeTest {
+/** Tests for {@link PaimonSerDe}. */
+public class PaimonSerDeTest {
@TempDir java.nio.file.Path tempDir;
@Test
public void testInitialize() throws Exception {
- TableStoreSerDe serDe = createInitializedSerDe();
+ PaimonSerDe serDe = createInitializedSerDe();
ObjectInspector o = serDe.getObjectInspector();
- assertThat(o).isInstanceOf(TableStoreRowDataObjectInspector.class);
- TableStoreRowDataObjectInspector oi = (TableStoreRowDataObjectInspector) o;
+ assertThat(o).isInstanceOf(PaimonRowDataObjectInspector.class);
+ PaimonRowDataObjectInspector oi = (PaimonRowDataObjectInspector) o;
GenericRow rowData = generate();
List<? extends StructField> structFields = oi.getAllStructFieldRefs();
for (int i = 0; i < structFields.size(); i++) {
@@ -63,14 +63,14 @@ public class TableStoreSerDeTest {
@Test
public void testDeserialize() throws Exception {
- TableStoreSerDe serDe = createInitializedSerDe();
+ PaimonSerDe serDe = createInitializedSerDe();
GenericRow rowData = generate();
RowDataContainer container = new RowDataContainer();
container.set(rowData);
assertThat(serDe.deserialize(container)).isEqualTo(rowData);
}
- private TableStoreSerDe createInitializedSerDe() throws Exception {
+ private PaimonSerDe createInitializedSerDe() throws Exception {
new SchemaManager(LocalFileIO.create(), new Path(tempDir.toString()))
.createTable(
new Schema(
@@ -83,7 +83,7 @@ public class TableStoreSerDeTest {
Properties properties = new Properties();
properties.setProperty("location", tempDir.toString());
- TableStoreSerDe serDe = new TableStoreSerDe();
+ PaimonSerDe serDe = new PaimonSerDe();
serDe.initialize(null, properties);
return serDe;
}
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreHiveStorageHandlerITCase.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/PaimonStorageHandlerITCase.java
similarity index 98%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreHiveStorageHandlerITCase.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/PaimonStorageHandlerITCase.java
index 7384c9c90..0278d0736 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreHiveStorageHandlerITCase.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/PaimonStorageHandlerITCase.java
@@ -33,7 +33,7 @@ import org.apache.paimon.data.BinaryString;
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.Timestamp;
-import org.apache.paimon.hive.objectinspector.TableStoreObjectInspectorFactory;
+import org.apache.paimon.hive.objectinspector.PaimonObjectInspectorFactory;
import org.apache.paimon.options.Options;
import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.table.sink.StreamTableCommit;
@@ -62,11 +62,11 @@ import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
/**
- * IT cases for {@link TableStoreHiveStorageHandler} and {@link
+ * IT cases for {@link PaimonStorageHandler} and {@link
* org.apache.paimon.hive.mapred.TableStoreInputFormat}.
*/
@RunWith(FlinkEmbeddedHiveRunner.class)
-public class TableStoreHiveStorageHandlerITCase {
+public class PaimonStorageHandlerITCase {
@ClassRule public static TemporaryFolder folder = new TemporaryFolder();
@@ -645,7 +645,7 @@ public class TableStoreHiveStorageHandlerITCase {
"\n",
Arrays.asList(
"CREATE EXTERNAL TABLE " + tableName + " ",
- "STORED BY '" + TableStoreHiveStorageHandler.class.getName() + "'",
+ "STORED BY '" + PaimonStorageHandler.class.getName() + "'",
"LOCATION '" + path + "'")));
return tableName;
}
@@ -689,7 +689,7 @@ public class TableStoreHiveStorageHandlerITCase {
"\n",
Arrays.asList(
"CREATE EXTERNAL TABLE test_table",
- "STORED BY '" + TableStoreHiveStorageHandler.class.getName() + "'",
+ "STORED BY '" + PaimonStorageHandler.class.getName() + "'",
"LOCATION '" + root + "'")));
List<Object[]> actual =
hiveShell.executeStatement("SELECT * FROM test_table WHERE f_int > 0");
@@ -712,7 +712,7 @@ public class TableStoreHiveStorageHandlerITCase {
continue;
}
ObjectInspector oi =
- TableStoreObjectInspectorFactory.create(
+ PaimonObjectInspectorFactory.create(
RandomGenericRowDataGenerator.LOGICAL_TYPES.get(i));
switch (oi.getCategory()) {
case PRIMITIVE:
@@ -802,7 +802,7 @@ public class TableStoreHiveStorageHandlerITCase {
"\n",
Arrays.asList(
"CREATE EXTERNAL TABLE test_table",
- "STORED BY '" + TableStoreHiveStorageHandler.class.getName() + "'",
+ "STORED BY '" + PaimonStorageHandler.class.getName() + "'",
"LOCATION '" + path + "'")));
Assert.assertEquals(
Arrays.asList("1", "5"),
@@ -894,7 +894,7 @@ public class TableStoreHiveStorageHandlerITCase {
"\n",
Arrays.asList(
"CREATE EXTERNAL TABLE test_table",
- "STORED BY '" + TableStoreHiveStorageHandler.class.getName() + "'",
+ "STORED BY '" + PaimonStorageHandler.class.getName() + "'",
"LOCATION '" + path + "'")));
Assert.assertEquals(
Collections.singletonList("1971-01-11\t2022-05-17 17:29:20.1"),
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonCharObjectInspectorTest.java
similarity index 88%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspectorTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonCharObjectInspectorTest.java
index 5b97e28f6..1713171bd 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreCharObjectInspectorTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonCharObjectInspectorTest.java
@@ -27,12 +27,12 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link TableStoreCharObjectInspector}. */
-public class TableStoreCharObjectInspectorTest {
+/** Tests for {@link PaimonCharObjectInspector}. */
+public class PaimonCharObjectInspectorTest {
@Test
public void testCategoryAndClass() {
- TableStoreCharObjectInspector oi = new TableStoreCharObjectInspector(10);
+ PaimonCharObjectInspector oi = new PaimonCharObjectInspector(10);
assertThat(oi.getCategory()).isEqualTo(ObjectInspector.Category.PRIMITIVE);
assertThat(oi.getPrimitiveCategory())
@@ -44,7 +44,7 @@ public class TableStoreCharObjectInspectorTest {
@Test
public void testGetPrimitiveJavaObject() {
- TableStoreCharObjectInspector oi = new TableStoreCharObjectInspector(10);
+ PaimonCharObjectInspector oi = new PaimonCharObjectInspector(10);
BinaryString input1 = BinaryString.fromString("testString");
HiveChar expected1 = new HiveChar("testString", 10);
@@ -57,7 +57,7 @@ public class TableStoreCharObjectInspectorTest {
@Test
public void testGetPrimitiveWritableObject() {
- TableStoreCharObjectInspector oi = new TableStoreCharObjectInspector(10);
+ PaimonCharObjectInspector oi = new PaimonCharObjectInspector(10);
BinaryString input1 = BinaryString.fromString("testString");
HiveCharWritable expected1 = new HiveCharWritable(new HiveChar("testString", 10));
@@ -70,7 +70,7 @@ public class TableStoreCharObjectInspectorTest {
@Test
public void testCopyObject() {
- TableStoreCharObjectInspector oi = new TableStoreCharObjectInspector(10);
+ PaimonCharObjectInspector oi = new PaimonCharObjectInspector(10);
BinaryString input1 = BinaryString.fromString("testString");
Object copy1 = oi.copyObject(input1);
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonDateObjectInspectorTest.java
similarity index 86%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspectorTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonDateObjectInspectorTest.java
index 1076a4410..f0740053c 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDateObjectInspectorTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonDateObjectInspectorTest.java
@@ -29,13 +29,13 @@ import java.time.LocalDate;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link TableStoreDateObjectInspector}. */
-public class TableStoreDateObjectInspectorTest {
+/** Tests for {@link PaimonDateObjectInspector}. */
+public class PaimonDateObjectInspectorTest {
@DisabledIfSystemProperty(named = "hive.main.version", matches = "3")
@Test
public void testCategoryAndClass() {
- TableStoreDateObjectInspector oi = new TableStoreDateObjectInspector();
+ PaimonDateObjectInspector oi = new PaimonDateObjectInspector();
assertThat(oi.getCategory()).isEqualTo(ObjectInspector.Category.PRIMITIVE);
assertThat(oi.getPrimitiveCategory())
@@ -47,7 +47,7 @@ public class TableStoreDateObjectInspectorTest {
@Test
public void testGetPrimitiveJavaObject() {
- TableStoreDateObjectInspector oi = new TableStoreDateObjectInspector();
+ PaimonDateObjectInspector oi = new PaimonDateObjectInspector();
int input = 375;
assertThat(oi.getPrimitiveJavaObject(input).toString()).isEqualTo("1971-01-11");
@@ -56,7 +56,7 @@ public class TableStoreDateObjectInspectorTest {
@Test
public void testGetPrimitiveWritableObject() {
- TableStoreDateObjectInspector oi = new TableStoreDateObjectInspector();
+ PaimonDateObjectInspector oi = new PaimonDateObjectInspector();
int input = 375;
assertThat(oi.getPrimitiveWritableObject(input).get().toString()).isEqualTo("1971-01-11");
@@ -66,7 +66,7 @@ public class TableStoreDateObjectInspectorTest {
@DisabledIfSystemProperty(named = "hive.main.version", matches = "3")
@Test
public void testCopyObject() {
- TableStoreDateObjectInspector oi = new TableStoreDateObjectInspector();
+ PaimonDateObjectInspector oi = new PaimonDateObjectInspector();
Date input = Date.valueOf(LocalDate.ofEpochDay(375));
Object copy = oi.copyObject(input);
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonDecimalObjectInspectorTest.java
similarity index 86%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonDecimalObjectInspectorTest.java
index 529ea7bd9..9dcb394c1 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonDecimalObjectInspectorTest.java
@@ -29,12 +29,12 @@ import java.math.BigDecimal;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link TableStoreDecimalObjectInspector}. */
-public class TableStoreDecimalObjectInspectorTest {
+/** Tests for {@link PaimonDecimalObjectInspector}. */
+public class PaimonDecimalObjectInspectorTest {
@Test
public void testCategoryAndClass() {
- TableStoreDecimalObjectInspector oi = new TableStoreDecimalObjectInspector(5, 3);
+ PaimonDecimalObjectInspector oi = new PaimonDecimalObjectInspector(5, 3);
assertThat(oi.getCategory()).isEqualTo(ObjectInspector.Category.PRIMITIVE);
assertThat(oi.getPrimitiveCategory())
@@ -46,7 +46,7 @@ public class TableStoreDecimalObjectInspectorTest {
@Test
public void testGetPrimitiveJavaObject() {
- TableStoreDecimalObjectInspector oi = new TableStoreDecimalObjectInspector(5, 3);
+ PaimonDecimalObjectInspector oi = new PaimonDecimalObjectInspector(5, 3);
Decimal input = Decimal.fromBigDecimal(new BigDecimal("12.345"), 5, 3);
HiveDecimal expected = HiveDecimal.create("12.345");
@@ -56,7 +56,7 @@ public class TableStoreDecimalObjectInspectorTest {
@Test
public void testGetPrimitiveWritableObject() {
- TableStoreDecimalObjectInspector oi = new TableStoreDecimalObjectInspector(5, 3);
+ PaimonDecimalObjectInspector oi = new PaimonDecimalObjectInspector(5, 3);
Decimal input = Decimal.fromBigDecimal(new BigDecimal("12.345"), 5, 3);
HiveDecimalWritable expected = new HiveDecimalWritable(HiveDecimal.create("12.345"));
@@ -66,7 +66,7 @@ public class TableStoreDecimalObjectInspectorTest {
@Test
public void testCopyObject() {
- TableStoreDecimalObjectInspector oi = new TableStoreDecimalObjectInspector(5, 3);
+ PaimonDecimalObjectInspector oi = new PaimonDecimalObjectInspector(5, 3);
Decimal input1 = Decimal.fromBigDecimal(new BigDecimal("12.345"), 5, 3);
Object copy1 = oi.copyObject(input1);
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonListObjectInspectorTest.java
similarity index 88%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspectorTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonListObjectInspectorTest.java
index 5008bccc9..9644efe03 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreListObjectInspectorTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonListObjectInspectorTest.java
@@ -28,12 +28,12 @@ import java.util.Arrays;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link TableStoreListObjectInspector}. */
-public class TableStoreListObjectInspectorTest {
+/** Tests for {@link PaimonListObjectInspector}. */
+public class PaimonListObjectInspectorTest {
@Test
public void testCategoryAndTypeName() {
- TableStoreListObjectInspector oi = new TableStoreListObjectInspector(DataTypes.STRING());
+ PaimonListObjectInspector oi = new PaimonListObjectInspector(DataTypes.STRING());
assertThat(oi.getCategory()).isEqualTo(ObjectInspector.Category.LIST);
assertThat(oi.getTypeName()).isEqualTo("array<string>");
@@ -41,7 +41,7 @@ public class TableStoreListObjectInspectorTest {
@Test
public void testGetListAndElement() {
- TableStoreListObjectInspector oi = new TableStoreListObjectInspector(DataTypes.STRING());
+ PaimonListObjectInspector oi = new PaimonListObjectInspector(DataTypes.STRING());
BinaryString[] stringDataArray =
new BinaryString[] {
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonMapObjectInspectorTest.java
similarity index 87%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspectorTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonMapObjectInspectorTest.java
index 3e2adf8cf..6a5da8dc8 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreMapObjectInspectorTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonMapObjectInspectorTest.java
@@ -29,13 +29,13 @@ import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link TableStoreMapObjectInspector}. */
-public class TableStoreMapObjectInspectorTest {
+/** Tests for {@link PaimonMapObjectInspector}. */
+public class PaimonMapObjectInspectorTest {
@Test
public void testCategoryAndTypeName() {
- TableStoreMapObjectInspector oi =
- new TableStoreMapObjectInspector(DataTypes.STRING(), DataTypes.BIGINT());
+ PaimonMapObjectInspector oi =
+ new PaimonMapObjectInspector(DataTypes.STRING(), DataTypes.BIGINT());
assertThat(oi.getCategory()).isEqualTo(ObjectInspector.Category.MAP);
assertThat(oi.getTypeName()).isEqualTo("map<string,bigint>");
@@ -43,8 +43,8 @@ public class TableStoreMapObjectInspectorTest {
@Test
public void testGetMapAndValue() {
- TableStoreMapObjectInspector oi =
- new TableStoreMapObjectInspector(DataTypes.STRING(), DataTypes.BIGINT());
+ PaimonMapObjectInspector oi =
+ new PaimonMapObjectInspector(DataTypes.STRING(), DataTypes.BIGINT());
BinaryString[] keyArray =
new BinaryString[] {
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspectorTest.java
similarity index 90%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspectorTest.java
index 6b46a5b79..fafe17fe5 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonRowDataObjectInspectorTest.java
@@ -33,13 +33,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 TableStoreRowDataObjectInspector}. */
-public class TableStoreRowDataObjectInspectorTest {
+/** Tests for {@link PaimonRowDataObjectInspector}. */
+public class PaimonRowDataObjectInspectorTest {
@Test
public void testGetStructFieldRef() {
- TableStoreRowDataObjectInspector oi =
- new TableStoreRowDataObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
+ PaimonRowDataObjectInspector oi =
+ new PaimonRowDataObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
List<? extends StructField> structFields = oi.getAllStructFieldRefs();
List<ObjectInspector.Category> expectedOiCategories =
Arrays.asList(
@@ -75,8 +75,8 @@ public class TableStoreRowDataObjectInspectorTest {
@Test
public void testGetTypeName() {
- TableStoreRowDataObjectInspector oi =
- new TableStoreRowDataObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
+ PaimonRowDataObjectInspector oi =
+ new PaimonRowDataObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
String expected =
"struct<"
+ String.join(
@@ -105,8 +105,8 @@ public class TableStoreRowDataObjectInspectorTest {
@Test
public void testGetStructFieldData() {
- TableStoreRowDataObjectInspector oi =
- new TableStoreRowDataObjectInspector(FIELD_NAMES, LOGICAL_TYPES, FIELD_COMMENTS);
+ PaimonRowDataObjectInspector oi =
+ new PaimonRowDataObjectInspector(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-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonStringObjectInspectorTest.java
similarity index 85%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspectorTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonStringObjectInspectorTest.java
index 771527c72..80b923f7b 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreStringObjectInspectorTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonStringObjectInspectorTest.java
@@ -26,12 +26,12 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link TableStoreStringObjectInspector}. */
-public class TableStoreStringObjectInspectorTest {
+/** Tests for {@link PaimonStringObjectInspector}. */
+public class PaimonStringObjectInspectorTest {
@Test
public void testCategoryAndClass() {
- TableStoreStringObjectInspector oi = new TableStoreStringObjectInspector();
+ PaimonStringObjectInspector oi = new PaimonStringObjectInspector();
assertThat(oi.getCategory()).isEqualTo(ObjectInspector.Category.PRIMITIVE);
assertThat(oi.getPrimitiveCategory())
@@ -43,7 +43,7 @@ public class TableStoreStringObjectInspectorTest {
@Test
public void testGetPrimitiveJavaObject() {
- TableStoreStringObjectInspector oi = new TableStoreStringObjectInspector();
+ PaimonStringObjectInspector oi = new PaimonStringObjectInspector();
BinaryString input = BinaryString.fromString("testString");
String expected = "testString";
@@ -53,7 +53,7 @@ public class TableStoreStringObjectInspectorTest {
@Test
public void testGetPrimitiveWritableObject() {
- TableStoreStringObjectInspector oi = new TableStoreStringObjectInspector();
+ PaimonStringObjectInspector oi = new PaimonStringObjectInspector();
BinaryString input = BinaryString.fromString("testString");
Text expected = new Text("testString");
@@ -63,7 +63,7 @@ public class TableStoreStringObjectInspectorTest {
@Test
public void testCopyObject() {
- TableStoreStringObjectInspector oi = new TableStoreStringObjectInspector();
+ PaimonStringObjectInspector oi = new PaimonStringObjectInspector();
BinaryString input = BinaryString.fromString("testString");
Object copy = oi.copyObject(input);
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonTimestampObjectInspectorTest.java
similarity index 86%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonTimestampObjectInspectorTest.java
index 2899c9d54..19967c258 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonTimestampObjectInspectorTest.java
@@ -29,13 +29,13 @@ import java.time.LocalDateTime;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link TableStoreTimestampObjectInspector}. */
-public class TableStoreTimestampObjectInspectorTest {
+/** Tests for {@link PaimonTimestampObjectInspector}. */
+public class PaimonTimestampObjectInspectorTest {
@DisabledIfSystemProperty(named = "hive.main.version", matches = "3")
@Test
public void testCategoryAndClass() {
- TableStoreTimestampObjectInspector oi = new TableStoreTimestampObjectInspector();
+ PaimonTimestampObjectInspector oi = new PaimonTimestampObjectInspector();
assertThat(oi.getCategory()).isEqualTo(ObjectInspector.Category.PRIMITIVE);
assertThat(oi.getPrimitiveCategory())
@@ -47,7 +47,7 @@ public class TableStoreTimestampObjectInspectorTest {
@Test
public void testGetPrimitiveJavaObject() {
- TableStoreTimestampObjectInspector oi = new TableStoreTimestampObjectInspector();
+ PaimonTimestampObjectInspector oi = new PaimonTimestampObjectInspector();
LocalDateTime local = LocalDateTime.of(2022, 4, 27, 15, 0, 0, 100_000_000);
Timestamp input = Timestamp.fromLocalDateTime(local);
@@ -57,7 +57,7 @@ public class TableStoreTimestampObjectInspectorTest {
@Test
public void testGetPrimitiveWritableObject() {
- TableStoreTimestampObjectInspector oi = new TableStoreTimestampObjectInspector();
+ PaimonTimestampObjectInspector oi = new PaimonTimestampObjectInspector();
LocalDateTime local = LocalDateTime.of(2022, 4, 27, 15, 0, 0, 100_000_000);
Timestamp input = Timestamp.fromLocalDateTime(local);
@@ -69,7 +69,7 @@ public class TableStoreTimestampObjectInspectorTest {
@DisabledIfSystemProperty(named = "hive.main.version", matches = "3")
@Test
public void testCopyObject() {
- TableStoreTimestampObjectInspector oi = new TableStoreTimestampObjectInspector();
+ PaimonTimestampObjectInspector oi = new PaimonTimestampObjectInspector();
// TimestampData is immutable
Timestamp input1 = Timestamp.fromEpochMillis(10007);
diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonVarcharObjectInspectorTest.java
similarity index 87%
rename from paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java
rename to paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonVarcharObjectInspectorTest.java
index 6641cbcb2..3eb28d0e6 100644
--- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java
+++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/objectinspector/PaimonVarcharObjectInspectorTest.java
@@ -27,12 +27,12 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
-/** Tests for {@link TableStoreVarcharObjectInspector}. */
-public class TableStoreVarcharObjectInspectorTest {
+/** Tests for {@link PaimonVarcharObjectInspector}. */
+public class PaimonVarcharObjectInspectorTest {
@Test
public void testCategoryAndClass() {
- TableStoreVarcharObjectInspector oi = new TableStoreVarcharObjectInspector(10);
+ PaimonVarcharObjectInspector oi = new PaimonVarcharObjectInspector(10);
assertThat(oi.getCategory()).isEqualTo(ObjectInspector.Category.PRIMITIVE);
assertThat(oi.getPrimitiveCategory())
@@ -44,7 +44,7 @@ public class TableStoreVarcharObjectInspectorTest {
@Test
public void testGetPrimitiveJavaObject() {
- TableStoreVarcharObjectInspector oi = new TableStoreVarcharObjectInspector(10);
+ PaimonVarcharObjectInspector oi = new PaimonVarcharObjectInspector(10);
BinaryString input1 = BinaryString.fromString("testString");
HiveVarchar expected1 = new HiveVarchar("testString", 10);
@@ -57,7 +57,7 @@ public class TableStoreVarcharObjectInspectorTest {
@Test
public void testGetPrimitiveWritableObject() {
- TableStoreVarcharObjectInspector oi = new TableStoreVarcharObjectInspector(10);
+ PaimonVarcharObjectInspector oi = new PaimonVarcharObjectInspector(10);
BinaryString input1 = BinaryString.fromString("testString");
HiveVarcharWritable expected1 = new HiveVarcharWritable(new HiveVarchar("testString", 10));
@@ -70,7 +70,7 @@ public class TableStoreVarcharObjectInspectorTest {
@Test
public void testCopyObject() {
- TableStoreVarcharObjectInspector oi = new TableStoreVarcharObjectInspector(10);
+ PaimonVarcharObjectInspector oi = new PaimonVarcharObjectInspector(10);
BinaryString input1 = BinaryString.fromString("testString");
Object copy1 = oi.copyObject(input1);