[kyuubi] branch branch-1.8 updated: [KYUUBI #4916][1.8] Fix Iceberg merge into UT

[bowenliang]

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

bowenliang pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/kyuubi.git


The following commit(s) were added to refs/heads/branch-1.8 by this push:
     new 192e4d222 [KYUUBI #4916][1.8] Fix Iceberg merge into UT
192e4d222 is described below

commit 192e4d22267d0970f6bdee31a7bb73cd914869ba
Author: sychen <syc...@ctrip.com>
AuthorDate: Wed Oct 18 21:22:28 2023 +0800

    [KYUUBI #4916][1.8] Fix Iceberg merge into UT
    
    ### _Why are the changes needed?_
    
    https://github.com/apache/kyuubi/pull/4916#issuecomment-1765708058
    
    https://github.com/apache/kyuubi/actions/runs/6543038657/job/17766954555
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including 
negative and positive cases if possible
    
    - [ ] Add screenshots for manual tests if appropriate
    
    - [ ] [Run 
test](https://kyuubi.readthedocs.io/en/master/contributing/code/testing.html#running-tests)
 locally before make a pull request
    
    ### _Was this patch authored or co-authored using generative AI tooling?_
    No
    
    Closes #5459 from cxzl25/fix_iceberg_merge_into_ut_1.8.
    
    Closes #4916
    
    be42adcf3 [sychen] relace 1.9.0-SNAPSHOT
    cef8f67f2 [sychen] fix
    
    Authored-by: sychen <syc...@ctrip.com>
    Signed-off-by: liangbowen <liangbo...@gf.com.cn>
---
 extensions/spark/kyuubi-extension-spark-3-5/pom.xml                     | 2 +-
 .../spark/authz/ranger/IcebergCatalogRangerSparkExtensionSuite.scala    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/spark/kyuubi-extension-spark-3-5/pom.xml 
b/extensions/spark/kyuubi-extension-spark-3-5/pom.xml
index e78a88a80..d0cfe2885 100644
--- a/extensions/spark/kyuubi-extension-spark-3-5/pom.xml
+++ b/extensions/spark/kyuubi-extension-spark-3-5/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.kyuubi</groupId>
         <artifactId>kyuubi-parent</artifactId>
-        <version>1.9.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git 
a/extensions/spark/kyuubi-spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/ranger/IcebergCatalogRangerSparkExtensionSuite.scala
 
b/extensions/spark/kyuubi-spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/ranger/IcebergCatalogRangerSparkExtensionSuite.scala
index 64834b24d..b578588d2 100644
--- 
a/extensions/spark/kyuubi-spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/ranger/IcebergCatalogRangerSparkExtensionSuite.scala
+++ 
b/extensions/spark/kyuubi-spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/ranger/IcebergCatalogRangerSparkExtensionSuite.scala
@@ -94,7 +94,7 @@ class IcebergCatalogRangerSparkExtensionSuite extends 
RangerSparkExtensionSuite
   test("[KYUUBI #3515] MERGE INTO") {
     val mergeIntoSql =
       s"""
-         |MERGE INTO $catalogV2.$namespace1.$outputTable1 AS target
+         |MERGE INTO $catalogV2.$bobNamespace.$bobSelectTable AS target
          |USING $catalogV2.$namespace1.$table1  AS source
          |ON target.id = source.id
          |WHEN MATCHED AND (target.name='delete') THEN DELETE