[hotfix] Cherry-pick a few fixes to 2.2 release

docs/content.zh/docs/connectors/models/downloads.md

@@ -0,0 +1,41 @@
+---
+title: 下载页面
+weight: 100
+type: docs
+bookToc: false
+aliases:
+  - /zh/dev/table/connectors/downloads.html
+---
+<!--
+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.
+-->
+
+# SQL Models 下载页面
+
+{{< unstable >}}
+{{< hint info >}}
+Download links are available only for stable releases.
+{{< /hint >}}
+{{< /unstable >}}
+
+The page contains links to optional sql-client models that are not part of the binary distribution.
+
+# 可选的 SQL Models 
+-------------------
+
+{{< sql_optional_models >}}

docs/content/docs/connectors/models/downloads.md

@@ -0,0 +1,42 @@
+---
+title: Download
+weight: 100
+type: docs
+bookToc: false
+aliases:
+  - /dev/table/models/downloads.html
+---
+<!--
+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.
+-->
+
+# SQL Models download page
+
+{{< unstable >}}
+{{< hint info >}}
+Download links are available only for stable releases.
+{{< /hint >}}
+{{< /unstable >}}
+
+The page contains links to optional SQL Client models that are not part of the binary distribution.
+
+# Optional SQL models
+-------------------
+
+{{< sql_optional_models >}}
+

docs/data/sql_models.yml

@@ -0,0 +1,22 @@
+# 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
+
+openai:
+  name: OpenAI
+  category: model
+  maven: flink-model-openai
+  sql_url: https://repo.maven.apache.org/maven2/org/apache/flink/flink-model-openai/$version/flink-model-openai-$version.jar

docs/layouts/shortcodes/sql_optional_models.html

@@ -0,0 +1,67 @@
+{{/*
+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.
+*/}}{{/*
+   Generates the SQL download model table.
+*/}}
+
+<table class="table table-bordered">
+    <thead>
+    <tr>
+        <th style="text-align: left">Name</th>
+        <th style="text-align: left">Version</th>
+        <th style="text-align: left">Download Link</th>
+    </tr>
+    </thead>
+    <tbody>
+        {{ range .Site.Data.sql_models }}
+            {{ if eq .category "model" }}{{ if eq .builtin nil }}
+            {{ if eq .versions nil }}
+            <tr>
+                <td style="text-align: left">{{- .name -}}</td>
+                <td></td>
+                <td style="text-align: left">
+                    {{ if $.Site.Params.IsStable }}
+                        <a href="{{- partial "docs/interpolate" .sql_url -}}">Download</a>
+                        (<a href="{{- partial "docs/interpolate" .sql_url -}}.asc">asc</a>,
+                        <a href="{{- partial "docs/interpolate" .sql_url -}}.sha1">sha1</a>) </td>
+                    {{ else }}
+                        Only available for stable versions.</td>
+                    {{ end }}
+            </tr>
+            {{ else }}
+                {{ $name := .name }}
+                {{ range .versions }}
+                    <tr>
+                        <td style="text-align: left">{{- $name -}}</td>
+                        <td>{{- .version -}}</td>
+                        <td style="text-align: left">
+                            {{ if $.Site.Params.IsStable }}
+                                <a href="{{- partial "docs/interpolate" .sql_url -}}">Download</a>
+                                (<a href="{{- partial "docs/interpolate" .sql_url -}}.asc">asc</a>,
+                                <a href="{{- partial "docs/interpolate" .sql_url -}}.sha1">sha1</a>) </td>
+                            {{ else }}
+                                Only available for stable versions.</td>
+                            {{ end }}
+                    </tr>
+                {{ end }}
+            {{ end }}
+            {{ end }}{{ end }}
+        {{ end }}
+    </tbody>
+</table>
+

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/batch/BatchExecVectorSearchTableFunction.java

@@ -28,8 +28,6 @@
 import org.apache.flink.table.planner.plan.nodes.exec.common.CommonExecVectorSearchTableFunction;
 import org.apache.flink.table.planner.plan.nodes.exec.spec.VectorSearchSpec;
 import org.apache.flink.table.planner.plan.nodes.exec.spec.VectorSearchTableSourceSpec;
-import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecMLPredictTableFunction;
-import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecVectorSearchTableFunction;
 import org.apache.flink.table.planner.plan.utils.FunctionCallUtil;
 import org.apache.flink.table.types.logical.RowType;
 
@@ -50,7 +48,7 @@
             "table.exec.async-vector-search.timeout",
             "table.exec.async-vector-search.output-mode"
         },
-        producedTransformations = StreamExecMLPredictTableFunction.ML_PREDICT_TRANSFORMATION,
+        producedTransformations = CommonExecVectorSearchTableFunction.VECTOR_SEARCH_TRANSFORMATION,
         minPlanVersion = FlinkVersion.v2_2,
         minStateVersion = FlinkVersion.v2_2)
 public class BatchExecVectorSearchTableFunction extends CommonExecVectorSearchTableFunction
