From 2d8bd551709e18343d39cc65395a746a914ae8e9 Mon Sep 17 00:00:00 2001
From: Yi Xie <xieyi01@rd.netease.com>
Date: Wed, 8 Nov 2023 17:59:14 +0800
Subject: [PATCH] change for master conflict

---
 .../netease/arctic/flink/catalog/TestCatalog.java   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestCatalog.java b/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestCatalog.java
index fa680dec42..4f798acbb9 100644
--- a/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestCatalog.java
+++ b/flink/flink-common/src/test/java/com/netease/arctic/flink/catalog/TestCatalog.java
@@ -100,7 +100,7 @@ public void before() throws Exception {
   public void after() {
     sql("DROP TABLE " + CATALOG + "." + DB + "." + TABLE);
     sql("DROP DATABASE " + CATALOG + "." + DB);
-    Assert.assertTrue(CollectionUtil.isNullOrEmpty(getCatalog().listDatabases()));
+    Assert.assertTrue(CollectionUtil.isNullOrEmpty(getMixedFormatCatalog().listDatabases()));
     sql("USE CATALOG default_catalog");
     sql("DROP CATALOG " + CATALOG);
   }
@@ -127,7 +127,9 @@ public void testDDL() throws IOException {
     sql("SHOW tables");
 
     Assert.assertTrue(
-        getCatalog().loadTable(TableIdentifier.of(TEST_CATALOG_NAME, DB, TABLE)).isKeyedTable());
+        getMixedFormatCatalog()
+            .loadTable(TableIdentifier.of(TEST_CATALOG_NAME, DB, TABLE))
+            .isKeyedTable());
   }
 
   @Test
@@ -157,7 +159,7 @@ public void testDDLWithVirtualColumn() throws IOException {
             + ")");
 
     Map<String, String> properties =
-        getCatalog().loadTable(TableIdentifier.of(TEST_CATALOG_NAME, DB, TABLE)).properties();
+        getMixedFormatCatalog().loadTable(TableIdentifier.of(TEST_CATALOG_NAME, DB, TABLE)).properties();
 
     // index for compute columns
     int[] computedIndex = {3, 4, 5};
@@ -242,7 +244,7 @@ public void testReadNotMatchColumn() throws IOException {
             + ")");
 
     ArcticTable amoroTable =
-        getCatalog().loadTable(TableIdentifier.of(TEST_CATALOG_NAME, DB, TABLE));
+        getMixedFormatCatalog().loadTable(TableIdentifier.of(TEST_CATALOG_NAME, DB, TABLE));
     String beforeExpr =
         amoroTable.properties().get(compoundKey(FLINK_PREFIX, COMPUTED_COLUMNS, 2, EXPR));
     // change property "flink.computed-column.2.expr" from "`id` +5" to "`newId` +5"
@@ -258,8 +260,7 @@ public void testReadNotMatchColumn() throws IOException {
 
     // can't get table
     testGetTable(false);
-    getCatalog()
-        .loadTable(TableIdentifier.of(TEST_CATALOG_NAME, DB, TABLE))
+    amoroTable
         .updateProperties()
         .set(compoundKey(FLINK_PREFIX, COMPUTED_COLUMNS, 2, EXPR), beforeExpr)
         .commit();