Skip to content

Commit

Permalink
Fix cherry-pick
Browse files Browse the repository at this point in the history
  • Loading branch information
stdpain authored and wanpengfei-git committed Aug 16, 2022
1 parent 110e86a commit f6a7f1f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
1 change: 1 addition & 0 deletions be/src/exec/pipeline/analysis/analytic_sink_operator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ Status AnalyticSinkOperator::push_chunk(RuntimeState* state, const vectorized::C

_analytor->input_chunks().emplace_back(chunk);

RETURN_IF_ERROR((this->*_process_by_partition_if_necessary)());
return _analytor->check_has_error();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ public void testDecodeRewrite9Scan() throws Exception {
public void testDecodeNodeRewrite10() throws Exception {
String sql = "select upper(S_ADDRESS) as a, count(*) from supplier group by a";
String plan = getFragmentPlan(sql);
System.out.println("plan = " + plan);
Assert.assertTrue(plan.contains(" 3:Decode\n" +
" | <dict id 12> : <string id 9>"));
Assert.assertTrue(plan.contains("<function id 12> : DictExpr(11: S_ADDRESS,[upper(<place-holder>)])"));
Expand Down Expand Up @@ -910,12 +911,7 @@ public void testMultiMaxMin() throws Exception {
"min(upper(S_COMMENT)) from supplier_nullable " +
"group by upper(S_COMMENT)";
plan = getFragmentPlan(sql);
Assert.assertTrue(plan.contains(" 5:Decode\n" +
" | <dict id 17> : <string id 12>\n" +
" | <dict id 15> : <string id 9>\n" +
" | string functions:\n" +
" | <function id 17> : DictExpr(14: S_COMMENT,[upper(<place-holder>)])\n" +
" | <function id 15> : DictExpr(14: S_COMMENT,[upper(<place-holder>)])"));
Assert.assertFalse(plan.contains("Decode"));

connectContext.getSessionVariable().setNewPlanerAggStage(0);

Expand Down

0 comments on commit f6a7f1f

Please sign in to comment.