This is an automated email from the ASF dual-hosted git repository.
corgy pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new f3a45cd131 [improve] qdrant options (#9235)
f3a45cd131 is described below
commit f3a45cd13107c6abd464463197fd44ae3fb01e83
Author: Jarvis <[email protected]>
AuthorDate: Mon Apr 28 23:43:42 2025 +0800
[improve] qdrant options (#9235)
---
.../seatunnel/api/ConnectorOptionCheckTest.java | 2 --
.../{QdrantConfig.java => QdrantBaseOptions.java} | 3 ++-
.../seatunnel/qdrant/config/QdrantParameters.java | 10 +++++-----
.../seatunnel/qdrant/config/QdrantSinkOptions.java | 20 ++++++++++++++++++++
.../seatunnel/qdrant/config/QdrantSourceOptions.java | 20 ++++++++++++++++++++
.../connectors/seatunnel/qdrant/sink/QdrantSink.java | 4 ++--
.../seatunnel/qdrant/sink/QdrantSinkFactory.java | 13 +++++++------
.../seatunnel/qdrant/source/QdrantSource.java | 4 ++--
.../seatunnel/qdrant/source/QdrantSourceFactory.java | 15 +++++++--------
9 files changed, 65 insertions(+), 26 deletions(-)
diff --git
a/seatunnel-ci-tools/src/test/java/org/apache/seatunnel/api/ConnectorOptionCheckTest.java
b/seatunnel-ci-tools/src/test/java/org/apache/seatunnel/api/ConnectorOptionCheckTest.java
index 5712d27918..0a42dfa8d7 100644
---
a/seatunnel-ci-tools/src/test/java/org/apache/seatunnel/api/ConnectorOptionCheckTest.java
+++
b/seatunnel-ci-tools/src/test/java/org/apache/seatunnel/api/ConnectorOptionCheckTest.java
@@ -199,7 +199,6 @@ public class ConnectorOptionCheckTest {
whiteList.add("MongodbSinkOptions");
whiteList.add("SlsSourceOptions");
whiteList.add("SentrySinkOptions");
- whiteList.add("QdrantSinkOptions");
whiteList.add("RocketMqSinkOptions");
whiteList.add("SocketSinkOptions");
whiteList.add("SelectDBSinkOptions");
@@ -207,7 +206,6 @@ public class ConnectorOptionCheckTest {
whiteList.add("TablestoreSinkOptions");
whiteList.add("TableStoreDBSourceOptions");
whiteList.add("Neo4jSourceOptions");
- whiteList.add("QdrantSourceOptions");
whiteList.add("SocketSourceOptions");
whiteList.add("PostgresIncrementalSourceOptions");
whiteList.add("SqlServerIncrementalSourceOptions");
diff --git
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantConfig.java
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantBaseOptions.java
similarity index 94%
rename from
seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantConfig.java
rename to
seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantBaseOptions.java
index 1be03a1311..b6bf33837b 100644
---
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantConfig.java
+++
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantBaseOptions.java
@@ -19,8 +19,9 @@ package
org.apache.seatunnel.connectors.seatunnel.qdrant.config;
import org.apache.seatunnel.api.configuration.Option;
import org.apache.seatunnel.api.configuration.Options;
+import org.apache.seatunnel.api.options.ConnectorCommonOptions;
-public class QdrantConfig {
+public class QdrantBaseOptions extends ConnectorCommonOptions {
public static final String CONNECTOR_IDENTITY = "Qdrant";
diff --git
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantParameters.java
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantParameters.java
index 1ae612fafb..a4b8940cec 100644
---
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantParameters.java
+++
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantParameters.java
@@ -34,11 +34,11 @@ public class QdrantParameters implements Serializable {
private boolean useTls;
public QdrantParameters(ReadonlyConfig config) {
- this.host = config.get(QdrantConfig.HOST);
- this.port = config.get(QdrantConfig.PORT);
- this.apiKey = config.get(QdrantConfig.API_KEY);
- this.collectionName = config.get(QdrantConfig.COLLECTION_NAME);
- this.useTls = config.get(QdrantConfig.USE_TLS);
+ this.host = config.get(QdrantBaseOptions.HOST);
+ this.port = config.get(QdrantBaseOptions.PORT);
+ this.apiKey = config.get(QdrantBaseOptions.API_KEY);
+ this.collectionName = config.get(QdrantBaseOptions.COLLECTION_NAME);
+ this.useTls = config.get(QdrantBaseOptions.USE_TLS);
}
public QdrantClient buildQdrantClient() {
diff --git
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantSinkOptions.java
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantSinkOptions.java
new file mode 100644
index 0000000000..81a73309ef
--- /dev/null
+++
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantSinkOptions.java
@@ -0,0 +1,20 @@
+/*
+ * 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.seatunnel.connectors.seatunnel.qdrant.config;
+
+public class QdrantSinkOptions extends QdrantBaseOptions {}
diff --git
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantSourceOptions.java
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantSourceOptions.java
new file mode 100644
index 0000000000..2e4967f75f
--- /dev/null
+++
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/config/QdrantSourceOptions.java
@@ -0,0 +1,20 @@
+/*
+ * 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.seatunnel.connectors.seatunnel.qdrant.config;
+
+public class QdrantSourceOptions extends QdrantBaseOptions {}
diff --git
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/sink/QdrantSink.java
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/sink/QdrantSink.java
index 16904903e5..ee4b69d1d7 100644
---
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/sink/QdrantSink.java
+++
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/sink/QdrantSink.java
@@ -23,7 +23,7 @@ import org.apache.seatunnel.api.sink.SupportMultiTableSink;
import org.apache.seatunnel.api.table.catalog.CatalogTable;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
import
org.apache.seatunnel.connectors.seatunnel.common.sink.AbstractSimpleSink;
-import org.apache.seatunnel.connectors.seatunnel.qdrant.config.QdrantConfig;
+import
org.apache.seatunnel.connectors.seatunnel.qdrant.config.QdrantBaseOptions;
import
org.apache.seatunnel.connectors.seatunnel.qdrant.config.QdrantParameters;
import java.io.IOException;
@@ -41,7 +41,7 @@ public class QdrantSink extends
AbstractSimpleSink<SeaTunnelRow, Void>
@Override
public String getPluginName() {
- return QdrantConfig.CONNECTOR_IDENTITY;
+ return QdrantBaseOptions.CONNECTOR_IDENTITY;
}
@Override
diff --git
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/sink/QdrantSinkFactory.java
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/sink/QdrantSinkFactory.java
index 5da1c6aed6..dfa11c1ad3 100644
---
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/sink/QdrantSinkFactory.java
+++
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/sink/QdrantSinkFactory.java
@@ -24,7 +24,7 @@ import org.apache.seatunnel.api.table.connector.TableSink;
import org.apache.seatunnel.api.table.factory.Factory;
import org.apache.seatunnel.api.table.factory.TableSinkFactory;
import org.apache.seatunnel.api.table.factory.TableSinkFactoryContext;
-import org.apache.seatunnel.connectors.seatunnel.qdrant.config.QdrantConfig;
+import
org.apache.seatunnel.connectors.seatunnel.qdrant.config.QdrantSinkOptions;
import com.google.auto.service.AutoService;
@@ -32,7 +32,7 @@ import com.google.auto.service.AutoService;
public class QdrantSinkFactory implements TableSinkFactory {
@Override
public String factoryIdentifier() {
- return QdrantConfig.CONNECTOR_IDENTITY;
+ return QdrantSinkOptions.CONNECTOR_IDENTITY;
}
@Override
@@ -45,10 +45,11 @@ public class QdrantSinkFactory implements TableSinkFactory {
public OptionRule optionRule() {
return OptionRule.builder()
.optional(
- QdrantConfig.HOST,
- QdrantConfig.PORT,
- QdrantConfig.API_KEY,
- QdrantConfig.USE_TLS,
+ QdrantSinkOptions.HOST,
+ QdrantSinkOptions.PORT,
+ QdrantSinkOptions.API_KEY,
+ QdrantSinkOptions.COLLECTION_NAME,
+ QdrantSinkOptions.USE_TLS,
SinkConnectorCommonOptions.MULTI_TABLE_SINK_REPLICA)
.build();
}
diff --git
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/source/QdrantSource.java
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/source/QdrantSource.java
index 39aeb3a879..170c322aed 100644
---
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/source/QdrantSource.java
+++
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/source/QdrantSource.java
@@ -25,7 +25,7 @@ import org.apache.seatunnel.api.table.type.SeaTunnelRow;
import
org.apache.seatunnel.connectors.seatunnel.common.source.AbstractSingleSplitReader;
import
org.apache.seatunnel.connectors.seatunnel.common.source.AbstractSingleSplitSource;
import
org.apache.seatunnel.connectors.seatunnel.common.source.SingleSplitReaderContext;
-import org.apache.seatunnel.connectors.seatunnel.qdrant.config.QdrantConfig;
+import
org.apache.seatunnel.connectors.seatunnel.qdrant.config.QdrantBaseOptions;
import
org.apache.seatunnel.connectors.seatunnel.qdrant.config.QdrantParameters;
import java.util.Collections;
@@ -37,7 +37,7 @@ public class QdrantSource extends
AbstractSingleSplitSource<SeaTunnelRow> {
@Override
public String getPluginName() {
- return QdrantConfig.CONNECTOR_IDENTITY;
+ return QdrantBaseOptions.CONNECTOR_IDENTITY;
}
public QdrantSource(ReadonlyConfig readonlyConfig) {
diff --git
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/source/QdrantSourceFactory.java
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/source/QdrantSourceFactory.java
index 3ca8f9cc7e..f8d4f0c73f 100644
---
a/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/source/QdrantSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-qdrant/src/main/java/org/apache/seatunnel/connectors/seatunnel/qdrant/source/QdrantSourceFactory.java
@@ -18,14 +18,13 @@
package org.apache.seatunnel.connectors.seatunnel.qdrant.source;
import org.apache.seatunnel.api.configuration.util.OptionRule;
-import org.apache.seatunnel.api.options.ConnectorCommonOptions;
import org.apache.seatunnel.api.source.SeaTunnelSource;
import org.apache.seatunnel.api.source.SourceSplit;
import org.apache.seatunnel.api.table.connector.TableSource;
import org.apache.seatunnel.api.table.factory.Factory;
import org.apache.seatunnel.api.table.factory.TableSourceFactory;
import org.apache.seatunnel.api.table.factory.TableSourceFactoryContext;
-import org.apache.seatunnel.connectors.seatunnel.qdrant.config.QdrantConfig;
+import
org.apache.seatunnel.connectors.seatunnel.qdrant.config.QdrantSourceOptions;
import com.google.auto.service.AutoService;
@@ -35,7 +34,7 @@ import java.io.Serializable;
public class QdrantSourceFactory implements TableSourceFactory {
@Override
public String factoryIdentifier() {
- return QdrantConfig.CONNECTOR_IDENTITY;
+ return QdrantSourceOptions.CONNECTOR_IDENTITY;
}
@Override
@@ -47,12 +46,12 @@ public class QdrantSourceFactory implements
TableSourceFactory {
@Override
public OptionRule optionRule() {
return OptionRule.builder()
- .required(QdrantConfig.COLLECTION_NAME,
ConnectorCommonOptions.SCHEMA)
+ .required(QdrantSourceOptions.COLLECTION_NAME,
QdrantSourceOptions.SCHEMA)
.optional(
- QdrantConfig.HOST,
- QdrantConfig.PORT,
- QdrantConfig.API_KEY,
- QdrantConfig.USE_TLS)
+ QdrantSourceOptions.HOST,
+ QdrantSourceOptions.PORT,
+ QdrantSourceOptions.API_KEY,
+ QdrantSourceOptions.USE_TLS)
.build();
}
