You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/06/14 02:03:02 UTC
[26/35] lucene-solr:jira/SOLR-10834: Merge branch 'master' into
jira/SOLR-10834
Merge branch 'master' into jira/SOLR-10834
Conflicts:
solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d333f7b1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d333f7b1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d333f7b1
Branch: refs/heads/jira/SOLR-10834
Commit: d333f7b1eee10893a81532ac2f5a77a46716d90b
Parents: 15983ce 6396cb7
Author: Chris Hostetter <ho...@apache.org>
Authored: Tue Jun 13 10:28:42 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Tue Jun 13 10:28:42 2017 -0700
----------------------------------------------------------------------
dev-tools/idea/solr/solrj/src/java/solrj.iml | 3 +
.../lucene/analysis/core/TestFactories.java | 46 +++--
.../lucene/analysis/core/TestRandomChains.java | 3 +
.../lucene/analysis/ja/TestFactories.java | 46 +++--
solr/CHANGES.txt | 34 ++++
.../java/org/apache/solr/api/V2HttpCall.java | 13 +-
.../org/apache/solr/cloud/ReplaceNodeCmd.java | 96 ++++++++-
.../org/apache/solr/core/CoreContainer.java | 9 +-
.../org/apache/solr/handler/ExportWriter.java | 105 +++++++---
.../solr/handler/MoreLikeThisHandler.java | 7 +
.../org/apache/solr/handler/SchemaHandler.java | 6 +-
.../org/apache/solr/rest/BaseSolrResource.java | 6 +-
.../apache/solr/schema/DoublePointField.java | 10 +-
.../org/apache/solr/schema/FloatPointField.java | 10 +-
.../org/apache/solr/schema/IndexSchema.java | 31 ++-
.../org/apache/solr/schema/IntPointField.java | 10 +-
.../org/apache/solr/schema/LongPointField.java | 10 +-
.../apache/solr/schema/NumericFieldType.java | 88 +++++++-
.../java/org/apache/solr/schema/PointField.java | 7 +-
.../java/org/apache/solr/schema/TrieField.java | 60 +++---
.../solr/search/IGainTermsQParserPlugin.java | 5 +-
.../search/SignificantTermsQParserPlugin.java | 9 +-
.../TextLogisticRegressionQParserPlugin.java | 5 +-
.../apache/solr/servlet/SolrRequestParsers.java | 13 +-
.../apache/solr/update/AddUpdateCommand.java | 8 +-
.../solr/update/DirectUpdateHandler2.java | 3 +-
.../org/apache/solr/update/DocumentBuilder.java | 8 +-
.../AddSchemaFieldsUpdateProcessorFactory.java | 12 +-
...-schema-uniquekey-diff-type-dynamic-root.xml | 36 ++++
.../bad-schema-uniquekey-diff-type-root.xml | 35 ++++
...chema-add-schema-fields-update-processor.xml | 22 ++
.../solr/collection1/conf/schema-rest.xml | 33 ++-
.../collection1/conf/schema-sortingresponse.xml | 71 ++++++-
.../test-files/solr/collection1/conf/schema.xml | 16 +-
.../solr/collection1/conf/schema11.xml | 4 +
.../solr/collection1/conf/schema12.xml | 23 ++-
...dd-schema-fields-update-processor-chains.xml | 30 +--
.../collection1/conf/solrconfig-schemaless.xml | 6 +-
.../solr/configsets/cloud-hdfs/conf/schema.xml | 2 +-
.../conf/managed-schema | 2 +-
.../cloud-managed-upgrade/conf/schema.xml | 2 +-
.../cloud-managed/conf/managed-schema | 2 +-
.../cloud-minimal-jmx/conf/schema.xml | 2 +-
.../configsets/cloud-minimal/conf/schema.xml | 2 +-
.../configsets/cloud-subdirs/conf/schema.xml | 2 +-
.../exitable-directory/conf/schema.xml | 2 +-
.../org/apache/solr/BasicFunctionalityTest.java | 77 ++++++-
.../org/apache/solr/cloud/ReplaceNodeTest.java | 9 +-
.../apache/solr/handler/TestReqParamsAPI.java | 2 +-
.../solr/handler/V2ApiIntegrationTest.java | 21 +-
.../apache/solr/handler/V2StandaloneTest.java | 53 +++++
.../handler/admin/CoreAdminHandlerTest.java | 50 +++++
.../apache/solr/response/TestExportWriter.java | 199 ++++++++++++++++++-
.../schema/TestFieldCollectionResource.java | 10 +-
.../apache/solr/schema/BadIndexSchemaTest.java | 15 ++
.../org/apache/solr/search/TestQueryTypes.java | 46 ++++-
.../apache/solr/search/TestSolrQueryParser.java | 36 ++++
...dSchemaFieldsUpdateProcessorFactoryTest.java | 16 +-
solr/example/files/conf/managed-schema | 20 ++
solr/example/files/conf/solrconfig.xml | 6 +-
.../basic_configs/conf/solrconfig.xml | 6 +-
.../conf/solrconfig.xml | 6 +-
solr/solr-ref-guide/src/collections-api.adoc | 3 +-
.../src/common-query-parameters.adoc | 30 +--
solr/solr-ref-guide/src/config-api.adoc | 2 +-
.../src/configuring-solrconfig-xml.adoc | 2 +-
solr/solr-ref-guide/src/coreadmin-api.adoc | 8 +-
...adir-and-directoryfactory-in-solrconfig.adoc | 2 +-
solr/solr-ref-guide/src/de-duplication.adoc | 4 +-
.../detecting-languages-during-indexing.adoc | 2 +-
.../distributed-search-with-index-sharding.adoc | 2 +-
solr/solr-ref-guide/src/enabling-ssl.adoc | 6 +-
.../src/exporting-result-sets.adoc | 2 +-
solr/solr-ref-guide/src/faceting.adoc | 54 ++---
.../field-type-definitions-and-properties.adoc | 2 +-
.../solr-ref-guide/src/filter-descriptions.adoc | 4 +-
solr/solr-ref-guide/src/highlighting.adoc | 4 +-
solr/solr-ref-guide/src/index-replication.adoc | 2 +-
.../src/indexconfig-in-solrconfig.adoc | 16 +-
.../src/introduction-to-solr-indexing.adoc | 2 +-
solr/solr-ref-guide/src/learning-to-rank.adoc | 2 +-
.../src/local-parameters-in-queries.adoc | 2 +-
.../major-changes-from-solr-5-to-solr-6.adoc | 6 +-
solr/solr-ref-guide/src/merging-indexes.adoc | 2 +-
.../src/near-real-time-searching.adoc | 10 +-
.../src/parallel-sql-interface.adoc | 16 +-
.../src/query-settings-in-solrconfig.adoc | 22 +-
.../read-and-write-side-fault-tolerance.adoc | 4 +-
.../src/request-parameters-api.adoc | 2 +-
.../src/requestdispatcher-in-solrconfig.adoc | 8 +-
solr/solr-ref-guide/src/response-writers.adoc | 8 +-
.../src/rule-based-authorization-plugin.adoc | 4 +-
.../src/running-solr-on-hdfs.adoc | 4 +-
...schema-factory-definition-in-solrconfig.adoc | 6 +-
solr/solr-ref-guide/src/schemaless-mode.adoc | 6 +-
.../src/solr-control-script-reference.adoc | 2 +-
solr/solr-ref-guide/src/spatial-search.adoc | 6 +-
solr/solr-ref-guide/src/spell-checking.adoc | 40 ++--
.../src/taking-solr-to-production.adoc | 2 +-
.../src/the-dismax-query-parser.adoc | 20 +-
.../src/the-extended-dismax-query-parser.adoc | 26 +--
.../src/the-query-elevation-component.adoc | 14 +-
.../src/the-standard-query-parser.adoc | 12 +-
.../solr-ref-guide/src/the-stats-component.adoc | 2 +-
.../src/transforming-result-documents.adoc | 31 ++-
.../src/updatehandlers-in-solrconfig.adoc | 6 +-
solr/solr-ref-guide/src/upgrading-solr.adoc | 2 +-
.../src/uploading-data-with-index-handlers.adoc | 2 +-
...g-data-with-solr-cell-using-apache-tika.adoc | 4 +-
solr/solr-ref-guide/src/using-solrj.adoc | 10 +-
...zookeeper-to-manage-configuration-files.adoc | 2 +-
.../src/velocity-response-writer.adoc | 2 +-
solr/solr-ref-guide/src/working-with-dates.adoc | 10 +-
.../src/working-with-enum-fields.adoc | 6 +-
...rking-with-external-files-and-processes.adoc | 4 +-
.../src/zookeeper-access-control.adoc | 4 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 10 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 18 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 80 ++++++--
.../client/solrj/impl/LBHttpSolrClient.java | 38 +++-
.../solr/common/params/MapSolrParams.java | 17 +-
.../solr/common/params/MoreLikeThisParams.java | 1 +
122 files changed, 1625 insertions(+), 522 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d333f7b1/solr/core/src/test-files/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d333f7b1/solr/core/src/test-files/solr/collection1/conf/schema11.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d333f7b1/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d333f7b1/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d333f7b1/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
----------------------------------------------------------------------
diff --cc solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
index ee0da09,4b82e62..21bf2c7
--- a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
@@@ -1038,4 -1039,39 +1039,39 @@@ public class TestSolrQueryParser extend
, "/response/numFound==1"
);
}
+
+ @Test
+ public void testBadRequestInSetQuery() throws SyntaxError {
+ SolrQueryRequest req = req();
+ QParser qParser;
+ String[] fieldSuffix = new String[] {
+ "ti", "tf", "td", "tl",
+ "i", "f", "d", "l",
+ "is", "fs", "ds", "ls",
+ "i_dv", "f_dv", "d_dv", "l_dv",
+ "is_dv", "fs_dv", "ds_dv", "ls_dv",
+ "i_dvo", "f_dvo", "d_dvo", "l_dvo",
+ };
+
+ for (String suffix:fieldSuffix) {
+ //Good queries
+ qParser = QParser.getParser("foo_" + suffix + ":(1 2 3 4 5 6 7 8 9 10 20 19 18 17 16 15 14 13 12 25)", req);
+ qParser.setIsFilter(true);
+ qParser.getQuery();
+ }
+
+ for (String suffix:fieldSuffix) {
+ qParser = QParser.getParser("foo_" + suffix + ":(1 2 3 4 5 6 7 8 9 10 20 19 18 17 16 15 14 13 12 NOT_A_NUMBER)", req);
+ qParser.setIsFilter(true); // this may change in the future
+ try {
+ qParser.getQuery();
+ fail("Expecting exception");
+ } catch (SolrException e) {
+ assertEquals(SolrException.ErrorCode.BAD_REQUEST.code, e.code());
+ assertTrue("Unexpected exception: " + e.getMessage(), e.getMessage().contains("Invalid Number: NOT_A_NUMBER"));
+ }
+ }
+
+
+ }
-}
+}