[flink] Rename module "fluss-connector-flink" to "fluss-flink"

Author: wuchong

…connectors/fluss-connector-flink/pom.xml fluss-flink/fluss-flink-common/pom.xmlfluss-connectors/fluss-connector-flink/pom.xml renamed to fluss-flink/fluss-flink-common/pom.xml fluss-connectors/fluss-connector-flink/pom.xml renamed to fluss-flink/fluss-flink-common/pom.xml

@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.alibaba.fluss</groupId>
-        <artifactId>fluss-connectors</artifactId>
+        <artifactId>fluss-flink</artifactId>
         <version>0.7-SNAPSHOT</version>
     </parent>
 
-    <artifactId>fluss-connector-flink</artifactId>
+    <artifactId>fluss-flink-common</artifactId>
 
-    <name>Fluss : Connector : Flink</name>
+    <name>Fluss : Engine Flink : Common</name>
 
     <properties>
         <flink.major.version>1.20</flink.major.version>

…nnector/flink/FlinkConnectorOptions.java …a/fluss/flink/FlinkConnectorOptions.javafluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/FlinkConnectorOptions.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/FlinkConnectorOptions.java fluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/FlinkConnectorOptions.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/FlinkConnectorOptions.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.connector.flink;
+package com.alibaba.fluss.flink;
 
 import com.alibaba.fluss.config.FlussConfigUtils;
-import com.alibaba.fluss.connector.flink.utils.FlinkConversions;
+import com.alibaba.fluss.flink.utils.FlinkConversions;
 
 import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.configuration.ConfigOptions;

…onnector/flink/catalog/FlinkCatalog.java …ba/fluss/flink/catalog/FlinkCatalog.javafluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/catalog/FlinkCatalog.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/catalog/FlinkCatalog.java fluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/catalog/FlinkCatalog.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/catalog/FlinkCatalog.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.connector.flink.catalog;
+package com.alibaba.fluss.flink.catalog;
 
 import com.alibaba.fluss.client.Connection;
 import com.alibaba.fluss.client.ConnectionFactory;
 import com.alibaba.fluss.client.admin.Admin;
 import com.alibaba.fluss.config.ConfigOptions;
 import com.alibaba.fluss.config.Configuration;
-import com.alibaba.fluss.connector.flink.lakehouse.LakeCatalog;
-import com.alibaba.fluss.connector.flink.utils.CatalogExceptionUtils;
-import com.alibaba.fluss.connector.flink.utils.DataLakeUtils;
-import com.alibaba.fluss.connector.flink.utils.FlinkConversions;
+import com.alibaba.fluss.flink.lakehouse.LakeCatalog;
+import com.alibaba.fluss.flink.utils.CatalogExceptionUtils;
+import com.alibaba.fluss.flink.utils.DataLakeUtils;
+import com.alibaba.fluss.flink.utils.FlinkConversions;
 import com.alibaba.fluss.exception.FlussRuntimeException;
 import com.alibaba.fluss.metadata.DatabaseDescriptor;
 import com.alibaba.fluss.metadata.PartitionInfo;
@@ -74,12 +74,12 @@
 import java.util.Optional;
 
 import static com.alibaba.fluss.config.ConfigOptions.BOOTSTRAP_SERVERS;
-import static com.alibaba.fluss.connector.flink.utils.CatalogExceptionUtils.isPartitionAlreadyExists;
-import static com.alibaba.fluss.connector.flink.utils.CatalogExceptionUtils.isPartitionInvalid;
-import static com.alibaba.fluss.connector.flink.utils.CatalogExceptionUtils.isPartitionNotExist;
-import static com.alibaba.fluss.connector.flink.utils.CatalogExceptionUtils.isTableNotExist;
-import static com.alibaba.fluss.connector.flink.utils.CatalogExceptionUtils.isTableNotPartitioned;
-import static com.alibaba.fluss.connector.flink.utils.FlinkConversions.toFlussDatabase;
+import static com.alibaba.fluss.flink.utils.CatalogExceptionUtils.isPartitionAlreadyExists;
+import static com.alibaba.fluss.flink.utils.CatalogExceptionUtils.isPartitionInvalid;
+import static com.alibaba.fluss.flink.utils.CatalogExceptionUtils.isPartitionNotExist;
+import static com.alibaba.fluss.flink.utils.CatalogExceptionUtils.isTableNotExist;
+import static com.alibaba.fluss.flink.utils.CatalogExceptionUtils.isTableNotPartitioned;
+import static com.alibaba.fluss.flink.utils.FlinkConversions.toFlussDatabase;
 import static org.apache.flink.util.Preconditions.checkArgument;
 
 /** A Flink Catalog for fluss. */

