hongshun's advice:

1. merge flink21Catalog and flink22Catalog to FlinkCatalog.
2. add flink-2.2 to ci tests of flink

Author: loserwang1024

.github/workflows/stage.sh

@@ -25,6 +25,7 @@ MODULES_FLINK="\
 fluss-flink,\
 fluss-flink/fluss-flink-common,\
 fluss-flink/fluss-flink-2.1,\
+fluss-flink/fluss-flink-2.2,\
 fluss-flink/fluss-flink-1.20,\
 "
 

fluss-flink/fluss-flink-2.1/src/main/java/org/apache/flink/api/connector/sink2/Sink.java

@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+package org.apache.fluss.flink.adapter;
+
+import org.apache.flink.api.common.operators.MailboxExecutor;
+import org.apache.flink.api.connector.sink2.Sink;
+import org.apache.flink.api.connector.sink2.SinkWriter;
+import org.apache.flink.api.connector.sink2.WriterInitContext;
+import org.apache.flink.metrics.groups.SinkWriterMetricGroup;
+
+import java.io.IOException;
+
+/**
+ * Flink sink adapter which hide the different version of createWriter method.
+ *
+ * <p>TODO: remove this class when no longer support all the Flink 1.x series.
+ */
+public abstract class FlinkSinkAdapter<InputT> implements Sink<InputT> {
+
+    @Override
+    public SinkWriter<InputT> createWriter(WriterInitContext writerInitContext) throws IOException {
+        return createWriter(
+                writerInitContext.getMailboxExecutor(), writerInitContext.metricGroup());
+    }
+
+    protected abstract SinkWriter<InputT> createWriter(
+            MailboxExecutor mailboxExecutor, SinkWriterMetricGroup metricGroup);
+}

fluss-flink/fluss-flink-2.1/src/main/java/org/apache/fluss/flink/adapter/FlinkSinkAdapter.java

@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+package org.apache.fluss.flink.adapter;
+
+import org.apache.flink.table.api.Schema;
+
+import java.util.List;
+
+/**
+ * An adapter for the schema with Index.
+ *
+ * <p>TODO: remove this class when no longer support all the Flink 1.x series.
+ */
+public class SchemaAdapter {
+    private SchemaAdapter() {}
+
+    public static Schema withIndex(Schema unresolvedSchema, List<List<String>> indexes) {
+        Schema.Builder newSchemaBuilder = Schema.newBuilder().fromSchema(unresolvedSchema);
+        for (List<String> index : indexes) {
+            newSchemaBuilder.index(index);
+        }
+        return newSchemaBuilder.build();
+    }
+
+    public static boolean supportIndex() {
+        return true;
+    }
+}

fluss-flink/fluss-flink-2.1/src/main/java/org/apache/fluss/flink/adapter/SchemaAdapter.java

@@ -16,4 +16,4 @@
 # limitations under the License.
 #
 
-org.apache.fluss.flink.catalog.Flink21CatalogFactory
+org.apache.fluss.flink.catalog.FlinkCatalogFactory

fluss-flink/fluss-flink-2.1/src/main/java/org/apache/fluss/flink/catalog/Flink21Catalog.java

@@ -21,32 +21,13 @@
 import org.apache.flink.table.api.Schema;
 import org.apache.flink.table.catalog.CatalogTable;
 import org.apache.flink.table.catalog.ObjectPath;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /** IT case for catalog in Flink 2.1. */
 public class Flink21CatalogITCase extends FlinkCatalogITCase {
 
-    @BeforeAll
-    static void beforeAll() {
-        FlinkCatalogITCase.beforeAll();
-
-        // close the old one and open a new one later
-        catalog.close();
-
-        catalog =
-                new Flink21Catalog(
-                        catalog.catalogName,
-                        catalog.defaultDatabase,
-                        catalog.bootstrapServers,
-                        catalog.classLoader,
-                        catalog.securityConfigs,
-                        catalog.lakeCatalogPropertiesSupplier);
-        catalog.open();
-    }
-
     @Test
     void testGetTableWithIndex() throws Exception {
         String tableName = "table_with_pk_only";