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

kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 15a5d3d068 fix case test_external_catalog_es (#23848)
15a5d3d068 is described below

commit 15a5d3d068fa2da091fe4f6d4cb369e124b0c7aa
Author: zhangguoqiang <18372634...@163.com>
AuthorDate: Mon Sep 4 16:26:13 2023 +0800

    fix case test_external_catalog_es (#23848)
---
 .../external_table_p2/es/test_external_catalog_es.out  | 12 ++++++++++++
 .../es/test_external_catalog_es.groovy                 | 18 +++---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git 
a/regression-test/data/external_table_p2/es/test_external_catalog_es.out 
b/regression-test/data/external_table_p2/es/test_external_catalog_es.out
new file mode 100644
index 0000000000..3f61e7c809
--- /dev/null
+++ b/regression-test/data/external_table_p2/es/test_external_catalog_es.out
@@ -0,0 +1,12 @@
+-- This file is automatically generated. You should know what you did if you 
want to edit this
+-- !sql --
+\N  \N  \N  \N  \N  \N  \N  \N  \N  \N  
{"properties":{"account_number":{"type":"long"},"firstname":{"type":"text"},"address":{"type":"text"},"balance":{"type":"long"},"gender":{"type":"text"},"city":{"type":"text"},"employer":{"type":"text"},"state":{"type":"text"},"age":{"type":"text"},"email":{"type":"text"},"lastname":{"type":"text"}}}
   {"index":{"number_of_shards":5,"number_of_replicas":1}} \N
+0   244 Columbus Place  29  16623   Hobucken    bradshawmcken...@euron.com  
Euron   Bradshaw    F   Mckenzie    \N  \N  CO
+1   880 Holmes Lane 32  39225   Brogan  amberd...@pyrami.com    Pyrami  Amber  
 M   Duke    \N  \N  IL
+2   560 Kingsway Place  22  28838   Bennett robertaben...@chillium.com  
Chillium    Roberta F   Bender  \N  \N  LA
+3   328 Wilson Avenue   26  44947   Cochranville    levinebu...@amtap.com   
Amtap   Levine  F   Burks   \N  \N  HI
+4   986 Wyckoff Avenue  31  27658   Eastvale    rodriquezflo...@tourmania.com  
 Tourmania   Rodriquez   F   Flores  \N  \N  HI
+5   311 Elm Place   30  29342   Fairview    leolastew...@diginetic.com  
Diginetic   Leola   F   Stewart \N  \N  NJ
+6   671 Bristol Street  36  5686    Dante   hattieb...@netagy.com   Netagy  
Hattie  M   Bond    \N  \N  TN
+7   820 Logan Street    22  39121   Shrewsbury  levyrich...@teraprene.com   
Teraprene   Levy    M   Richard \N  \N  MO
+8   699 Visitation Place    35  48868   Wakulla janbu...@glasstep.com   
Glasstep    Jan M   Burns   \N  \N  AZ
diff --git 
a/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy 
b/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy
index ed7f853c97..6e1cf4e0d8 100644
--- 
a/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy
+++ 
b/regression-test/suites/external_table_p2/es/test_external_catalog_es.groovy
@@ -25,7 +25,6 @@ suite("test_external_catalog_es", "p2") {
         String extEsPassword = context.config.otherConfigs.get("extEsPassword")
         String esCatalogName ="es7_catalog_name"
 
-        String jdbcPg14Database1 = "jdbc_es_14_database1"
         String jdbcPg14Table1 = "accounts"
 
         sql """drop catalog if exists ${esCatalogName}"""
@@ -36,24 +35,13 @@ suite("test_external_catalog_es", "p2") {
                     "elasticsearch.hosts"="http://${extEsHost}:${extEsPort}";,
                     "elasticsearch.nodes_discovery"="false",
                     "elasticsearch.username"="${extEsUser}",
-                    "elasticsearch.username"="${extEsPassword}"
+                    "elasticsearch.password"="${extEsPassword}"
             );
             """
 
-        sql """
-            SWITCH ${esCatalogName};
-            """
-        sql """
-            SHOW DATABASES;
-            """
-
-        def res1=sql "select * from ${jdbcPg14Table1} limit 10;"
-        logger.info("recoding all: " + res1.toString())
-
-        sql """drop table if exists ${jdbcPg14Table1};"""
-        sql """drop database if exists ${jdbcPg14Database1};"""
+        qt_sql "select * from ${esCatalogName}.default_db.${jdbcPg14Table1} 
order by account_number limit 10;"
 
-        sql """switch internal;"""
+        sql """drop catalog if exists ${esCatalogName};"""
 
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to