This is an automated email from the ASF dual-hosted git repository.

jshao pushed a commit to branch branch-1.1
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/branch-1.1 by this push:
     new 4685ff3c4b [Cherry-pick to branch-1.1] [#9648] fix(test): Replace 
direct column assertion with Awaitility as schema changes in `StarRocks` and 
`Doris` are asynchronous (#9942) (#9948)
4685ff3c4b is described below

commit 4685ff3c4b80ec053e010c4bcf05ce1389ad0336
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Feb 11 10:58:05 2026 +0800

    [Cherry-pick to branch-1.1] [#9648] fix(test): Replace direct column 
assertion with Awaitility as schema changes in `StarRocks` and `Doris` are 
asynchronous (#9942) (#9948)
    
    **Cherry-pick Information:**
    - Original commit: 9624f699f0946edfeb7cbb61766b23ef600b820e
    - Target branch: `branch-1.1`
    - Status: ✅ Clean cherry-pick (no conflicts)
    
    Co-authored-by: Qi Yu <[email protected]>
---
 .../catalog/doris/integration/test/CatalogDorisIT.java       | 12 ++++++++----
 .../starrocks/integration/test/CatalogStarRocksIT.java       | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git 
a/catalogs/catalog-jdbc-doris/src/test/java/org/apache/gravitino/catalog/doris/integration/test/CatalogDorisIT.java
 
b/catalogs/catalog-jdbc-doris/src/test/java/org/apache/gravitino/catalog/doris/integration/test/CatalogDorisIT.java
index 977fbfdf29..873da114e0 100644
--- 
a/catalogs/catalog-jdbc-doris/src/test/java/org/apache/gravitino/catalog/doris/integration/test/CatalogDorisIT.java
+++ 
b/catalogs/catalog-jdbc-doris/src/test/java/org/apache/gravitino/catalog/doris/integration/test/CatalogDorisIT.java
@@ -564,10 +564,14 @@ public class CatalogDorisIT extends BaseIT {
         .pollInterval(WAIT_INTERVAL_IN_SECONDS, TimeUnit.SECONDS)
         .untilAsserted(
             () -> assertEquals(5, 
tableCatalog.loadTable(tableIdentifier).columns().length));
-
-    ITUtils.assertColumn(
-        Column.of("col_5", Types.VarCharType.of(255), "col_5_comment"),
-        tableCatalog.loadTable(tableIdentifier).columns()[4]);
+    Awaitility.await()
+        .atMost(MAX_WAIT_IN_SECONDS, TimeUnit.SECONDS)
+        .pollInterval(WAIT_INTERVAL_IN_SECONDS, TimeUnit.SECONDS)
+        .untilAsserted(
+            () ->
+                ITUtils.assertColumn(
+                    Column.of("col_5", Types.VarCharType.of(255), 
"col_5_comment"),
+                    tableCatalog.loadTable(tableIdentifier).columns()[4]));
 
     // change column position
     // TODO: change column position is unstable, add it later
diff --git 
a/catalogs/catalog-jdbc-starrocks/src/test/java/org/apache/gravitino/catalog/starrocks/integration/test/CatalogStarRocksIT.java
 
b/catalogs/catalog-jdbc-starrocks/src/test/java/org/apache/gravitino/catalog/starrocks/integration/test/CatalogStarRocksIT.java
index a41e92adea..36cd22b723 100644
--- 
a/catalogs/catalog-jdbc-starrocks/src/test/java/org/apache/gravitino/catalog/starrocks/integration/test/CatalogStarRocksIT.java
+++ 
b/catalogs/catalog-jdbc-starrocks/src/test/java/org/apache/gravitino/catalog/starrocks/integration/test/CatalogStarRocksIT.java
@@ -530,10 +530,14 @@ public class CatalogStarRocksIT extends BaseIT {
         .pollInterval(WAIT_INTERVAL_IN_SECONDS, TimeUnit.SECONDS)
         .untilAsserted(
             () -> assertEquals(5, 
tableCatalog.loadTable(tableIdentifier).columns().length));
-
-    ITUtils.assertColumn(
-        Column.of("col_5", Types.VarCharType.of(255), "col_5_comment"),
-        tableCatalog.loadTable(tableIdentifier).columns()[4]);
+    Awaitility.await()
+        .atMost(MAX_WAIT_IN_SECONDS, TimeUnit.SECONDS)
+        .pollInterval(WAIT_INTERVAL_IN_SECONDS, TimeUnit.SECONDS)
+        .untilAsserted(
+            () ->
+                ITUtils.assertColumn(
+                    Column.of("col_5", Types.VarCharType.of(255), 
"col_5_comment"),
+                    tableCatalog.loadTable(tableIdentifier).columns()[4]));
 
     // change column position
     // TODO: change column position is unstable, add it later

Reply via email to