@@ -66,9 +64,9 @@ public BatchExecVectorSearchTableFunction(
             String description) {
         this(
                 ExecNodeContext.newNodeId(),
-                ExecNodeContext.newContext(StreamExecVectorSearchTableFunction.class),
+                ExecNodeContext.newContext(BatchExecVectorSearchTableFunction.class),
                 ExecNodeContext.newPersistedConfig(
-                        StreamExecVectorSearchTableFunction.class, tableConfig),
+                        BatchExecVectorSearchTableFunction.class, tableConfig),
                 tableSourceSpec,
                 vectorSearchSpec,
                 asyncOptions,

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/stream/StreamExecVectorSearchTableFunction.java

@@ -49,7 +49,7 @@
             "table.exec.async-vector-search.timeout",
             "table.exec.async-vector-search.output-mode"
         },
-        producedTransformations = StreamExecMLPredictTableFunction.ML_PREDICT_TRANSFORMATION,
+        producedTransformations = CommonExecVectorSearchTableFunction.VECTOR_SEARCH_TRANSFORMATION,
         minPlanVersion = FlinkVersion.v2_2,
         minStateVersion = FlinkVersion.v2_2)
 public class StreamExecVectorSearchTableFunction extends CommonExecVectorSearchTableFunction

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/utils/ExecNodeMetadataUtil.java

@@ -47,6 +47,7 @@
 import org.apache.flink.table.planner.plan.nodes.exec.batch.BatchExecTableSourceScan;
 import org.apache.flink.table.planner.plan.nodes.exec.batch.BatchExecUnion;
 import org.apache.flink.table.planner.plan.nodes.exec.batch.BatchExecValues;
+import org.apache.flink.table.planner.plan.nodes.exec.batch.BatchExecVectorSearchTableFunction;
 import org.apache.flink.table.planner.plan.nodes.exec.batch.BatchExecWindowTableFunction;
 import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecAsyncCalc;
 import org.apache.flink.table.planner.plan.nodes.exec.stream.StreamExecAsyncCorrelate;
@@ -201,6 +202,7 @@ private ExecNodeMetadataUtil() {
                     add(BatchExecMatch.class);
                     add(BatchExecOverAggregate.class);
                     add(BatchExecRank.class);
+                    add(BatchExecVectorSearchTableFunction.class);
                 }
             };
 

flink-table/flink-table-planner/src/test/resources/restore-tests/batch-exec-vector-search-table-function_1/async-vector-search/plan/async-vector-search.json

@@ -24,10 +24,10 @@
     },
     "outputType" : "ROW<`id` BIGINT, `content` VARCHAR(2147483647), `vector` ARRAY<FLOAT>>",
     "description" : "TableSourceScan(table=[[default_catalog, default_database, src_t]], fields=[id, content, vector])",
-    "dynamicFilteringDataListenerID" : "581f0987-928f-4c00-a1c1-500fdd1c98fb"
+    "dynamicFilteringDataListenerID" : "1753d1db-2d8a-4ca8-9d85-18ec5670a027"
   }, {
     "id" : 6,
-    "type" : "stream-exec-vector-search-table-function_1",
+    "type" : "batch-exec-vector-search-table-function_1",
     "configuration" : {
       "table.exec.async-vector-search.max-concurrent-operations" : "10",
       "table.exec.async-vector-search.output-mode" : "ORDERED",

flink-table/flink-table-planner/src/test/resources/restore-tests/batch-exec-vector-search-table-function_1/sync-vector-search/plan/sync-vector-search.json

@@ -24,10 +24,10 @@
     },
     "outputType" : "ROW<`id` BIGINT, `content` VARCHAR(2147483647), `vector` ARRAY<FLOAT>>",
     "description" : "TableSourceScan(table=[[default_catalog, default_database, src_t]], fields=[id, content, vector])",
-    "dynamicFilteringDataListenerID" : "5e850a71-a459-4906-9822-22c324f6f4c9"
+    "dynamicFilteringDataListenerID" : "6bd08b9c-a3ed-4e52-8349-babb1e553ced"
   }, {
     "id" : 2,
-    "type" : "stream-exec-vector-search-table-function_1",
+    "type" : "batch-exec-vector-search-table-function_1",
     "configuration" : {
       "table.exec.async-vector-search.max-concurrent-operations" : "10",
       "table.exec.async-vector-search.output-mode" : "ORDERED",

flink-table/flink-table-planner/src/test/resources/restore-tests/batch-exec-vector-search-table-function_1/vector-search-with-runtime-config/plan/vector-search-with-runtime-config.json

@@ -24,10 +24,10 @@
     },
     "outputType" : "ROW<`id` BIGINT, `content` VARCHAR(2147483647), `vector` ARRAY<FLOAT>>",
     "description" : "TableSourceScan(table=[[default_catalog, default_database, src_t]], fields=[id, content, vector])",
-    "dynamicFilteringDataListenerID" : "21fdf54d-fce6-42da-bcd3-a522ebee5cd6"
+    "dynamicFilteringDataListenerID" : "24c9df65-8b48-4377-a315-b6bbff3e6333"
   }, {
     "id" : 10,
-    "type" : "stream-exec-vector-search-table-function_1",
+    "type" : "batch-exec-vector-search-table-function_1",
     "configuration" : {
       "table.exec.async-vector-search.max-concurrent-operations" : "10",
       "table.exec.async-vector-search.output-mode" : "ORDERED",