diff --git a/docs/category.json b/docs/category.json index 684ff35873..9c929729ff 100644 --- a/docs/category.json +++ b/docs/category.json @@ -1,18 +1,7 @@ { "bash": [ - "experiment/ppl/interfaces/endpoint.rst", - "experiment/ppl/interfaces/protocol.rst", - "experiment/ppl/admin/settings.rst" ], "ppl_cli": [ - "experiment/ppl/cmd/dedup.rst", - "experiment/ppl/cmd/eval.rst", - "experiment/ppl/cmd/fields.rst", - "experiment/ppl/cmd/rename.rst", - "experiment/ppl/cmd/search.rst", - "experiment/ppl/cmd/sort.rst", - "experiment/ppl/cmd/stats.rst", - "experiment/ppl/cmd/where.rst" ], "sql_cli": [ "user/dql/expressions.rst", diff --git a/integ-test/build.gradle b/integ-test/build.gradle index 622497dcf2..d6702b564e 100644 --- a/integ-test/build.gradle +++ b/integ-test/build.gradle @@ -117,6 +117,9 @@ task integTestWithNewEngine(type: RestIntegTestTask) { // Skip old semantic analyzer IT because analyzer in new engine has different behavior exclude 'com/amazon/opendistroforelasticsearch/sql/legacy/QueryAnalysisIT.class' + + // Exclude PPL + exclude 'com/amazon/opendistroforelasticsearch/sql/ppl/**' } } diff --git a/plugin/src/main/java/com/amazon/opendistroforelasticsearch/sql/plugin/SQLPlugin.java b/plugin/src/main/java/com/amazon/opendistroforelasticsearch/sql/plugin/SQLPlugin.java index f299fee22a..366bed6495 100644 --- a/plugin/src/main/java/com/amazon/opendistroforelasticsearch/sql/plugin/SQLPlugin.java +++ b/plugin/src/main/java/com/amazon/opendistroforelasticsearch/sql/plugin/SQLPlugin.java @@ -25,8 +25,6 @@ import com.amazon.opendistroforelasticsearch.sql.legacy.plugin.RestSqlSettingsAction; import com.amazon.opendistroforelasticsearch.sql.legacy.plugin.RestSqlStatsAction; import com.amazon.opendistroforelasticsearch.sql.legacy.plugin.SqlSettings; -import com.amazon.opendistroforelasticsearch.sql.plugin.rest.RestPPLQueryAction; -import com.amazon.opendistroforelasticsearch.sql.plugin.rest.RestPPLStatsAction; import com.google.common.collect.ImmutableList; import java.util.Arrays; import java.util.Collection; @@ -98,11 +96,9 @@ public List getRestHandlers(Settings settings, RestController restC Metrics.getInstance().registerDefaultMetrics(); return Arrays.asList( - new RestPPLQueryAction(restController, clusterService, pluginSettings, settings), new RestSqlAction(settings, clusterService, pluginSettings), new RestSqlStatsAction(settings, restController), - new RestSqlSettingsAction(settings, restController), - new RestPPLStatsAction(settings, restController) + new RestSqlSettingsAction(settings, restController) ); }