From 84ebacb1956f709a927c1602295393d90d2b9d3d Mon Sep 17 00:00:00 2001 From: xmy Date: Wed, 29 Nov 2023 16:09:14 +0800 Subject: [PATCH] fix --- .../execution/GlutenClickHouseTPCHParquetSuite.scala | 4 ++-- cpp-ch/local-engine/Parser/SerializedPlanParser.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetSuite.scala b/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetSuite.scala index 60eb3f6ba3f5b..c70b7c3c2aece 100644 --- a/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetSuite.scala +++ b/backends-clickhouse/src/test/scala/io/glutenproject/execution/GlutenClickHouseTPCHParquetSuite.scala @@ -2201,7 +2201,7 @@ class GlutenClickHouseTPCHParquetSuite extends GlutenClickHouseTPCHAbstractSuite withSQLConf(("spark.sql.autoBroadcastJoinThreshold", "-1")) { val sql = """ - |select t1.l_orderkey, t2.o_orderkey, t1.l_year, t2.o_year + |select t1.l_orderkey, t1.l_year, t2.o_orderkey, t2.o_year |from ( | select l_orderkey, extract(year from l_shipdate) as l_year, count(1) as l_cnt | from lineitem @@ -2212,7 +2212,7 @@ class GlutenClickHouseTPCHParquetSuite extends GlutenClickHouseTPCHAbstractSuite | group by o_orderkey, o_orderdate) t2 |on t1.l_orderkey = t2.o_orderkey | and l_year in (1997, 1995, 1993) - |order by t1.l_orderkey, t2.o_orderkey, t1.l_year, t2.o_year + |order by t1.l_orderkey, t1.l_year, t2.o_orderkey, t2.o_year |limit 100 |""".stripMargin compareResultsAgainstVanillaSpark(sql, true, { _ => }) diff --git a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp index c5f5ad06ffab8..ac909c67911d5 100644 --- a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp +++ b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp @@ -2049,8 +2049,8 @@ ASTPtr ASTParser::parseArgumentToAST(const Names & names, const substrait::Expre in_args.emplace_back(std::make_shared(type_and_field.second)); } - auto array_ast = makeASTFunction("array", in_args); - args.emplace_back(array_ast); + auto set_ast = makeASTFunction("set", in_args); + args.emplace_back(set_ast); auto ast = makeASTFunction("in", args); if (nullable)