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/flink-table-store.git
The following commit(s) were added to refs/heads/master by this push:
new dd2d600f [FLINK-31269] Split hive connector to each module of each
version
dd2d600f is described below
commit dd2d600f6743ca074a023fdbb1a7a2cbcfbf8ff0
Author: Shammon FY <[email protected]>
AuthorDate: Tue Mar 14 10:37:07 2023 +0800
[FLINK-31269] Split hive connector to each module of each version
This closes #569.
---
.github/workflows/build-different-versions.yml | 27 -----
docs/content/docs/engines/flink.md | 2 +-
docs/content/docs/engines/hive.md | 28 +++---
docs/content/docs/how-to/creating-catalogs.md | 18 +---
flink-table-store-e2e-tests/pom.xml | 4 +-
.../flink-table-store-hive-catalog/pom.xml | 51 +---------
.../pom.xml | 72 ++++++++++++++
.../flink-table-store-hive-connector-2.1/pom.xml | 72 ++++++++++++++
.../flink-table-store-hive-connector-2.2/pom.xml | 72 ++++++++++++++
.../flink-table-store-hive-connector-2.3/pom.xml | 72 ++++++++++++++
.../flink-table-store-hive-connector-3.1/pom.xml | 110 +++++++++++++++++++++
.../TableStoreDateObjectInspector.java | 0
.../TableStoreTimestampObjectInspector.java | 5 +-
.../pom.xml | 4 +-
.../apache/flink/table/store/RowDataContainer.java | 0
.../store/SearchArgumentToPredicateConverter.java | 0
.../flink/table/store/TableStoreJobConf.java | 0
.../apache/flink/table/store/hive/HiveSchema.java | 0
.../table/store/hive/TableStoreHiveMetaHook.java | 0
.../store/hive/TableStoreHiveStorageHandler.java | 0
.../flink/table/store/hive/TableStoreSerDe.java | 0
.../TableStoreCharObjectInspector.java | 0
.../TableStoreDateObjectInspector.java | 0
.../TableStoreDecimalObjectInspector.java | 0
.../TableStoreListObjectInspector.java | 0
.../TableStoreMapObjectInspector.java | 0
.../TableStoreObjectInspectorFactory.java | 0
.../TableStoreRowDataObjectInspector.java | 0
.../TableStoreStringObjectInspector.java | 0
.../TableStoreTimestampObjectInspector.java | 0
.../TableStoreVarcharObjectInspector.java | 0
.../table/store/mapred/TableStoreInputFormat.java | 0
.../table/store/mapred/TableStoreInputSplit.java | 0
.../table/store/mapred/TableStoreOutputFormat.java | 0
.../table/store/mapred/TableStoreRecordReader.java | 0
.../flink/table/store/FileStoreTestUtils.java | 0
.../SearchArgumentToPredicateConverterTest.java | 0
.../table/store/hive/HiveTableSchemaTest.java | 0
.../store/hive/RandomGenericRowDataGenerator.java | 0
.../hive/TableStoreHiveStorageHandlerITCase.java | 0
.../table/store/hive/TableStoreSerDeTest.java | 0
.../TableStoreCharObjectInspectorTest.java | 0
.../TableStoreDateObjectInspectorTest.java | 0
.../TableStoreDecimalObjectInspectorTest.java | 0
.../TableStoreListObjectInspectorTest.java | 0
.../TableStoreMapObjectInspectorTest.java | 0
.../TableStoreRowDataObjectInspectorTest.java | 0
.../TableStoreStringObjectInspectorTest.java | 0
.../TableStoreTimestampObjectInspectorTest.java | 0
.../TableStoreVarcharObjectInspectorTest.java | 0
.../store/mapred/TableStoreInputSplitTest.java | 0
.../store/mapred/TableStoreRecordReaderTest.java | 0
.../src/test/resources/log4j2-test.properties | 0
flink-table-store-hive/pom.xml | 48 ++-------
54 files changed, 429 insertions(+), 156 deletions(-)
diff --git a/.github/workflows/build-different-versions.yml
b/.github/workflows/build-different-versions.yml
deleted file mode 100644
index 3d52c065..00000000
--- a/.github/workflows/build-different-versions.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Build Different Versions
-
-on: [push, pull_request]
-
-jobs:
- build:
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout code
- uses: actions/checkout@v2
- - name: Set up JDK 1.8
- uses: actions/setup-java@v1
- with:
- java-version: 1.8
- - name: Build
- run: |
- ./mvnw clean install -Dmaven.test.skip=true
- - name: Build Hive 3.1
- run: |
- ./mvnw clean install -Dmaven.test.skip=true -Phive-3.1 -f
flink-table-store-hive
- - name: Build Hive 2.2
- run: |
- ./mvnw clean install -Dmaven.test.skip=true -Phive-2.2 -f
flink-table-store-hive
- - name: Build Hive 2.1
- run: |
- ./mvnw clean install -Dmaven.test.skip=true -Phive-2.1 -f
flink-table-store-hive
diff --git a/docs/content/docs/engines/flink.md
b/docs/content/docs/engines/flink.md
index 79d64ff0..4e839a56 100644
--- a/docs/content/docs/engines/flink.md
+++ b/docs/content/docs/engines/flink.md
@@ -57,7 +57,7 @@ To build from source code, either [download the source of a
release](https://fli
Build bundled jar with the following command.
- `mvn clean install -DskipTests`
-For Flink 1.16, you can find the bundled jar in
`./flink-table-store-flink/flink-table-store-flink-1.16/target/flink-table-store-flink-1.16-{{<
version >}}.jar`.
+You can find the bundled jar in
`./flink-table-store-flink/flink-table-store-flink-<flink-version>/target/flink-table-store-flink-<flink-version>-{{<
version >}}.jar`.
## Quick Start
diff --git a/docs/content/docs/engines/hive.md
b/docs/content/docs/engines/hive.md
index ac49fe51..740f485f 100644
--- a/docs/content/docs/engines/hive.md
+++ b/docs/content/docs/engines/hive.md
@@ -30,7 +30,7 @@ This documentation is a guide for using Table Store in Hive.
## Version
-Table Store currently supports Hive 2.1, 2.2, 2.3 and 3.1.
+Table Store currently supports Hive 2.1, 2.1-cdh-6.3, 2.2, 2.3 and 3.1.
## Execution Engine
@@ -42,12 +42,13 @@ Table Store currently supports MR and Tez execution engine
for Hive.
Download the jar file with corresponding version.
-| |Jar|
-|---|---|
-|Hive 3.1|[flink-table-store-hive-connector-{{< version
>}}_3.1.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-connector-{{< version >}}_3.1.jar)|
-|Hive 2.3|[flink-table-store-hive-connector-{{< version
>}}_2.3.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-connector-{{< version >}}_2.3.jar)|
-|Hive 2.2|[flink-table-store-hive-connector-{{< version
>}}_2.2.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-connector-{{< version >}}_2.2.jar)|
-|Hive 2.1|[flink-table-store-hive-connector-{{< version
>}}_2.1.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-connector-{{< version >}}_2.1.jar)|
+| | Jar
|
+|------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Hive 3.1 | [flink-table-store-hive-connector-3.1-{{< version
>}}.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-connector-3.1-{{< version >}}.jar)
|
+| Hive 2.3 | [flink-table-store-hive-connector-2.3-{{< version
>}}.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-connector-2.3-{{< version >}}.jar)
|
+| Hive 2.2 | [flink-table-store-hive-connector-2.2-{{< version
>}}.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-connector-2.2-{{< version >}}.jar)
|
+| Hive 2.1 | [flink-table-store-hive-connector-2.1-{{< version
>}}.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-connector-2.1-{{< version >}}.jar)
|
+| Hive 2.1-cdh-6.3 | [flink-table-store-hive-connector-2.1-cdh-6.3-{{< version
>}}.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-connector-2.1-cdh-6.3-{{< version >}}.jar) |
You can also manually build bundled jar from the source code.
@@ -62,16 +63,9 @@ You are using an unreleased version of Table Store so you
need to manually build
To build from source code, either [download the source of a
release](https://flink.apache.org/downloads.html) or [clone the git
repository]({{< github_repo >}}).
Build bundled jar with the following command.
+`mvn clean install -Dmaven.test.skip=true`
-| Version | Command |
-|---|---|
-| Hive 3.1 | `mvn clean install -Dmaven.test.skip=true -Phive-3.1` |
-| Hive 2.3 | `mvn clean install -Dmaven.test.skip=true` |
-| Hive 2.2 | `mvn clean install -Dmaven.test.skip=true -Phive-2.2` |
-| Hive 2.1 | `mvn clean install -Dmaven.test.skip=true -Phive-2.1` |
-| Hive 2.1 CDH 6.3 | `mvn clean install -Dmaven.test.skip=true
-Phive-2.1-cdh-6.3` |
-
-You can find Hive connector jar in
`./flink-table-store-hive/flink-table-store-hive-connector/target/flink-table-store-hive-connector-{{<
version >}}.jar`.
+You can find Hive connector jar in
`./flink-table-store-hive/flink-table-store-hive-connector-<hive-version>/target/flink-table-store-hive-connector-<hive-version>-{{<
version >}}.jar`.
There are several ways to add this jar to Hive.
@@ -137,7 +131,7 @@ SELECT * FROM test_table;
Run the following Hive SQL in Hive CLI to access the created table.
```sql
--- Assume that flink-table-store-hive-connector-{{< version >}}.jar is already
in auxlib directory.
+-- Assume that flink-table-store-hive-connector-<hive-version>-{{< version
>}}.jar is already in auxlib directory.
-- List tables in Hive
-- (you might need to switch to "default" database if you're not there by
default)
diff --git a/docs/content/docs/how-to/creating-catalogs.md
b/docs/content/docs/how-to/creating-catalogs.md
index 59da3cae..51ffbee8 100644
--- a/docs/content/docs/how-to/creating-catalogs.md
+++ b/docs/content/docs/how-to/creating-catalogs.md
@@ -82,12 +82,9 @@ By using Table Store Hive catalog, changes to the catalog
will directly affect t
Download the jar file with corresponding version.
-| Version | Jar |
-|---|---|
-| Hive 3.1 | [flink-table-store-hive-catalog-{{< version
>}}_3.1.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-catalog-{{< version >}}_3.1.jar) |
-| Hive 2.3 | [flink-table-store-hive-catalog-{{< version
>}}_2.3.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-catalog-{{< version >}}_2.3.jar) |
-| Hive 2.2 | [flink-table-store-hive-catalog-{{< version
>}}_2.2.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-catalog-{{< version >}}_2.2.jar) |
-| Hive 2.1 | [flink-table-store-hive-catalog-{{< version
>}}_2.1.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-catalog-{{< version >}}_2.1.jar) |
+| Version | Jar |
+|--------------|---|
+| Hive 2 & 3 | [flink-table-store-hive-catalog-{{< version
>}}.jar](https://www.apache.org/dyn/closer.lua/flink/flink-table-store-{{<
version >}}/flink-table-store-hive-catalog-{{< version >}}.jar) |
You can also manually build bundled jar from the source code.
@@ -102,14 +99,7 @@ You are using an unreleased version of Table Store so you
need to manually build
To build from source code, either [download the source of a
release](https://flink.apache.org/downloads.html) or [clone the git
repository]({{< github_repo >}}).
Build bundled jar with the following command.
-
-| Version | Command |
-|---|---|
-| Hive 3.1 | `mvn clean install -Dmaven.test.skip=true -Phive-3.1` |
-| Hive 2.3 | `mvn clean install -Dmaven.test.skip=true` |
-| Hive 2.2 | `mvn clean install -Dmaven.test.skip=true -Phive-2.2` |
-| Hive 2.1 | `mvn clean install -Dmaven.test.skip=true -Phive-2.1` |
-| Hive 2.1 CDH 6.3 | `mvn clean install -Dmaven.test.skip=true
-Phive-2.1-cdh-6.3` |
+`mvn clean install -Dmaven.test.skip=true`
You can find Hive catalog jar in
`./flink-table-store-hive/flink-table-store-hive-catalog/target/flink-table-store-hive-catalog-{{<
version >}}.jar`.
diff --git a/flink-table-store-e2e-tests/pom.xml
b/flink-table-store-e2e-tests/pom.xml
index 112b4fda..298362c4 100644
--- a/flink-table-store-e2e-tests/pom.xml
+++ b/flink-table-store-e2e-tests/pom.xml
@@ -55,7 +55,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-store-hive-connector</artifactId>
+ <artifactId>flink-table-store-hive-connector-common</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
@@ -122,7 +122,7 @@ under the License.
</artifactItem>
<artifactItem>
<groupId>org.apache.flink</groupId>
-
<artifactId>flink-table-store-hive-connector</artifactId>
+
<artifactId>flink-table-store-hive-connector-common</artifactId>
<version>${project.version}</version>
<destFileName>flink-table-store-hive-connector.jar</destFileName>
<type>jar</type>
diff --git a/flink-table-store-hive/flink-table-store-hive-catalog/pom.xml
b/flink-table-store-hive/flink-table-store-hive-catalog/pom.xml
index 25272827..f0cb93eb 100644
--- a/flink-table-store-hive/flink-table-store-hive-catalog/pom.xml
+++ b/flink-table-store-hive/flink-table-store-hive-catalog/pom.xml
@@ -33,55 +33,6 @@ under the License.
<packaging>jar</packaging>
- <profiles>
- <profile>
- <id>hive-3.1</id>
- <dependencies>
- <!-- For Hive 3.1.2, package
org.apache.hadoop.hive.metastore.api relies on this dependency-->
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-standalone-metastore</artifactId>
- <version>${hive.version}</version>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <id>shade-flink</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
-
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
- <artifactSet>
- <includes combine.children="append">
-
<include>org.apache.hive:hive-standalone-metastore</include>
- </includes>
- </artifactSet>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
@@ -181,7 +132,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-store-hive-connector</artifactId>
+ <artifactId>flink-table-store-hive-connector-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector-2.1-cdh-6.3/pom.xml
b/flink-table-store-hive/flink-table-store-hive-connector-2.1-cdh-6.3/pom.xml
new file mode 100644
index 00000000..90c7e5ca
--- /dev/null
+++
b/flink-table-store-hive/flink-table-store-hive-connector-2.1-cdh-6.3/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>flink-table-store-hive</artifactId>
+ <groupId>org.apache.flink</groupId>
+ <version>0.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-table-store-hive-connector-2.1-cdh-6.3</artifactId>
+ <name>Flink Table Store : Hive Connector : 2.1-cdh-6.3</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <hive.version>2.1.1-cdh6.3.4</hive.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-store-hive-connector-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-flink</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes combine.children="append">
+
<include>org.apache.flink:flink-table-store-hive-connector-common</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector-2.1/pom.xml
b/flink-table-store-hive/flink-table-store-hive-connector-2.1/pom.xml
new file mode 100644
index 00000000..f23434d1
--- /dev/null
+++ b/flink-table-store-hive/flink-table-store-hive-connector-2.1/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>flink-table-store-hive</artifactId>
+ <groupId>org.apache.flink</groupId>
+ <version>0.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-table-store-hive-connector-2.1</artifactId>
+ <name>Flink Table Store : Hive Connector : 2.1</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <hive.version>2.1.1</hive.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-store-hive-connector-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-flink</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes combine.children="append">
+
<include>org.apache.flink:flink-table-store-hive-connector-common</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector-2.2/pom.xml
b/flink-table-store-hive/flink-table-store-hive-connector-2.2/pom.xml
new file mode 100644
index 00000000..b4236ee5
--- /dev/null
+++ b/flink-table-store-hive/flink-table-store-hive-connector-2.2/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>flink-table-store-hive</artifactId>
+ <groupId>org.apache.flink</groupId>
+ <version>0.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-table-store-hive-connector-2.2</artifactId>
+ <name>Flink Table Store : Hive Connector : 2.2</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <hive.version>2.2.0</hive.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-store-hive-connector-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-flink</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes combine.children="append">
+
<include>org.apache.flink:flink-table-store-hive-connector-common</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector-2.3/pom.xml
b/flink-table-store-hive/flink-table-store-hive-connector-2.3/pom.xml
new file mode 100644
index 00000000..23cf733b
--- /dev/null
+++ b/flink-table-store-hive/flink-table-store-hive-connector-2.3/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>flink-table-store-hive</artifactId>
+ <groupId>org.apache.flink</groupId>
+ <version>0.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-table-store-hive-connector-2.3</artifactId>
+ <name>Flink Table Store : Hive Connector : 2.3</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <hive.version>2.3.9</hive.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-store-hive-connector-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-flink</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes combine.children="append">
+
<include>org.apache.flink:flink-table-store-hive-connector-common</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector-3.1/pom.xml
b/flink-table-store-hive/flink-table-store-hive-connector-3.1/pom.xml
new file mode 100644
index 00000000..b5b95d45
--- /dev/null
+++ b/flink-table-store-hive/flink-table-store-hive-connector-3.1/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>flink-table-store-hive</artifactId>
+ <groupId>org.apache.flink</groupId>
+ <version>0.4-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>flink-table-store-hive-connector-3.1</artifactId>
+ <name>Flink Table Store : Hive Connector : 3.1</name>
+
+ <packaging>jar</packaging>
+
+ <properties>
+ <hive.version>3.1.2</hive.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-store-hive-connector-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <version>${hive.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.orc</groupId>
+ <artifactId>orc-core</artifactId>
+ </exclusion>
+ <!-- this dependency cannot be fetched from central maven
repository anymore -->
+ <exclusion>
+ <groupId>org.pentaho</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shade-flink</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes combine.children="append">
+
<include>org.apache.flink:flink-table-store-hive-connector-common</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/3/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/3/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/3/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java
similarity index 92%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/3/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java
index 6450f8d8..34649793 100644
---
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/3/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java
+++
b/flink-table-store-hive/flink-table-store-hive-connector-3.1/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java
@@ -34,7 +34,10 @@ public class TableStoreTimestampObjectInspector extends
AbstractPrimitiveJavaObj
@Override
public Timestamp getPrimitiveJavaObject(Object o) {
- return o == null ? null :
Timestamp.ofEpochMilli(((org.apache.flink.table.store.data.Timestamp)
o).getMillisecond());
+ return o == null
+ ? null
+ : Timestamp.ofEpochMilli(
+ ((org.apache.flink.table.store.data.Timestamp)
o).getMillisecond());
}
@Override
diff --git a/flink-table-store-hive/flink-table-store-hive-connector/pom.xml
b/flink-table-store-hive/flink-table-store-hive-connector-common/pom.xml
similarity index 99%
rename from flink-table-store-hive/flink-table-store-hive-connector/pom.xml
rename to flink-table-store-hive/flink-table-store-hive-connector-common/pom.xml
index a5d0f351..3e8a7900 100644
--- a/flink-table-store-hive/flink-table-store-hive-connector/pom.xml
+++ b/flink-table-store-hive/flink-table-store-hive-connector-common/pom.xml
@@ -28,8 +28,8 @@ under the License.
<version>0.4-SNAPSHOT</version>
</parent>
- <artifactId>flink-table-store-hive-connector</artifactId>
- <name>Flink Table Store : Hive Connector</name>
+ <artifactId>flink-table-store-hive-connector-common</artifactId>
+ <name>Flink Table Store : Hive Connector Common</name>
<packaging>jar</packaging>
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/RowDataContainer.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/RowDataContainer.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/RowDataContainer.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/RowDataContainer.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/SearchArgumentToPredicateConverter.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/SearchArgumentToPredicateConverter.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/SearchArgumentToPredicateConverter.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/SearchArgumentToPredicateConverter.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/TableStoreJobConf.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/TableStoreJobConf.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/TableStoreJobConf.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/TableStoreJobConf.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/HiveSchema.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/HiveSchema.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/HiveSchema.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/HiveSchema.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveMetaHook.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveMetaHook.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveMetaHook.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveMetaHook.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandler.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandler.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandler.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandler.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/TableStoreSerDe.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreSerDe.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/TableStoreSerDe.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/TableStoreSerDe.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspector.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspector.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/2/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/2/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspector.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspector.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspector.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspector.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspector.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspector.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspector.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreObjectInspectorFactory.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreObjectInspectorFactory.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreObjectInspectorFactory.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreObjectInspectorFactory.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspector.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspector.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspector.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspector.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/2/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/2/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspector.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspector.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspector.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspector.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspector.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputFormat.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputFormat.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputFormat.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputFormat.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputSplit.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputSplit.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputSplit.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreInputSplit.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/mapred/TableStoreOutputFormat.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreOutputFormat.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/mapred/TableStoreOutputFormat.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreOutputFormat.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/mapred/TableStoreRecordReader.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreRecordReader.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/main/java/org/apache/flink/table/store/mapred/TableStoreRecordReader.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/main/java/org/apache/flink/table/store/mapred/TableStoreRecordReader.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/FileStoreTestUtils.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/FileStoreTestUtils.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/FileStoreTestUtils.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/FileStoreTestUtils.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/SearchArgumentToPredicateConverterTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/SearchArgumentToPredicateConverterTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/SearchArgumentToPredicateConverterTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/SearchArgumentToPredicateConverterTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/HiveTableSchemaTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/HiveTableSchemaTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/HiveTableSchemaTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/HiveTableSchemaTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/RandomGenericRowDataGenerator.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/RandomGenericRowDataGenerator.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/RandomGenericRowDataGenerator.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/RandomGenericRowDataGenerator.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandlerITCase.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandlerITCase.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandlerITCase.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/TableStoreHiveStorageHandlerITCase.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/TableStoreSerDeTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/TableStoreSerDeTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/TableStoreSerDeTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/TableStoreSerDeTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspectorTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspectorTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspectorTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreCharObjectInspectorTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspectorTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspectorTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspectorTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDateObjectInspectorTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreDecimalObjectInspectorTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspectorTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspectorTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspectorTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreListObjectInspectorTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspectorTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspectorTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspectorTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreMapObjectInspectorTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreRowDataObjectInspectorTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspectorTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspectorTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspectorTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreStringObjectInspectorTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreTimestampObjectInspectorTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/hive/objectinspector/TableStoreVarcharObjectInspectorTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/mapred/TableStoreInputSplitTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/mapred/TableStoreInputSplitTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/mapred/TableStoreInputSplitTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/mapred/TableStoreInputSplitTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/mapred/TableStoreRecordReaderTest.java
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/mapred/TableStoreRecordReaderTest.java
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/java/org/apache/flink/table/store/mapred/TableStoreRecordReaderTest.java
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/java/org/apache/flink/table/store/mapred/TableStoreRecordReaderTest.java
diff --git
a/flink-table-store-hive/flink-table-store-hive-connector/src/test/resources/log4j2-test.properties
b/flink-table-store-hive/flink-table-store-hive-connector-common/src/test/resources/log4j2-test.properties
similarity index 100%
rename from
flink-table-store-hive/flink-table-store-hive-connector/src/test/resources/log4j2-test.properties
rename to
flink-table-store-hive/flink-table-store-hive-connector-common/src/test/resources/log4j2-test.properties
diff --git a/flink-table-store-hive/pom.xml b/flink-table-store-hive/pom.xml
index 6fa97e94..d886a50d 100644
--- a/flink-table-store-hive/pom.xml
+++ b/flink-table-store-hive/pom.xml
@@ -36,54 +36,18 @@ under the License.
<modules>
<module>flink-table-store-hive-catalog</module>
<module>flink-table-store-hive-common</module>
- <module>flink-table-store-hive-connector</module>
+ <module>flink-table-store-hive-connector-common</module>
+ <module>flink-table-store-hive-connector-2.1</module>
+ <module>flink-table-store-hive-connector-2.1-cdh-6.3</module>
+ <module>flink-table-store-hive-connector-2.2</module>
+ <module>flink-table-store-hive-connector-2.3</module>
+ <module>flink-table-store-hive-connector-3.1</module>
</modules>
<properties>
- <hive.main.version>2</hive.main.version>
<hive.version>2.3.9</hive.version>
<hiverunner.version>4.0.0</hiverunner.version>
<reflections.version>0.9.8</reflections.version>
</properties>
- <profiles>
- <profile>
- <id>hive-2.1</id>
- <properties>
- <hive.main.version>2</hive.main.version>
- <hive.version>2.1.1</hive.version>
- </properties>
- </profile>
-
- <profile>
- <id>hive-2.2</id>
- <properties>
- <hive.main.version>2</hive.main.version>
- <hive.version>2.2.0</hive.version>
- </properties>
- </profile>
-
- <profile>
- <id>hive-2.1-cdh-6.3</id>
- <properties>
- <hive.main.version>2</hive.main.version>
- <hive.version>2.1.1-cdh6.3.4</hive.version>
- </properties>
- <repositories>
- <repository>
- <id>cloudera</id>
-
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
- </repository>
- </repositories>
- </profile>
-
- <profile>
- <id>hive-3.1</id>
- <properties>
- <hive.main.version>3</hive.main.version>
- <hive.version>3.1.2</hive.version>
- </properties>
- </profile>
- </profiles>
-
</project>