…r/flink/catalog/FlinkCatalogFactory.java …s/flink/catalog/FlinkCatalogFactory.javafluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/catalog/FlinkCatalogFactory.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/catalog/FlinkCatalogFactory.java fluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/catalog/FlinkCatalogFactory.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/catalog/FlinkCatalogFactory.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.connector.flink.catalog;
+package com.alibaba.fluss.flink.catalog;
 
-import com.alibaba.fluss.connector.flink.FlinkConnectorOptions;
+import com.alibaba.fluss.flink.FlinkConnectorOptions;
 
 import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.table.factories.CatalogFactory;

…r/flink/catalog/FlinkCatalogOptions.java …s/flink/catalog/FlinkCatalogOptions.javafluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/catalog/FlinkCatalogOptions.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/catalog/FlinkCatalogOptions.java fluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/catalog/FlinkCatalogOptions.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/catalog/FlinkCatalogOptions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.connector.flink.catalog;
+package com.alibaba.fluss.flink.catalog;
 
 import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.configuration.ConfigOptions;

…tor/flink/catalog/FlinkTableFactory.java …uss/flink/catalog/FlinkTableFactory.javafluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/catalog/FlinkTableFactory.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/catalog/FlinkTableFactory.java fluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/catalog/FlinkTableFactory.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/catalog/FlinkTableFactory.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.connector.flink.catalog;
+package com.alibaba.fluss.flink.catalog;
 
 import com.alibaba.fluss.config.ConfigOptions;
 import com.alibaba.fluss.config.Configuration;
-import com.alibaba.fluss.connector.flink.FlinkConnectorOptions;
-import com.alibaba.fluss.connector.flink.lakehouse.LakeTableFactory;
-import com.alibaba.fluss.connector.flink.sink.FlinkTableSink;
-import com.alibaba.fluss.connector.flink.source.FlinkTableSource;
-import com.alibaba.fluss.connector.flink.utils.FlinkConnectorOptionsUtils;
+import com.alibaba.fluss.flink.FlinkConnectorOptions;
+import com.alibaba.fluss.flink.lakehouse.LakeTableFactory;
+import com.alibaba.fluss.flink.sink.FlinkTableSink;
+import com.alibaba.fluss.flink.source.FlinkTableSource;
+import com.alibaba.fluss.flink.utils.FlinkConnectorOptionsUtils;
 import com.alibaba.fluss.metadata.TablePath;
 
 import org.apache.flink.api.common.RuntimeExecutionMode;
