Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,16 @@ class GlutenFunctionValidateSuite extends GlutenClickHouseWholeStageTransformerS
}
}

test("Test get_json_object 13") {
val sql =
"""
|SELECT
| explode(array(get_json_object(get_json_object('{"a": "{\\\"b\\\":1}"}', '$.a'), '$.b')))
| from range(1)
|""".stripMargin
runQueryAndCompare(sql) { df => }
}

test("GLUTEN-8557: Optimize nested and/or") {
def checkFlattenedFunctions(plan: SparkPlan, functionName: String, argNum: Int): Boolean = {

Expand Down
5 changes: 4 additions & 1 deletion cpp-ch/local-engine/Parser/RelParsers/ProjectRelParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@ DB::QueryPlanPtr ProjectRelParser::parseReplicateRows(DB::QueryPlanPtr query_pla
DB::QueryPlanPtr
ProjectRelParser::parseGenerate(DB::QueryPlanPtr query_plan, const substrait::Rel & rel, std::list<const substrait::Rel *> & /*rel_stack_*/)
{
const auto & generate_rel = rel.generate();
ExpressionsRewriter rewriter(parser_context);
substrait::Rel final_rel = rel;
rewriter.rewrite(final_rel);
const auto & generate_rel = final_rel.generate();
if (isReplicateRows(generate_rel))
{
return parseReplicateRows(std::move(query_plan), generate_rel);
Expand Down
23 changes: 19 additions & 4 deletions cpp-ch/local-engine/Rewriter/ExpressionRewriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ class GetJsonObjectFunctionWriter : public RelRewriter

void rewrite(substrait::Rel & rel) override
{
if (!rel.has_filter() && !rel.has_project())
{
return;
}
prepare(rel);
rewriteImpl(rel);
}
Expand All @@ -64,6 +60,14 @@ class GetJsonObjectFunctionWriter : public RelRewriter
prepareOnExpression(expr);
}
}
if (rel.has_generate())
{
for (auto & expr : rel.generate().child_output())
{
prepareOnExpression(expr);
}
prepareOnExpression(rel.generate().generator());
}
}

void rewriteImpl(substrait::Rel & rel)
Expand All @@ -84,6 +88,17 @@ class GetJsonObjectFunctionWriter : public RelRewriter
rewriteExpression(*expr);
}
}
if (rel.has_generate())
{
auto * generate = rel.mutable_generate();
auto * child_outputs = generate->mutable_child_output();
for (int i = 0; i < child_outputs->size(); ++i)
{
auto * expr = child_outputs->Mutable(i);
rewriteExpression(*expr);
}
rewriteExpression(*generate->mutable_generator());
}
}
void prepareOnExpression(const substrait::Expression & expr)
{
Expand Down