You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/07/07 13:43:12 UTC
[31/32] lucene-solr:jira/solr-10996: Merge branch 'master' into
feature/autoscaling
Merge branch 'master' into feature/autoscaling
# Conflicts:
# solr/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b8c86d24
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b8c86d24
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b8c86d24
Branch: refs/heads/jira/solr-10996
Commit: b8c86d24d442d8fdf930ba374b20bca6e37eba3e
Parents: 23fe3e1 7051a79
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Fri Jul 7 09:53:33 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Fri Jul 7 09:53:33 2017 +0530
----------------------------------------------------------------------
lucene/CHANGES.txt | 20 ++
.../lucene/analysis/charfilter/htmlentity.py | 66 +++---
.../analysis/standard/ClassicTokenizerImpl.java | 23 +-
.../standard/ClassicTokenizerImpl.jflex | 23 +-
.../lucene/analysis/core/TestAnalyzers.java | 11 +-
.../analysis/standard/StandardTokenizer.java | 47 +---
.../standard/StandardTokenizerImpl.java | 3 +-
.../standard/StandardTokenizerImpl.jflex | 2 +-
.../SortedNumericDocValuesRangeQuery.java | 4 +-
.../document/SortedSetDocValuesRangeQuery.java | 4 +-
.../org/apache/lucene/index/IndexWriter.java | 2 +-
.../apache/lucene/index/ReadersAndUpdates.java | 7 +-
.../org/apache/lucene/index/SegmentInfos.java | 66 ++----
.../search/DocValuesFieldExistsQuery.java | 102 +++++++++
.../apache/lucene/search/FieldValueQuery.java | 102 ---------
.../java/org/apache/lucene/util/Version.java | 7 +
.../lucene/search/TestFieldValueQuery.java | 18 +-
lucene/ivy-versions.properties | 2 +-
.../apache/lucene/search/join/TestJoinUtil.java | 4 +-
.../randomizedtesting-runner-2.5.0.jar.sha1 | 1 -
.../randomizedtesting-runner-2.5.2.jar.sha1 | 1 +
solr/CHANGES.txt | 31 ++-
.../solr/analytics/ExpressionFactory.java | 10 +-
.../function/field/DateMultiField.java | 47 ----
.../function/field/DateMultiTrieField.java | 47 ++++
.../function/field/DoubleMultiField.java | 85 -------
.../function/field/DoubleMultiTrieField.java | 85 +++++++
.../function/field/FloatMultiField.java | 91 --------
.../function/field/FloatMultiTrieField.java | 91 ++++++++
.../analytics/function/field/IntMultiField.java | 100 ---------
.../function/field/IntMultiTrieField.java | 100 +++++++++
.../function/field/LongMultiField.java | 89 --------
.../function/field/LongMultiTrieField.java | 89 ++++++++
.../analytics/util/FacetRangeGenerator.java | 12 +-
.../solr/collection1/conf/schema-analytics.xml | 10 +-
.../configsets/cloud-analytics/conf/schema.xml | 17 +-
.../analytics/facet/FieldFacetCloudTest.java | 86 ++++---
.../solr/analytics/facet/FieldFacetTest.java | 128 ++++++-----
.../solr/collection1/conf/solrconfig-ltr.xml | 3 +
.../collection1/conf/solrconfig-ltr_Th10_10.xml | 5 +-
.../collection1/conf/solrconfig-multiseg.xml | 5 +-
.../org/apache/solr/cloud/DistributedQueue.java | 7 +-
.../java/org/apache/solr/cloud/Overseer.java | 15 +-
.../java/org/apache/solr/core/SolrConfig.java | 8 +
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../apache/solr/schema/CurrencyFieldType.java | 10 +-
.../apache/solr/schema/ManagedIndexSchema.java | 7 +-
.../join/ChildFieldValueSourceParser.java | 3 +-
.../apache/solr/servlet/SolrRequestParsers.java | 15 +-
.../AddSchemaFieldsUpdateProcessorFactory.java | 224 +++++++++++++++----
.../resources/EditableSolrConfigAttributes.json | 3 +-
...chema-add-schema-fields-update-processor.xml | 1 +
...dd-schema-fields-update-processor-chains.xml | 74 ++++++
.../conf/solrconfig-managed-schema.xml | 5 +
.../collection1/conf/solrconfig-schemaless.xml | 4 +
.../solr/collection1/conf/solrconfig-tlog.xml | 3 +
.../solr/collection1/conf/solrconfig.xml | 2 +-
.../solr/configsets/_default/conf/currency.xml | 67 ------
.../configsets/_default/conf/managed-schema | 142 ++++--------
.../configsets/_default/conf/solrconfig.xml | 14 +-
.../test-files/solr/crazy-path-to-config.xml | 4 +-
.../cloud/ChaosMonkeyNothingIsSafeTest.java | 8 +-
...MonkeyNothingIsSafeWithPullReplicasTest.java | 8 +-
.../apache/solr/cloud/MoveReplicaHDFSTest.java | 1 +
.../cloud/TestCloudJSONFacetJoinDomain.java | 54 ++++-
.../apache/solr/cloud/TestConfigSetsAPI.java | 40 +---
.../org/apache/solr/core/TestConfigOverlay.java | 1 +
.../apache/solr/core/TestSolrConfigHandler.java | 3 +-
.../solr/request/TestRemoteStreaming.java | 30 +--
.../org/apache/solr/request/TestStreamBody.java | 138 ++++++++++++
.../search/join/TestCloudNestedDocsSort.java | 32 ++-
.../solr/search/join/TestNestedDocsSort.java | 5 +
.../solr/search/json/TestJsonRequest.java | 13 +-
...dSchemaFieldsUpdateProcessorFactoryTest.java | 79 +++++++
solr/licenses/junit4-ant-2.5.0.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.5.2.jar.sha1 | 1 +
.../randomizedtesting-runner-2.5.0.jar.sha1 | 1 -
.../randomizedtesting-runner-2.5.2.jar.sha1 | 1 +
.../solr/configsets/_default/conf/currency.xml | 67 ------
.../configsets/_default/conf/managed-schema | 142 ++++--------
.../configsets/_default/conf/solrconfig.xml | 14 +-
.../src/command-line-utilities.adoc | 2 +-
solr/solr-ref-guide/src/config-api.adoc | 1 +
solr/solr-ref-guide/src/enabling-ssl.adoc | 2 +-
.../src/getting-started-with-solrcloud.adoc | 4 +-
solr/solr-ref-guide/src/getting-started.adoc | 2 +-
.../src/initparams-in-solrconfig.adoc | 2 +-
.../src/near-real-time-searching.adoc | 4 +-
.../src/requestdispatcher-in-solrconfig.adoc | 13 ++
solr/solr-ref-guide/src/schemaless-mode.adoc | 112 ++++++----
.../src/solr-control-script-reference.adoc | 18 +-
.../transforming-and-indexing-custom-json.adoc | 4 +-
.../src/uploading-data-with-index-handlers.adoc | 2 +-
...g-data-with-solr-cell-using-apache-tika.adoc | 2 +-
...zookeeper-to-manage-configuration-files.adoc | 6 +-
.../src/velocity-response-writer.adoc | 2 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 45 +---
.../solrj/impl/ConcurrentUpdateSolrClient.java | 43 +---
.../solr/client/solrj/impl/HttpSolrClient.java | 51 +----
.../client/solrj/impl/LBHttpSolrClient.java | 52 +----
.../client/solrj/impl/SolrClientBuilder.java | 72 ++++++
.../client/solrj/io/eval/AddAllEvaluator.java | 69 ++++++
.../client/solrj/io/stream/ParallelStream.java | 1 +
.../client/solrj/impl/CloudSolrClientTest.java | 39 +++-
.../solrj/io/stream/StreamExpressionTest.java | 26 +++
.../cloud/AbstractFullDistribZkTestBase.java | 2 +-
106 files changed, 1903 insertions(+), 1567 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b8c86d24/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index 2593c1a,abfe079..81ab980
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -262,20 -258,20 +268,26 @@@ New Feature
* SOLR-10406: v2 API error messages list the URL request path as /solr/____v2/... when the original path was /v2/... (Cao Manh Dat, noble)
* SOLR-10574: New _default config set replacing basic_configs and data_driven_schema_configs.
- (Ishan Chattopadhyaya, noble, shalin, hossman, David Smiley, Jan Hoydahl, Alexandre Rafalovich)
- (Ishan Chattopadhyaya, noble, shalin, hossman, David Smiley, janhoy, Alexandre Rafalovich)
++ (Ishan Chattopadhyaya, noble, shalin, hossman, David Smiley, janhoy, Alexandre Rafalovich)
* SOLR-10272: Use _default config set if no collection.configName is specified with CREATE (Ishan Chattopadhyaya)
-* SOLR-9526: Data driven schema now indexes text field "foo" as both "foo" (text_general) and as "foo_str" (string)
- to facilitate both search and faceting. AddSchemaFieldsUpdateProcessor now has the ability to add a "copyField" to
++* SOLR-9526: Data driven schema now indexes text field "foo" as both "foo" (text_general) and as "foo_str" (string)
++ to facilitate both search and faceting. AddSchemaFieldsUpdateProcessor now has the ability to add a "copyField" to
+ the type mappings, with an optional maxChars limitation. You can also define one typeMappings as default.
+ This also solves issues SOLR-8495, SOLR-6966, and SOLR-7058
+ (janhoy, Steve Rowe, hossman, Alexandre Rafalovich, Shawn Heisey, Cao Manh Dat)
+
-* SOLR-10123: Upgraded the Analytics Component to version 2.0 which now supports distributed collections, expressions over
- multivalued fields, a new JSON request language, and more. DocValues are now required for any field used in the analytics
+* SOLR-10123: Upgraded the Analytics Component to version 2.0 which now supports distributed collections, expressions over
+ multivalued fields, a new JSON request language, and more. DocValues are now required for any field used in the analytics
expression whereas previously docValues was not required. Please see SOLR-10123 for details. (Houston Putman)
+* SOLR-10496: New ComputePlanAction for autoscaling which uses the policy framework to compute cluster
+ operations upon a trigger fire. (Noble Paul, shalin)
+
+* SOLR-10965: New ExecutePlanAction for autoscaling which executes the operations computed by ComputePlanAction
+ against the cluster. (shalin)
+
Bug Fixes
----------------------
* SOLR-9262: Connection and read timeouts are being ignored by UpdateShardHandler after SOLR-4509.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b8c86d24/solr/core/src/java/org/apache/solr/cloud/Overseer.java
----------------------------------------------------------------------