[Core] Fix duplicated column names in DS test (apache#7457)

mskapilks · Oct 10, 2024 · c86757c · c86757c
1 parent 29f05f3
commit c86757c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/tools/gluten-it/common/src/main/resources/tpcds-queries/q39a.sql b/tools/gluten-it/common/src/main/resources/tpcds-queries/q39a.sql
@@ -14,8 +14,17 @@ with inv as
         and d_year =1998
       group by w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy) foo
  where case mean when 0 then 0 else stdev/mean end > 1)
-select inv1.w_warehouse_sk,inv1.i_item_sk,inv1.d_moy,inv1.mean, inv1.cov
-        ,inv2.w_warehouse_sk,inv2.i_item_sk,inv2.d_moy,inv2.mean, inv2.cov
+select 
+       inv1.w_warehouse_sk as inv1_w_warehouse_sk,
+       inv1.i_item_sk as inv1_i_item_sk,
+       inv1.d_moy as inv1_d_moy ,
+       inv1.mean as inv1_mean,
+       inv1.cov as inv1_cov,
+       inv2.w_warehouse_sk as inv2_w_warehouse_sk,
+       inv2.i_item_sk as inv2_i_item_sk,
+       inv2.d_moy as inv2_d_moy,
+       inv2.mean as inv2_mean,
+       inv2.cov as inv2_cov 
 from inv inv1,inv inv2
 where inv1.i_item_sk = inv2.i_item_sk
   and inv1.w_warehouse_sk =  inv2.w_warehouse_sk

diff --git a/tools/gluten-it/common/src/main/resources/tpcds-queries/q39b.sql b/tools/gluten-it/common/src/main/resources/tpcds-queries/q39b.sql
@@ -14,8 +14,17 @@ with inv as
         and d_year =1998
       group by w_warehouse_name,w_warehouse_sk,i_item_sk,d_moy) foo
  where case mean when 0 then 0 else stdev/mean end > 1)
-select inv1.w_warehouse_sk,inv1.i_item_sk,inv1.d_moy,inv1.mean, inv1.cov
-        ,inv2.w_warehouse_sk,inv2.i_item_sk,inv2.d_moy,inv2.mean, inv2.cov
+select 
+       inv1.w_warehouse_sk as inv1_w_warehouse_sk,
+       inv1.i_item_sk as inv1_i_item_sk,
+       inv1.d_moy as inv1_d_moy ,
+       inv1.mean as inv1_mean,
+       inv1.cov as inv1_cov,
+       inv2.w_warehouse_sk as inv2_w_warehouse_sk,
+       inv2.i_item_sk as inv2_i_item_sk,
+       inv2.d_moy as inv2_d_moy,
+       inv2.mean as inv2_mean,
+       inv2.cov as inv2_cov 
 from inv inv1,inv inv2
 where inv1.i_item_sk = inv2.i_item_sk
   and inv1.w_warehouse_sk =  inv2.w_warehouse_sk

diff --git a/tools/gluten-it/common/src/main/resources/tpcds-queries/q64.sql b/tools/gluten-it/common/src/main/resources/tpcds-queries/q64.sql
@@ -103,8 +103,8 @@ select cs1.product_name
      ,cs2.s1 as s12
      ,cs2.s2 as s22
      ,cs2.s3 as s32
-     ,cs2.syear
-     ,cs2.cnt
+     ,cs2.syear as cs2_syear
+     ,cs2.cnt as cs2_cnt
 from cross_sales cs1,cross_sales cs2
 where cs1.item_sk=cs2.item_sk and
      cs1.syear = 2000 and