Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flink: backport #9381 to 1.17 and 1.16 for Migrate subclasses of FlinkCatalogTestBase to JUnit5 #9598

Merged
merged 3 commits into from
Feb 2, 2024
Merged

Flink: backport #9381 to 1.17 and 1.16 for Migrate subclasses of FlinkCatalogTestBase to JUnit5 #9598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a0147a
Flink: Backport #9364 to 1.16 and 1.17 for Create CatalogTestBase for…
rodmeneses Jan 31, 2024
5030fee
extra lines
rodmeneses Feb 1, 2024
ca78564
Flink: backport #9381 to 1.17 and 1.16 for Migrate subclasses of Flin…
rodmeneses Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 37 additions & 49 deletions ...e/iceberg/flink/FlinkCatalogTestBase.java → ...apache/iceberg/flink/CatalogTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,81 +18,63 @@
*/
package org.apache.iceberg.flink;

import java.io.IOException;
import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import org.apache.flink.util.ArrayUtils;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.iceberg.CatalogProperties;
import org.apache.iceberg.Parameter;
import org.apache.iceberg.ParameterizedTestExtension;
import org.apache.iceberg.Parameters;
import org.apache.iceberg.catalog.Catalog;
import org.apache.iceberg.catalog.Namespace;
import org.apache.iceberg.catalog.SupportsNamespaces;
import org.apache.iceberg.hadoop.HadoopCatalog;
import org.apache.iceberg.relocated.com.google.common.base.Joiner;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.rules.TemporaryFolder;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;

@RunWith(Parameterized.class)
public abstract class FlinkCatalogTestBase extends FlinkTestBase {
@ExtendWith(ParameterizedTestExtension.class)
public abstract class CatalogTestBase extends TestBase {

protected static final String DATABASE = "db";
private static TemporaryFolder hiveWarehouse = new TemporaryFolder();
private static TemporaryFolder hadoopWarehouse = new TemporaryFolder();
@TempDir protected File hiveWarehouse;
@TempDir protected File hadoopWarehouse;

@BeforeClass
public static void createWarehouse() throws IOException {
hiveWarehouse.create();
hadoopWarehouse.create();
}
@Parameter(index = 0)
protected String catalogName;

@AfterClass
public static void dropWarehouse() {
hiveWarehouse.delete();
hadoopWarehouse.delete();
}
@Parameter(index = 1)
protected Namespace baseNamespace;

@Before
public void before() {
sql("CREATE CATALOG %s WITH %s", catalogName, toWithClause(config));
}
protected Catalog validationCatalog;
protected SupportsNamespaces validationNamespaceCatalog;
protected Map<String, String> config = Maps.newHashMap();

@After
public void clean() {
dropCatalog(catalogName, true);
}
protected String flinkDatabase;
protected Namespace icebergNamespace;
protected boolean isHadoopCatalog;

@Parameterized.Parameters(name = "catalogName = {0} baseNamespace = {1}")
public static Iterable<Object[]> parameters() {
return Lists.newArrayList(
@Parameters(name = "catalogName={0}, baseNamespace={1}")
protected static List<Object[]> parameters() {
return Arrays.asList(
new Object[] {"testhive", Namespace.empty()},
new Object[] {"testhadoop", Namespace.empty()},
new Object[] {"testhadoop_basenamespace", Namespace.of("l0", "l1")});
}

protected final String catalogName;
protected final Namespace baseNamespace;
protected final Catalog validationCatalog;
protected final SupportsNamespaces validationNamespaceCatalog;
protected final Map<String, String> config = Maps.newHashMap();

protected final String flinkDatabase;
protected final Namespace icebergNamespace;
protected final boolean isHadoopCatalog;

public FlinkCatalogTestBase(String catalogName, Namespace baseNamespace) {
this.catalogName = catalogName;
this.baseNamespace = baseNamespace;
@BeforeEach
public void before() {
this.isHadoopCatalog = catalogName.startsWith("testhadoop");
this.validationCatalog =
isHadoopCatalog
? new HadoopCatalog(hiveConf, "file:" + hadoopWarehouse.getRoot())
? new HadoopCatalog(hiveConf, "file:" + hadoopWarehouse.getPath())
: catalog;
this.validationNamespaceCatalog = (SupportsNamespaces) validationCatalog;

Expand All @@ -111,13 +93,19 @@ public FlinkCatalogTestBase(String catalogName, Namespace baseNamespace) {
this.flinkDatabase = catalogName + "." + DATABASE;
this.icebergNamespace =
Namespace.of(ArrayUtils.concat(baseNamespace.levels(), new String[] {DATABASE}));
sql("CREATE CATALOG %s WITH %s", catalogName, toWithClause(config));
}

@AfterEach
public void clean() {
dropCatalog(catalogName, true);
}

protected String warehouseRoot() {
if (isHadoopCatalog) {
return hadoopWarehouse.getRoot().getAbsolutePath();
return hadoopWarehouse.getAbsolutePath();
} else {
return hiveWarehouse.getRoot().getAbsolutePath();
return hiveWarehouse.getAbsolutePath();
}
}

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.16/flink/src/test/java/org/apache/iceberg/flink/TestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public abstract class TestBase extends TestBaseUtils {
public static MiniClusterExtension miniClusterResource =
MiniFlinkClusterExtension.createWithClassloaderCheckDisabled();

@TempDir Path temporaryDirectory;
@TempDir protected Path temporaryDirectory;

private static TestHiveMetastore metastore = null;
protected static HiveConf hiveConf = null;
Expand Down
Loading