You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by st...@apache.org on 2022/11/24 19:27:39 UTC
[iceberg] branch master updated: Flink: Fix tests creating catalog after FLINK-29677 (#6248)
This is an automated email from the ASF dual-hosted git repository.
stevenwu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 1d20055e81 Flink: Fix tests creating catalog after FLINK-29677 (#6248)
1d20055e81 is described below
commit 1d20055e811964b0c00fe937a781285f68755167
Author: pvary <pe...@gmail.com>
AuthorDate: Thu Nov 24 20:27:34 2022 +0100
Flink: Fix tests creating catalog after FLINK-29677 (#6248)
* Flink: Fix tests creating catalog after FLINK-29677
* enhanced drop
Co-authored-by: Peter Vary <pe...@apple.com>
---
.../java/org/apache/iceberg/flink/FlinkCatalogTestBase.java | 2 +-
.../test/java/org/apache/iceberg/flink/FlinkTestBase.java | 13 +++++++++++++
.../java/org/apache/iceberg/flink/TestChangeLogTable.java | 2 +-
.../java/org/apache/iceberg/flink/TestFlinkHiveCatalog.java | 2 +-
.../apache/iceberg/flink/source/TestFlinkTableSource.java | 2 +-
5 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/FlinkCatalogTestBase.java b/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/FlinkCatalogTestBase.java
index d4da736dcd..74c5d343e9 100644
--- a/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/FlinkCatalogTestBase.java
+++ b/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/FlinkCatalogTestBase.java
@@ -65,7 +65,7 @@ public abstract class FlinkCatalogTestBase extends FlinkTestBase {
@After
public void clean() {
- sql("DROP CATALOG IF EXISTS %s", catalogName);
+ dropCatalog(catalogName, true);
}
@Parameterized.Parameters(name = "catalogName = {0} baseNamespace = {1}")
diff --git a/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/FlinkTestBase.java b/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/FlinkTestBase.java
index 95471ac882..8076e0ec76 100644
--- a/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/FlinkTestBase.java
+++ b/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/FlinkTestBase.java
@@ -113,4 +113,17 @@ public abstract class FlinkTestBase extends TestBaseUtils {
.as(message)
.containsExactlyInAnyOrderElementsOf(expected);
}
+
+ /**
+ * We can not drop currently used catalog after FLINK-29677, so we have make sure that we do not
+ * use the current catalog before dropping it. This method switches to the 'default_catalog' and
+ * drops the one requested.
+ *
+ * @param catalogName The catalog to drop
+ * @param ifExists If we should use the 'IF EXISTS' when dropping the catalog
+ */
+ protected void dropCatalog(String catalogName, boolean ifExists) {
+ sql("USE CATALOG default_catalog");
+ sql("DROP CATALOG %s %s", ifExists ? "IF EXISTS" : "", catalogName);
+ }
}
diff --git a/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/TestChangeLogTable.java b/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/TestChangeLogTable.java
index 975d77cb35..8e9066e391 100644
--- a/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/TestChangeLogTable.java
+++ b/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/TestChangeLogTable.java
@@ -99,7 +99,7 @@ public class TestChangeLogTable extends ChangeLogTableTestBase {
public void clean() {
sql("DROP TABLE IF EXISTS %s", TABLE_NAME);
sql("DROP DATABASE IF EXISTS %s", DATABASE_NAME);
- sql("DROP CATALOG IF EXISTS %s", CATALOG_NAME);
+ dropCatalog(CATALOG_NAME, true);
BoundedTableFactory.clearDataSets();
}
diff --git a/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/TestFlinkHiveCatalog.java b/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/TestFlinkHiveCatalog.java
index 6474635663..8f238587d3 100644
--- a/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/TestFlinkHiveCatalog.java
+++ b/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/TestFlinkHiveCatalog.java
@@ -100,6 +100,6 @@ public class TestFlinkHiveCatalog extends FlinkTestBase {
sql("DROP TABLE test_table");
sql("DROP DATABASE test_db");
- sql("DROP CATALOG test_catalog");
+ dropCatalog("test_catalog", false);
}
}
diff --git a/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkTableSource.java b/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkTableSource.java
index 3e4ad8c07b..f240e564a7 100644
--- a/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkTableSource.java
+++ b/flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/source/TestFlinkTableSource.java
@@ -97,7 +97,7 @@ public class TestFlinkTableSource extends FlinkTestBase {
public void clean() {
sql("DROP TABLE IF EXISTS %s.%s", DATABASE_NAME, TABLE_NAME);
sql("DROP DATABASE IF EXISTS %s", DATABASE_NAME);
- sql("DROP CATALOG IF EXISTS %s", CATALOG_NAME);
+ dropCatalog(CATALOG_NAME, true);
}
@Test