@@ -514,6 +514,12 @@ public class LogicalPlanBuilder extends DorisParserBaseVisitor<Object> {
514514 return pos1 .getCharPositionInLine () - pos2 .getCharPositionInLine ();
515515 });
516516
517+ private final Map <Integer , ParserRuleContext > selectHintMap ;
518+
519+ public LogicalPlanBuilder (Map <Integer , ParserRuleContext > selectHintMap ) {
520+ this .selectHintMap = selectHintMap ;
521+ }
522+
517523 @ SuppressWarnings ("unchecked" )
518524 protected <T > T typedVisit (ParseTree ctx ) {
519525 return (T ) ctx .accept (this );
@@ -1352,7 +1358,16 @@ public LogicalPlan visitRegularQuerySpecification(RegularQuerySpecificationConte
13521358 Optional .ofNullable (ctx .aggClause ()),
13531359 Optional .ofNullable (ctx .havingClause ()));
13541360 selectPlan = withQueryOrganization (selectPlan , ctx .queryOrganization ());
1355- return withSelectHint (selectPlan , selectCtx .selectHint ());
1361+ if ((selectHintMap == null ) || selectHintMap .isEmpty ()) {
1362+ return selectPlan ;
1363+ }
1364+ List <ParserRuleContext > selectHintContexts = Lists .newArrayList ();
1365+ for (Integer key : selectHintMap .keySet ()) {
1366+ if (key > selectCtx .getStart ().getStopIndex () && key < selectCtx .getStop ().getStartIndex ()) {
1367+ selectHintContexts .add (selectHintMap .get (key ));
1368+ }
1369+ }
1370+ return withSelectHint (selectPlan , selectHintContexts );
13561371 });
13571372 }
13581373
@@ -3110,67 +3125,70 @@ private LogicalPlan withJoinRelations(LogicalPlan input, RelationContext ctx) {
31103125 return last ;
31113126 }
31123127
3113- private LogicalPlan withSelectHint (LogicalPlan logicalPlan , SelectHintContext hintContext ) {
3114- if (hintContext == null ) {
3128+ private LogicalPlan withSelectHint (LogicalPlan logicalPlan , List < ParserRuleContext > hintContexts ) {
3129+ if (hintContexts . isEmpty () ) {
31153130 return logicalPlan ;
31163131 }
31173132 Map <String , SelectHint > hints = Maps .newLinkedHashMap ();
3118- for (HintStatementContext hintStatement : hintContext .hintStatements ) {
3119- String hintName = hintStatement .hintName .getText ().toLowerCase (Locale .ROOT );
3120- switch (hintName ) {
3121- case "set_var" :
3122- Map <String , Optional <String >> parameters = Maps .newLinkedHashMap ();
3123- for (HintAssignmentContext kv : hintStatement .parameters ) {
3124- if (kv .key != null ) {
3125- String parameterName = visitIdentifierOrText (kv .key );
3126- Optional <String > value = Optional .empty ();
3127- if (kv .constantValue != null ) {
3128- Literal literal = (Literal ) visit (kv .constantValue );
3129- value = Optional .ofNullable (literal .toLegacyLiteral ().getStringValue ());
3130- } else if (kv .identifierValue != null ) {
3131- // maybe we should throw exception when the identifierValue is quoted identifier
3132- value = Optional .ofNullable (kv .identifierValue .getText ());
3133+ for (ParserRuleContext hintContext : hintContexts ) {
3134+ SelectHintContext selectHintContext = (SelectHintContext ) hintContext ;
3135+ for (HintStatementContext hintStatement : selectHintContext .hintStatements ) {
3136+ String hintName = hintStatement .hintName .getText ().toLowerCase (Locale .ROOT );
3137+ switch (hintName ) {
3138+ case "set_var" :
3139+ Map <String , Optional <String >> parameters = Maps .newLinkedHashMap ();
3140+ for (HintAssignmentContext kv : hintStatement .parameters ) {
3141+ if (kv .key != null ) {
3142+ String parameterName = visitIdentifierOrText (kv .key );
3143+ Optional <String > value = Optional .empty ();
3144+ if (kv .constantValue != null ) {
3145+ Literal literal = (Literal ) visit (kv .constantValue );
3146+ value = Optional .ofNullable (literal .toLegacyLiteral ().getStringValue ());
3147+ } else if (kv .identifierValue != null ) {
3148+ // maybe we should throw exception when the identifierValue is quoted identifier
3149+ value = Optional .ofNullable (kv .identifierValue .getText ());
3150+ }
3151+ parameters .put (parameterName , value );
31333152 }
3134- parameters .put (parameterName , value );
31353153 }
3136- }
3137- hints . put ( hintName , new SelectHintSetVar ( hintName , parameters )) ;
3138- break ;
3139- case "leading" :
3140- List < String > leadingParameters = new ArrayList < String >();
3141- for ( HintAssignmentContext kv : hintStatement . parameters ) {
3142- if (kv .key != null ) {
3143- String parameterName = visitIdentifierOrText ( kv . key );
3144- leadingParameters . add ( parameterName );
3154+ hints . put ( hintName , new SelectHintSetVar ( hintName , parameters ));
3155+ break ;
3156+ case "leading" :
3157+ List < String > leadingParameters = new ArrayList < String >();
3158+ for ( HintAssignmentContext kv : hintStatement . parameters ) {
3159+ if ( kv . key != null ) {
3160+ String parameterName = visitIdentifierOrText (kv .key );
3161+ leadingParameters . add ( parameterName );
3162+ }
31453163 }
3146- }
3147- hints . put ( hintName , new SelectHintLeading ( hintName , leadingParameters )) ;
3148- break ;
3149- case "ordered" :
3150- hints . put ( hintName , new SelectHintOrdered ( hintName )) ;
3151- break ;
3152- case "use_cbo_rule" :
3153- List < String > useRuleParameters = new ArrayList < String >();
3154- for ( HintAssignmentContext kv : hintStatement . parameters ) {
3155- if (kv .key != null ) {
3156- String parameterName = visitIdentifierOrText ( kv . key );
3157- useRuleParameters . add ( parameterName );
3164+ hints . put ( hintName , new SelectHintLeading ( hintName , leadingParameters ));
3165+ break ;
3166+ case "ordered" :
3167+ hints . put ( hintName , new SelectHintOrdered ( hintName ));
3168+ break ;
3169+ case "use_cbo_rule" :
3170+ List < String > useRuleParameters = new ArrayList < String >();
3171+ for ( HintAssignmentContext kv : hintStatement . parameters ) {
3172+ if ( kv . key != null ) {
3173+ String parameterName = visitIdentifierOrText (kv .key );
3174+ useRuleParameters . add ( parameterName );
3175+ }
31583176 }
3159- }
3160- hints . put ( hintName , new SelectHintUseCboRule ( hintName , useRuleParameters , false )) ;
3161- break ;
3162- case "no_use_cbo_rule" :
3163- List < String > noUseRuleParameters = new ArrayList < String >();
3164- for ( HintAssignmentContext kv : hintStatement . parameters ) {
3165- String parameterName = visitIdentifierOrText (kv .key );
3166- if ( kv . key != null ) {
3167- noUseRuleParameters . add ( parameterName );
3177+ hints . put ( hintName , new SelectHintUseCboRule ( hintName , useRuleParameters , false ));
3178+ break ;
3179+ case "no_use_cbo_rule" :
3180+ List < String > noUseRuleParameters = new ArrayList < String >();
3181+ for ( HintAssignmentContext kv : hintStatement . parameters ) {
3182+ String parameterName = visitIdentifierOrText ( kv . key );
3183+ if (kv .key != null ) {
3184+ noUseRuleParameters . add ( parameterName );
3185+ }
31683186 }
3169- }
3170- hints . put ( hintName , new SelectHintUseCboRule ( hintName , noUseRuleParameters , true )) ;
3171- break ;
3172- default :
3173- break ;
3187+ hints . put ( hintName , new SelectHintUseCboRule ( hintName , noUseRuleParameters , true ));
3188+ break ;
3189+ default :
3190+ break ;
3191+ }
31743192 }
31753193 }
31763194 return new LogicalSelectHint <>(hints , logicalPlan );
0 commit comments