[fix](Nereids): fix ut. (#10658)

fix ut.
This commit is contained in:
jakevin
2022-07-07 12:00:47 +08:00
committed by GitHub
parent 8012d63ea0
commit a2df5beebb
2 changed files with 15 additions and 14 deletions

View File

@ -17,8 +17,8 @@
package org.apache.doris.nereids.rules.rewrite.logical;
import org.apache.doris.nereids.OptimizerContext;
import org.apache.doris.nereids.PlannerContext;
import org.apache.doris.nereids.jobs.JobContext;
import org.apache.doris.nereids.jobs.rewrite.RewriteBottomUpJob;
import org.apache.doris.nereids.memo.Memo;
import org.apache.doris.nereids.parser.NereidsParser;
@ -50,13 +50,13 @@ public class AnalyzeUtils {
private static LogicalPlan analyze(LogicalPlan inputPlan, ConnectContext connectContext) {
Memo memo = new Memo();
memo.initialize(inputPlan);
OptimizerContext optimizerContext = new OptimizerContext(memo);
PlannerContext plannerContext = new PlannerContext(optimizerContext, connectContext, new PhysicalProperties());
optimizerContext.pushJob(
new RewriteBottomUpJob(memo.getRoot(), new BindSlotReference().buildRules(), plannerContext));
optimizerContext.pushJob(
new RewriteBottomUpJob(memo.getRoot(), new BindRelation().buildRules(), plannerContext));
plannerContext.getOptimizerContext().getJobScheduler().executeJobPool(plannerContext);
PlannerContext plannerContext = new PlannerContext(memo, connectContext);
JobContext jobContext = new JobContext(plannerContext, new PhysicalProperties(), 0);
plannerContext.pushJob(
new RewriteBottomUpJob(memo.getRoot(), new BindSlotReference().buildRules(), jobContext));
plannerContext.pushJob(
new RewriteBottomUpJob(memo.getRoot(), new BindRelation().buildRules(), jobContext));
jobContext.getPlannerContext().getJobScheduler().executeJobPool(plannerContext);
return (LogicalPlan) memo.copyOut();
}
}

View File

@ -17,8 +17,8 @@
package org.apache.doris.nereids.rules.rewrite.logical;
import org.apache.doris.nereids.OptimizerContext;
import org.apache.doris.nereids.PlannerContext;
import org.apache.doris.nereids.jobs.JobContext;
import org.apache.doris.nereids.jobs.rewrite.RewriteTopDownJob;
import org.apache.doris.nereids.memo.Memo;
import org.apache.doris.nereids.operators.plans.logical.LogicalProject;
@ -26,6 +26,7 @@ import org.apache.doris.nereids.operators.plans.logical.LogicalRelation;
import org.apache.doris.nereids.properties.PhysicalProperties;
import org.apache.doris.nereids.trees.expressions.NamedExpression;
import org.apache.doris.nereids.trees.plans.Plan;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.utframe.TestWithFeService;
import com.google.common.collect.Lists;
@ -212,12 +213,12 @@ public class ColumnPruningTest extends TestWithFeService {
}
private Plan process(Memo memo) {
OptimizerContext optimizerContext = new OptimizerContext(memo);
PlannerContext plannerContext = new PlannerContext(optimizerContext, connectContext, new PhysicalProperties());
PlannerContext plannerContext = new PlannerContext(memo, new ConnectContext());
JobContext jobContext = new JobContext(plannerContext, new PhysicalProperties(), 0);
RewriteTopDownJob rewriteTopDownJob = new RewriteTopDownJob(memo.getRoot(), new ColumnPruning().buildRules(),
plannerContext);
plannerContext.getOptimizerContext().pushJob(rewriteTopDownJob);
plannerContext.getOptimizerContext().getJobScheduler().executeJobPool(plannerContext);
jobContext);
jobContext.getPlannerContext().pushJob(rewriteTopDownJob);
jobContext.getPlannerContext().getJobScheduler().executeJobPool(plannerContext);
return memo.copyOut();
}