瀏覽代碼

Remove support for query_binary and filter_binary

query_binary and filter_binary are unused at this point, as we only parse on the coordinating node and the java api only holds structured java objects for queries and filters, meaning they all implement Writeable and get natively serialized.

Relates to #14308
Closes #14433
javanna 10 年之前
父節點
當前提交
ce6aa258a9

+ 0 - 12
core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java

@@ -22,7 +22,6 @@ package org.elasticsearch.index.query;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParseFieldMatcher;
 import org.elasticsearch.common.ParsingException;
-import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.indices.query.IndicesQueriesRegistry;
 
@@ -76,17 +75,6 @@ public class QueryParseContext {
                     String fieldName = parser.currentName();
                     if ("query".equals(fieldName)) {
                         queryBuilder = parseInnerQueryBuilder();
-                    } else if ("query_binary".equals(fieldName) || "queryBinary".equals(fieldName)) {
-                        byte[] querySource = parser.binaryValue();
-                        XContentParser qSourceParser = XContentFactory.xContent(querySource).createParser(querySource);
-                        QueryParseContext queryParseContext = new QueryParseContext(indicesQueriesRegistry);
-                        queryParseContext.reset(qSourceParser);
-                        try {
-                            queryParseContext.parseFieldMatcher(parseFieldMatcher);
-                            queryBuilder = queryParseContext.parseInnerQueryBuilder();
-                        } finally {
-                            queryParseContext.reset(null);
-                        }
                     } else {
                         throw new ParsingException(parser.getTokenLocation(), "request does not support [" + parser.currentName() + "]");
                     }

+ 0 - 42
core/src/main/java/org/elasticsearch/search/query/FilterBinaryParseElement.java

@@ -1,42 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.elasticsearch.search.query;
-
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.index.query.ParsedQuery;
-import org.elasticsearch.search.SearchParseElement;
-import org.elasticsearch.search.internal.SearchContext;
-
-/**
- *
- */
-public class FilterBinaryParseElement implements SearchParseElement {
-
-    @Override
-    public void parse(XContentParser parser, SearchContext context) throws Exception {
-        byte[] filterSource = parser.binaryValue();
-        try (XContentParser fSourceParser = XContentFactory.xContent(filterSource).createParser(filterSource)) {
-            ParsedQuery filter = context.queryParserService().parseInnerFilter(fSourceParser);
-            if (filter != null) {
-                context.parsedPostFilter(filter);
-            }
-        }
-    }
-}

+ 0 - 39
core/src/main/java/org/elasticsearch/search/query/QueryBinaryParseElement.java

@@ -1,39 +0,0 @@
-/*
- * Licensed to Elasticsearch under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.elasticsearch.search.query;
-
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.search.SearchParseElement;
-import org.elasticsearch.search.internal.SearchContext;
-
-/**
- *
- */
-public class QueryBinaryParseElement implements SearchParseElement {
-
-    @Override
-    public void parse(XContentParser parser, SearchContext context) throws Exception {
-        byte[] querySource = parser.binaryValue();
-        try (XContentParser qSourceParser = XContentFactory.xContent(querySource).createParser(querySource)) {
-            context.parsedQuery(context.queryParserService().parse(qSourceParser));
-        }
-    }
-}

+ 0 - 4
core/src/main/java/org/elasticsearch/search/query/QueryPhase.java

@@ -90,12 +90,8 @@ public class QueryPhase implements SearchPhase {
         parseElements.put("indices_boost", new IndicesBoostParseElement());
         parseElements.put("indicesBoost", new IndicesBoostParseElement());
         parseElements.put("query", new QueryParseElement());
-        parseElements.put("queryBinary", new QueryBinaryParseElement());
-        parseElements.put("query_binary", new QueryBinaryParseElement());
         parseElements.put("post_filter", new PostFilterParseElement());
         parseElements.put("postFilter", new PostFilterParseElement());
-        parseElements.put("filterBinary", new FilterBinaryParseElement());
-        parseElements.put("filter_binary", new FilterBinaryParseElement());
         parseElements.put("sort", new SortParseElement());
         parseElements.put("trackScores", new TrackScoresParseElement());
         parseElements.put("track_scores", new TrackScoresParseElement());

+ 4 - 0
docs/reference/migration/migrate_3_0.asciidoc

@@ -117,6 +117,10 @@ Removed support for multiple highlighter names, the only supported ones are: `pl
 
 Removed support for the deprecated top level `filter` in the search api, replaced by `post_filter`.
 
+==== `query_binary` and `filter_binary` removed
+
+Removed support for the undocumented `query_binary` and `filter_binary` sections of a search request.
+
 === Parent/Child changes
 
 The `children` aggregation, parent child inner hits and `has_child` and `has_parent` queries will not work on indices