Skip to content

Fix 3810 #4061

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

Open
vaquarkhan wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix 3810 #4061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0113076
[AMORO-3974] Fix JUnit 5 migration logic in iceberg module
vaquarkhan Jan 24, 2026
9605259
fixed junit 5 path issue
vaquarkhan Jan 25, 2026
e5bc5be
fix TableRuntime init when table has no optimizer info
vaquarkhan Jan 25, 2026
fc44a77
Merge branch 'master' into fix-3810
czy006 Feb 6, 2026
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
3 changes: 2 additions & 1 deletion amoro-ams/src/main/java/org/apache/amoro/server/table/DefaultTableService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ public void initialize() {
tableRuntimeMeta.getTableId());
continue;
}
List<TableRuntimeState> states = statesMap.get(tableRuntimeMeta.getTableId());
List<TableRuntimeState> states =
statesMap.getOrDefault(tableRuntimeMeta.getTableId(), Collections.emptyList());
Optional<TableRuntime> tableRuntime =
createTableRuntime(identifier, tableRuntimeMeta, states);
if (!tableRuntime.isPresent()) {
Expand Down
32 changes: 10 additions & 22 deletions amoro-common/src/test/java/org/apache/amoro/formats/AmoroCatalogTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,25 @@
package org.apache.amoro.formats;

import org.apache.amoro.AmoroCatalog;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.io.TempDir;

import java.io.IOException;
import java.io.File;

public abstract class AmoroCatalogTestBase {

@Rule public TemporaryFolder temp = new TemporaryFolder();

protected AmoroCatalogTestHelper<?> catalogTestHelper;
@TempDir protected File temp;

protected AmoroCatalog amoroCatalog;

protected Object originalCatalog;

public AmoroCatalogTestBase(AmoroCatalogTestHelper<?> catalogTestHelper) {
this.catalogTestHelper = catalogTestHelper;
}

@Before
public void setupCatalog() throws IOException {
String path = temp.newFolder().getPath();
catalogTestHelper.initWarehouse(path);
this.amoroCatalog = catalogTestHelper.amoroCatalog();
this.originalCatalog = catalogTestHelper.originalCatalog();
}

@After
@AfterEach
public void cleanCatalog() {
catalogTestHelper.clean();
if (catalogTestHelper != null) {
catalogTestHelper.clean();
}
}

protected AmoroCatalogTestHelper<?> catalogTestHelper;
}
58 changes: 30 additions & 28 deletions amoro-common/src/test/java/org/apache/amoro/formats/TestAmoroCatalogBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
import org.apache.amoro.AmoroTable;
import org.apache.amoro.shade.guava32.com.google.common.collect.Sets;
import org.apache.amoro.table.TableIdentifier;
import org.junit.Assert;
import org.junit.Test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;

import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Expand All @@ -37,8 +38,15 @@ public abstract class TestAmoroCatalogBase extends AmoroCatalogTestBase {

private static final String TABLE = "table";

public TestAmoroCatalogBase(AmoroCatalogTestHelper<?> catalogTestHelper) {
super(catalogTestHelper);
protected AmoroCatalogTestHelper<?> catalogTestHelper;

@BeforeEach
public void setupCatalogHelper(AmoroCatalogTestHelper<?> helper) throws IOException {
this.catalogTestHelper = helper;
String path = temp.getPath();
catalogTestHelper.initWarehouse(path);
this.amoroCatalog = catalogTestHelper.amoroCatalog();
this.originalCatalog = catalogTestHelper.originalCatalog();
}

protected abstract void createDatabase(String dbName);
Expand All @@ -48,55 +56,49 @@ protected abstract void createTable(

protected abstract List<String> listDatabases();

@Test
public void testListDatabases() {
protected void testListDatabases() {
createDatabase(DB1);
createDatabase(DB2);
createDatabase(DB3);
HashSet<String> databases = Sets.newHashSet(amoroCatalog.listDatabases());
Assert.assertTrue(databases.contains(DB1));
Assert.assertTrue(databases.contains(DB2));
Assert.assertTrue(databases.contains(DB3));
Assertions.assertTrue(databases.contains(DB1));
Assertions.assertTrue(databases.contains(DB2));
Assertions.assertTrue(databases.contains(DB3));
}

@Test
public void testDropDatabases() {
protected void testDropDatabases() {
createDatabase(DB1);
amoroCatalog.dropDatabase(DB1);

Assert.assertFalse(amoroCatalog.listDatabases().contains(DB1));
Assertions.assertFalse(amoroCatalog.listDatabases().contains(DB1));
}

@Test
public void testCreateDatabases() {
protected void testCreateDatabases() {
amoroCatalog.createDatabase(DB1);
Assert.assertTrue(listDatabases().contains(DB1));
Assertions.assertTrue(listDatabases().contains(DB1));
}

@Test
public void testExistsDatabase() {
protected void testExistsDatabase() {
createDatabase(DB1);
Assert.assertTrue(amoroCatalog.databaseExists(DB1));
Assertions.assertTrue(amoroCatalog.databaseExists(DB1));
}

@Test
public void testExistsTable() {
protected void testExistsTable() {
createDatabase(DB1);
createTable(DB1, TABLE, new HashMap<>());
Assert.assertTrue(amoroCatalog.tableExists(DB1, TABLE));
Assertions.assertTrue(amoroCatalog.tableExists(DB1, TABLE));
}

@Test
public void testLoadTable() {
protected void testLoadTable() {
createDatabase(DB1);
Map<String, String> properties = new HashMap<>();
properties.put("key1", "value1");
createTable(DB1, TABLE, properties);
AmoroTable<?> amoroTable = amoroCatalog.loadTable(DB1, TABLE);
Assert.assertEquals(amoroTable.properties().get("key1"), "value1");
Assert.assertEquals(
amoroTable.name(), catalogTestHelper.catalogName() + "." + DB1 + "." + TABLE);
Assert.assertEquals(
amoroTable.id(), TableIdentifier.of(catalogTestHelper.catalogName(), DB1, TABLE));
Assertions.assertEquals("value1", amoroTable.properties().get("key1"));
Assertions.assertEquals(
catalogTestHelper.catalogName() + "." + DB1 + "." + TABLE, amoroTable.name());
Assertions.assertEquals(
TableIdentifier.of(catalogTestHelper.catalogName(), DB1, TABLE), amoroTable.id());
}
}
57 changes: 47 additions & 10 deletions amoro-format-iceberg/src/test/java/org/apache/amoro/formats/TestIcebergAmoroCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,18 @@
import org.apache.iceberg.catalog.SupportsNamespaces;
import org.apache.iceberg.catalog.TableIdentifier;
import org.apache.iceberg.types.Types;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;

@RunWith(Parameterized.class)
public class TestIcebergAmoroCatalog extends TestAmoroCatalogBase {

public TestIcebergAmoroCatalog(AmoroCatalogTestHelper<?> amoroCatalogTestHelper) {
super(amoroCatalogTestHelper);
}

@Parameterized.Parameters(name = "{0}")
public static Object[] parameters() {
return new Object[] {IcebergHadoopCatalogTestHelper.defaultHelper()};
static Stream<AmoroCatalogTestHelper<?>> parameters() {
return Stream.of(IcebergHadoopCatalogTestHelper.defaultHelper());
}

@Override
Expand Down Expand Up @@ -79,4 +74,46 @@ protected List<String> listDatabases() {
private Catalog catalog() {
return (Catalog) originalCatalog;
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testListDatabases(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testListDatabases();
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testDropDatabases(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testDropDatabases();
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testCreateDatabases(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testCreateDatabases();
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testExistsDatabase(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testExistsDatabase();
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testExistsTable(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testExistsTable();
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testLoadTable(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testLoadTable();
}
}
57 changes: 47 additions & 10 deletions ...-format-iceberg/src/test/java/org/apache/amoro/formats/TestMixedIcebergFormatCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,17 @@
import org.apache.amoro.table.TableIdentifier;
import org.apache.iceberg.Schema;
import org.apache.iceberg.types.Types;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;

import java.util.List;
import java.util.Map;
import java.util.stream.Stream;

@RunWith(Parameterized.class)
public class TestMixedIcebergFormatCatalog extends TestAmoroCatalogBase {

public TestMixedIcebergFormatCatalog(AmoroCatalogTestHelper<?> amoroCatalogTestHelper) {
super(amoroCatalogTestHelper);
}

@Parameterized.Parameters(name = "{0}")
public static Object[] parameters() {
return new Object[] {MixedIcebergHadoopCatalogTestHelper.defaultHelper()};
static Stream<AmoroCatalogTestHelper<?>> parameters() {
return Stream.of(MixedIcebergHadoopCatalogTestHelper.defaultHelper());
}

@Override
Expand Down Expand Up @@ -65,4 +60,46 @@ protected List<String> listDatabases() {
private MixedFormatCatalog catalog() {
return (MixedFormatCatalog) originalCatalog;
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testListDatabases(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testListDatabases();
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testDropDatabases(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testDropDatabases();
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testCreateDatabases(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testCreateDatabases();
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testExistsDatabase(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testExistsDatabase();
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testExistsTable(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testExistsTable();
}

@ParameterizedTest(name = "{0}")
@MethodSource("parameters")
public void testLoadTable(AmoroCatalogTestHelper<?> helper) throws Exception {
setupCatalogHelper(helper);
super.testLoadTable();
}
}