@@ -51,8 +51,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.alibaba.fluss.connector.flink.catalog.FlinkCatalog.LAKE_TABLE_SPLITTER;
-import static com.alibaba.fluss.connector.flink.utils.FlinkConversions.toFlinkOption;
+import static com.alibaba.fluss.flink.catalog.FlinkCatalog.LAKE_TABLE_SPLITTER;
+import static com.alibaba.fluss.flink.utils.FlinkConversions.toFlinkOption;
 
 /** Factory to create table source and table sink for Fluss. */
 public class FlinkTableFactory implements DynamicTableSourceFactory, DynamicTableSinkFactory {

…nnector/flink/lakehouse/LakeCatalog.java …a/fluss/flink/lakehouse/LakeCatalog.javafluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/lakehouse/LakeCatalog.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/lakehouse/LakeCatalog.java fluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/lakehouse/LakeCatalog.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/lakehouse/LakeCatalog.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.connector.flink.lakehouse;
+package com.alibaba.fluss.flink.lakehouse;
 
 import org.apache.flink.table.catalog.CatalogBaseTable;
 import org.apache.flink.table.catalog.ObjectPath;

…k/lakehouse/LakeRecordRecordEmitter.java …k/lakehouse/LakeRecordRecordEmitter.javafluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/lakehouse/LakeRecordRecordEmitter.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/lakehouse/LakeRecordRecordEmitter.java fluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/lakehouse/LakeRecordRecordEmitter.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/lakehouse/LakeRecordRecordEmitter.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.connector.flink.lakehouse;
+package com.alibaba.fluss.flink.lakehouse;
 
 import com.alibaba.fluss.client.table.scanner.ScanRecord;
-import com.alibaba.fluss.connector.flink.lakehouse.paimon.split.PaimonSnapshotAndFlussLogSplitState;
-import com.alibaba.fluss.connector.flink.lakehouse.paimon.split.PaimonSnapshotSplitState;
-import com.alibaba.fluss.connector.flink.source.reader.RecordAndPos;
-import com.alibaba.fluss.connector.flink.source.split.SourceSplitState;
+import com.alibaba.fluss.flink.lakehouse.paimon.split.PaimonSnapshotAndFlussLogSplitState;
+import com.alibaba.fluss.flink.lakehouse.paimon.split.PaimonSnapshotSplitState;
+import com.alibaba.fluss.flink.source.reader.RecordAndPos;
+import com.alibaba.fluss.flink.source.split.SourceSplitState;
 
 import org.apache.flink.api.connector.source.SourceOutput;
 import org.apache.flink.table.data.RowData;

…/flink/lakehouse/LakeSplitGenerator.java …/flink/lakehouse/LakeSplitGenerator.javafluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/lakehouse/LakeSplitGenerator.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/lakehouse/LakeSplitGenerator.java fluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/lakehouse/LakeSplitGenerator.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/lakehouse/LakeSplitGenerator.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.connector.flink.lakehouse;
+package com.alibaba.fluss.flink.lakehouse;
 
 import com.alibaba.fluss.client.admin.Admin;
 import com.alibaba.fluss.client.metadata.LakeSnapshot;
-import com.alibaba.fluss.connector.flink.lakehouse.paimon.split.PaimonSnapshotAndFlussLogSplit;
-import com.alibaba.fluss.connector.flink.lakehouse.paimon.split.PaimonSnapshotSplit;
-import com.alibaba.fluss.connector.flink.source.enumerator.initializer.OffsetsInitializer;
-import com.alibaba.fluss.connector.flink.source.split.LogSplit;
-import com.alibaba.fluss.connector.flink.source.split.SourceSplitBase;
+import com.alibaba.fluss.flink.lakehouse.paimon.split.PaimonSnapshotAndFlussLogSplit;
+import com.alibaba.fluss.flink.lakehouse.paimon.split.PaimonSnapshotSplit;
+import com.alibaba.fluss.flink.source.enumerator.initializer.OffsetsInitializer;
+import com.alibaba.fluss.flink.source.split.LogSplit;
+import com.alibaba.fluss.flink.source.split.SourceSplitBase;
 import com.alibaba.fluss.metadata.PartitionInfo;
 import com.alibaba.fluss.metadata.TableBucket;
 import com.alibaba.fluss.metadata.TableInfo;
@@ -48,7 +48,7 @@
 import java.util.stream.IntStream;
 
 import static com.alibaba.fluss.client.table.scanner.log.LogScanner.EARLIEST_OFFSET;
-import static com.alibaba.fluss.connector.flink.utils.DataLakeUtils.extractLakeCatalogProperties;
+import static com.alibaba.fluss.flink.utils.DataLakeUtils.extractLakeCatalogProperties;
 import static com.alibaba.fluss.utils.Preconditions.checkState;
 
 /**

…/lakehouse/LakeSplitReaderGenerator.java …/lakehouse/LakeSplitReaderGenerator.javafluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/lakehouse/LakeSplitReaderGenerator.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/lakehouse/LakeSplitReaderGenerator.java fluss-connectors/fluss-connector-flink/src/main/java/com/alibaba/fluss/connector/flink/lakehouse/LakeSplitReaderGenerator.java renamed to fluss-flink/fluss-flink-common/src/main/java/com/alibaba/fluss/flink/lakehouse/LakeSplitReaderGenerator.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package com.alibaba.fluss.connector.flink.lakehouse;
+package com.alibaba.fluss.flink.lakehouse;
 
 import com.alibaba.fluss.client.Connection;
 import com.alibaba.fluss.client.table.Table;
-import com.alibaba.fluss.connector.flink.lakehouse.paimon.reader.PaimonSnapshotAndLogSplitScanner;
-import com.alibaba.fluss.connector.flink.lakehouse.paimon.reader.PaimonSnapshotScanner;
-import com.alibaba.fluss.connector.flink.lakehouse.paimon.split.PaimonSnapshotAndFlussLogSplit;
-import com.alibaba.fluss.connector.flink.lakehouse.paimon.split.PaimonSnapshotSplit;
-import com.alibaba.fluss.connector.flink.source.reader.BoundedSplitReader;
-import com.alibaba.fluss.connector.flink.source.split.SourceSplitBase;
-import com.alibaba.fluss.connector.flink.utils.DataLakeUtils;
+import com.alibaba.fluss.flink.lakehouse.paimon.reader.PaimonSnapshotAndLogSplitScanner;
+import com.alibaba.fluss.flink.lakehouse.paimon.reader.PaimonSnapshotScanner;
+import com.alibaba.fluss.flink.lakehouse.paimon.split.PaimonSnapshotAndFlussLogSplit;
+import com.alibaba.fluss.flink.lakehouse.paimon.split.PaimonSnapshotSplit;
+import com.alibaba.fluss.flink.source.reader.BoundedSplitReader;
+import com.alibaba.fluss.flink.source.split.SourceSplitBase;
+import com.alibaba.fluss.flink.utils.DataLakeUtils;
 import com.alibaba.fluss.metadata.TablePath;
 
 import org.apache.flink.util.ExceptionUtils;