[FLINK-38733] Add new SplitterEnumerator on JdbcSource

Author: eskabetxe

flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilder.java

@@ -140,6 +140,7 @@ public JdbcSourceBuilder<OUT> setSplitter(SplitterEnumerator splitterEnumerator)
         return this;
     }
 
+    /** @deprecated Use {@link #setSplitter(SplitterEnumerator)} instead. */
     @Deprecated
     public JdbcSourceBuilder<OUT> setSql(@Nonnull String sql) {
         Preconditions.checkArgument(
@@ -205,6 +206,8 @@ public JdbcSourceBuilder<OUT> setContinuousUnBoundingSettings(
     /**
      * If the value was set as an instance of {@link JdbcSlideTimingParameterProvider}, it's
      * required to specify the {@link #continuousUnBoundingSettings}.
+     *
+     * @deprecated Use {@link #setSplitter(SplitterEnumerator)} instead.
      */
     @Deprecated
     public JdbcSourceBuilder<OUT> setJdbcParameterValuesProvider(

flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSourceEnumerator.java

@@ -85,13 +85,7 @@ public void start() {
                     continuousUnBoundingSettings.getInitialDiscoveryDelay().toMillis(),
                     continuousUnBoundingSettings.getDiscoveryInterval().toMillis());
         } else {
-            context.callAsync(
-                    () ->
-                            splitterEnumerator.isAllSplitsFinished()
-                                    ? Collections.emptyList()
-                                    : splitterEnumerator.enumerateSplits(),
-                    (List<JdbcSourceSplit> splits, Throwable error) ->
-                            this.unassigned.addAll(splits));
+            unassigned.addAll(splitterEnumerator.enumerateSplits());
         }
     }
 

flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/JdbcSqlSplitEnumeratorBase.java

@@ -19,6 +19,7 @@
 package org.apache.flink.connector.jdbc.core.datastream.source.enumerator;
 
 import org.apache.flink.annotation.PublicEvolving;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.splitter.SplitterEnumerator;
 import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
 
 import javax.annotation.Nonnull;
@@ -33,6 +34,7 @@
  * Base class for jdbc sql split enumerator.
  *
  * @param <SplitT> JDBC split type.
+ * @deprecated Use {@link SplitterEnumerator} instead.
  */
 @Deprecated
 @PublicEvolving

flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/SqlTemplateSplitEnumerator.java

@@ -19,6 +19,7 @@
 package org.apache.flink.connector.jdbc.core.datastream.source.enumerator;
 
 import org.apache.flink.annotation.VisibleForTesting;
+import org.apache.flink.connector.jdbc.core.datastream.source.enumerator.splitter.PreparedSplitterEnumerator;
 import org.apache.flink.connector.jdbc.core.datastream.source.split.CheckpointedOffset;
 import org.apache.flink.connector.jdbc.core.datastream.source.split.JdbcSourceSplit;
 import org.apache.flink.connector.jdbc.split.JdbcParameterValuesProvider;
@@ -37,7 +38,11 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-/** A split enumerator based on sql-parameters grains. */
+/**
+ * A split enumerator based on sql-parameters grains.
+ *
+ * @deprecated Use {@link PreparedSplitterEnumerator} instead.
+ */
 @Deprecated
 public final class SqlTemplateSplitEnumerator extends JdbcSqlSplitEnumeratorBase<JdbcSourceSplit> {
 

flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/enumerator/splitter/JdbcSqlSplitterEnumerator.java

@@ -1,3 +1,21 @@
+/*
+ * 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.flink.connector.jdbc.core.datastream.source.enumerator.splitter;
 
 import org.apache.flink.annotation.Internal;