You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by lz...@apache.org on 2023/01/09 02:03:38 UTC
[flink-table-store] branch master updated: [FLINK-30581] Deprecate FileStoreTableITCase and use CatalogITCaseBase
This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-table-store.git
The following commit(s) were added to refs/heads/master by this push:
new 8a20d933 [FLINK-30581] Deprecate FileStoreTableITCase and use CatalogITCaseBase
8a20d933 is described below
commit 8a20d9337ef6135730bdb63a8af902ead6855a7c
Author: Feng Wang <99...@users.noreply.github.com>
AuthorDate: Mon Jan 9 10:03:33 2023 +0800
[FLINK-30581] Deprecate FileStoreTableITCase and use CatalogITCaseBase
This closes #465
---
.../flink/table/store/connector/CatalogITCaseBase.java | 17 ++++++++++++++++-
.../table/store/connector/FileStoreTableITCase.java | 1 +
.../table/store/connector/PartialUpdateITCase.java | 2 +-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/CatalogITCaseBase.java b/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/CatalogITCaseBase.java
index 8893464d..0c661ffe 100644
--- a/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/CatalogITCaseBase.java
+++ b/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/CatalogITCaseBase.java
@@ -37,6 +37,7 @@ import org.junit.Before;
import java.io.IOException;
import java.time.Duration;
+import java.util.Collections;
import java.util.List;
import static org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions.CHECKPOINTING_INTERVAL;
@@ -64,6 +65,10 @@ public abstract class CatalogITCaseBase extends AbstractTestBase {
prepareConfiguration(tEnv);
prepareConfiguration(sEnv);
+
+ for (String ddl : ddl()) {
+ tEnv.executeSql(ddl);
+ }
}
private void prepareConfiguration(TableEnvironment env) {
@@ -77,9 +82,19 @@ public abstract class CatalogITCaseBase extends AbstractTestBase {
return 2;
}
- protected List<Row> sql(String query, Object... args) throws Exception {
+ protected List<String> ddl() {
+ return Collections.emptyList();
+ }
+
+ protected List<Row> batchSql(String query, Object... args) {
+ return sql(query, args);
+ }
+
+ protected List<Row> sql(String query, Object... args) {
try (CloseableIterator<Row> iter = tEnv.executeSql(String.format(query, args)).collect()) {
return ImmutableList.copyOf(iter);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
}
}
diff --git a/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/FileStoreTableITCase.java b/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/FileStoreTableITCase.java
index 3bb66a62..caee8632 100644
--- a/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/FileStoreTableITCase.java
+++ b/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/FileStoreTableITCase.java
@@ -57,6 +57,7 @@ import static org.apache.flink.table.store.connector.FlinkConnectorOptions.relat
import static org.junit.jupiter.api.Assertions.fail;
/** ITCase for file store table api. */
+@Deprecated
public abstract class FileStoreTableITCase extends AbstractTestBase {
protected TableEnvironment bEnv;
diff --git a/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/PartialUpdateITCase.java b/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/PartialUpdateITCase.java
index deb45117..1f9a2f6b 100644
--- a/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/PartialUpdateITCase.java
+++ b/flink-table-store-connector/src/test/java/org/apache/flink/table/store/connector/PartialUpdateITCase.java
@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
/** ITCase for partial update. */
-public class PartialUpdateITCase extends FileStoreTableITCase {
+public class PartialUpdateITCase extends CatalogITCaseBase {
@Override
protected List<String> ddl() {