@@ -238,7 +238,7 @@ public static Pair<List<AggregationBuilder>, OpenSearchAggregationResponseParser
238238 Set <Integer > aggPushed = aggPushedAndAggBuilder .getLeft ();
239239 AggregationBuilder pushedAggBuilder = aggPushedAndAggBuilder .getRight ();
240240 // The group-by list after removing pushed aggregations
241- groupList = groupList .stream ().filter (i -> !aggPushed .contains (i )).toList ();
241+ groupList = groupList .stream ().filter (i -> !aggPushed .contains (i )).collect ( Collectors . toList () );
242242 if (pushedAggBuilder != null ) {
243243 subBuilder = new Builder ().addAggregator (pushedAggBuilder );
244244 }
@@ -667,36 +667,47 @@ private static AutoDateHistogramAggregationBuilder analyzeAutoDateSpan(
667667 }
668668
669669 private static boolean isAutoDateSpan (RexNode rex ) {
670- return rex instanceof RexCall rexCall
671- && rexCall .getKind () == SqlKind .OTHER_FUNCTION
672- && rexCall .getOperator ().equals (WIDTH_BUCKET );
670+ if (rex instanceof RexCall ) {
671+ RexCall rexCall = (RexCall ) rex ;
672+ return rexCall .getKind () == SqlKind .OTHER_FUNCTION
673+ && rexCall .getOperator ().equals (WIDTH_BUCKET );
674+ }
675+ return false ;
673676 }
674677
675678 private static boolean isCase (RexNode rex ) {
676- return rex instanceof RexCall rexCall && rexCall .getKind () == SqlKind .CASE ;
679+ if (rex instanceof RexCall ) {
680+ RexCall rexCall = (RexCall ) rex ;
681+ return rexCall .getKind () == SqlKind .CASE ;
682+ }
683+ return false ;
677684 }
678685
679686 private static CompositeValuesSourceBuilder <?> createCompositeBucket (
680687 Integer groupIndex , Project project , AggregateAnalyzer .AggregateBuilderHelper helper ) {
681688 RexNode rex = project .getProjects ().get (groupIndex );
682689 String bucketName = project .getRowType ().getFieldNames ().get (groupIndex );
683- if (rex instanceof RexCall rexCall
684- && rexCall .getKind () == SqlKind .OTHER_FUNCTION
685- && rexCall .getOperator ().getName ().equalsIgnoreCase (BuiltinFunctionName .SPAN .name ())
686- && rexCall .getOperands ().size () == 3
687- && rexCall .getOperands ().get (0 ) instanceof RexInputRef rexInputRef
688- && rexCall .getOperands ().get (1 ) instanceof RexLiteral valueLiteral
689- && rexCall .getOperands ().get (2 ) instanceof RexLiteral unitLiteral ) {
690- return CompositeAggregationBuilder .buildHistogram (
691- bucketName ,
692- helper .inferNamedField (((RexCall ) rex ).getOperands ().get (0 )).getRootName (),
693- ((RexLiteral )((RexCall ) rex ).getOperands ().get (1 )).getValueAs (Double .class ),
694- SpanUnit .of (((RexLiteral )((RexCall ) rex ).getOperands ().get (2 )).getValueAs (String .class )),
695- MissingOrder .FIRST ,
696- helper .bucketNullable );
697- } else {
698- return createTermsSourceBuilder (bucketName , rex , helper );
690+ if (rex instanceof RexCall ) {
691+ RexCall rexCall = (RexCall ) rex ;
692+ if (rexCall .getKind () == SqlKind .OTHER_FUNCTION
693+ && rexCall .getOperator ().getName ().equalsIgnoreCase (BuiltinFunctionName .SPAN .name ())
694+ && rexCall .getOperands ().size () == 3
695+ && rexCall .getOperands ().get (0 ) instanceof RexInputRef
696+ && rexCall .getOperands ().get (1 ) instanceof RexLiteral
697+ && rexCall .getOperands ().get (2 ) instanceof RexLiteral ) {
698+ RexInputRef rexInputRef = (RexInputRef ) rexCall .getOperands ().get (0 );
699+ RexLiteral valueLiteral = (RexLiteral ) rexCall .getOperands ().get (1 );
700+ RexLiteral unitLiteral = (RexLiteral ) rexCall .getOperands ().get (2 );
701+ return CompositeAggregationBuilder .buildHistogram (
702+ bucketName ,
703+ helper .inferNamedField (rexInputRef ).getRootName (),
704+ valueLiteral .getValueAs (Double .class ),
705+ SpanUnit .of (unitLiteral .getValueAs (String .class )),
706+ MissingOrder .FIRST ,
707+ helper .bucketNullable );
708+ }
699709 }
710+ return createTermsSourceBuilder (bucketName , rex , helper );
700711 }
701712
702713 private static CompositeValuesSourceBuilder <?> createTermsSourceBuilder (
0 commit comments