This is an automated email from the ASF dual-hosted git repository.
liuneng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 774c66830 [GLUTEN-6124][CH]Fix json output diff (#6125)
774c66830 is described below
commit 774c66830ba813a5c6231cb1dd504cdd0c862e75
Author: KevinyhZou <[email protected]>
AuthorDate: Wed Jun 26 16:59:48 2024 +0800
[GLUTEN-6124][CH]Fix json output diff (#6125)
What changes were proposed in this pull request?
(Please fill in changes proposed in this fix)
(Fixes: #6124)
How was this patch tested?
TEST BY UT
---
.../gluten/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala | 5 +++++
cpp-ch/local-engine/Common/CHUtil.cpp | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git
a/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala
b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala
index 504015332..118f84186 100644
---
a/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala
+++
b/backends-clickhouse/src/test/scala/org/apache/gluten/execution/GlutenClickHouseTPCHSaltNullParquetSuite.scala
@@ -2048,10 +2048,15 @@ class GlutenClickHouseTPCHSaltNullParquetSuite extends
GlutenClickHouseTPCHAbstr
"""
|select to_json(struct(cast(id as string), id, 1.1, 1.1f, 1.1d)) from
range(3)
|""".stripMargin
+ val sql1 =
+ """
+ | select to_json(named_struct('name', concat('/val/', id))) from
range(3)
+ |""".stripMargin
// cast('nan' as double) output 'NaN' in Spark, 'nan' in CH
// cast('inf' as double) output 'Infinity' in Spark, 'inf' in CH
// ignore them temporarily
runQueryAndCompare(sql)(checkGlutenOperatorMatch[ProjectExecTransformer])
+ runQueryAndCompare(sql1)(checkGlutenOperatorMatch[ProjectExecTransformer])
}
test("GLUTEN-3501: test json output format with struct contains null value")
{
diff --git a/cpp-ch/local-engine/Common/CHUtil.cpp
b/cpp-ch/local-engine/Common/CHUtil.cpp
index 588cc1cb2..148e78bfb 100644
--- a/cpp-ch/local-engine/Common/CHUtil.cpp
+++ b/cpp-ch/local-engine/Common/CHUtil.cpp
@@ -672,7 +672,6 @@ void
BackendInitializerUtil::initSettings(std::map<std::string, std::string> & b
LOG_DEBUG(&Poco::Logger::get("CHUtil"), "Set settings key:{}
value:{}", key, value);
}
}
-
/// Finally apply some fixed kvs to settings.
settings.set("join_use_nulls", true);
settings.set("input_format_orc_allow_missing_columns", true);
@@ -694,6 +693,7 @@ void
BackendInitializerUtil::initSettings(std::map<std::string, std::string> & b
settings.set("output_format_json_quote_64bit_integers", false);
settings.set("output_format_json_quote_denormals", true);
settings.set("output_format_json_skip_null_value_in_named_tuples", true);
+ settings.set("output_format_json_escape_forward_slashes", false);
settings.set("function_json_value_return_type_allow_complex", true);
settings.set("function_json_value_return_type_allow_nullable", true);
settings.set("precise_float_parsing", true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
