Skip to content

Commit f0dacc0

Browse files
committed
dead code cleanup
Signed-off-by: Jialiang Liang <jiallian@amazon.com>
1 parent 5891541 commit f0dacc0

5 files changed

Lines changed: 4 additions & 35 deletions

File tree

core/src/main/java/org/opensearch/sql/calcite/plan/HighlightPushable.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/CalciteLogicalIndexScan.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.apache.logging.log4j.Logger;
4343
import org.opensearch.search.aggregations.AggregationBuilder;
4444
import org.opensearch.search.aggregations.bucket.composite.CompositeAggregationBuilder;
45-
import org.opensearch.sql.calcite.plan.HighlightPushable;
4645
import org.opensearch.sql.calcite.utils.OpenSearchTypeFactory;
4746
import org.opensearch.sql.calcite.utils.PPLHintUtils;
4847
import org.opensearch.sql.common.setting.Settings;
@@ -71,7 +70,7 @@
7170

7271
/** The logical relational operator representing a scan of an OpenSearchIndex type. */
7372
@Getter
74-
public class CalciteLogicalIndexScan extends AbstractCalciteIndexScan implements HighlightPushable {
73+
public class CalciteLogicalIndexScan extends AbstractCalciteIndexScan {
7574
private static final Logger LOG = LogManager.getLogger(CalciteLogicalIndexScan.class);
7675

7776
public CalciteLogicalIndexScan(
@@ -86,7 +85,6 @@ public CalciteLogicalIndexScan(
8685
new PushDownContext(osIndex));
8786
}
8887

89-
@Override
9088
public RelNode pushDownHighlight(List<String> highlightArgs) {
9189
RelDataTypeFactory.Builder schemaBuilder = getCluster().getTypeFactory().builder();
9290
schemaBuilder.addAll(getRowType().getFieldList());

ppl/src/main/antlr/OpenSearchPPLParser.g4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,6 @@ highlightCommand
572572
highlightArg
573573
: STAR
574574
| stringLiteral
575-
| fieldExpression
576575
;
577576

578577
expandCommand

ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,10 +1294,8 @@ public UnresolvedPlan visitHighlightCommand(OpenSearchPPLParser.HighlightCommand
12941294
arg -> {
12951295
if (arg.STAR() != null) {
12961296
return "*";
1297-
} else if (arg.stringLiteral() != null) {
1298-
return StringUtils.unquoteText(arg.stringLiteral().getText());
12991297
} else {
1300-
return arg.fieldExpression().getText();
1298+
return StringUtils.unquoteText(arg.stringLiteral().getText());
13011299
}
13021300
})
13031301
.collect(Collectors.toList());

ppl/src/test/java/org/opensearch/sql/ppl/parser/AstBuilderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,8 +1125,8 @@ public void testHighlightMultipleStringLiterals() {
11251125
}
11261126

11271127
@Test
1128-
public void testHighlightFieldExpression() {
1129-
assertEqual("source=t | highlight fieldname", highlight(relation("t"), List.of("fieldname")));
1128+
public void testHighlightFieldExpressionNotSupported() {
1129+
assertThrows(SyntaxCheckException.class, () -> plan("source=t | highlight fieldname"));
11301130
}
11311131

11321132
@Test

0 commit comments

Comments
 (0)