You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2017/07/18 05:14:25 UTC
[33/33] lucene-solr:feature/autoscaling: Merge 'master' into
feature/autoscaling
Merge 'master' into feature/autoscaling
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cafd0714
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cafd0714
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cafd0714
Branch: refs/heads/feature/autoscaling
Commit: cafd0714cd96119e8025f392a0b7872999fa1449
Parents: b71605d 17014e6
Author: Cao Manh Dat <da...@apache.org>
Authored: Tue Jul 18 12:13:39 2017 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Tue Jul 18 12:13:39 2017 +0700
----------------------------------------------------------------------
dev-tools/scripts/jenkins.build.ref.guide.sh | 67 +
lucene/CHANGES.txt | 6 +
.../apache/lucene/codecs/DocValuesConsumer.java | 2 +-
.../org/apache/lucene/index/MultiDocValues.java | 288 ----
.../org/apache/lucene/index/MultiSorter.java | 2 +-
.../org/apache/lucene/index/MultiTermsEnum.java | 2 +
.../org/apache/lucene/index/OrdinalMap.java | 368 +++++
.../org/apache/lucene/util/OfflineSorter.java | 1 -
.../org/apache/lucene/index/TestOrdinalMap.java | 2 +-
...ConcurrentSortedSetDocValuesFacetCounts.java | 9 +-
.../DefaultSortedSetDocValuesReaderState.java | 2 +-
.../SortedSetDocValuesFacetCounts.java | 7 +-
.../search/join/GlobalOrdinalsCollector.java | 6 +-
.../lucene/search/join/GlobalOrdinalsQuery.java | 6 +-
.../join/GlobalOrdinalsWithScoreCollector.java | 16 +-
.../join/GlobalOrdinalsWithScoreQuery.java | 6 +-
.../org/apache/lucene/search/join/JoinUtil.java | 8 +-
.../apache/lucene/search/join/TestJoinUtil.java | 19 +-
.../serialized/SerializedDVStrategy.java | 5 +-
solr/CHANGES.txt | 33 +
.../org/apache/solr/cloud/MoveReplicaCmd.java | 11 +-
.../org/apache/solr/cloud/ReplaceNodeCmd.java | 9 +-
.../org/apache/solr/cloud/ZkController.java | 10 +-
.../org/apache/solr/handler/ExportWriter.java | 13 +-
.../apache/solr/handler/ReplicationHandler.java | 6 +-
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../solr/handler/admin/CollectionsHandler.java | 18 +-
.../solr/handler/component/ExpandComponent.java | 24 +-
.../solr/index/SlowCompositeReaderWrapper.java | 2 +-
.../apache/solr/request/DocValuesFacets.java | 4 +-
.../org/apache/solr/request/DocValuesStats.java | 4 +-
.../org/apache/solr/request/IntervalFacets.java | 39 +-
.../java/org/apache/solr/schema/EnumField.java | 7 +-
.../solr/search/CollapsingQParserPlugin.java | 20 +-
.../facet/FacetFieldProcessorByArrayDV.java | 3 +-
.../org/apache/solr/search/facet/MinMaxAgg.java | 3 +-
.../solr/search/facet/UniqueMultiDvSlotAcc.java | 3 +-
.../search/facet/UniqueSinglevaluedSlotAcc.java | 3 +-
.../join/BlockJoinFieldFacetAccumulator.java | 4 +-
.../conf/schema-id-and-version-fields-only.xml | 2 +-
.../collection1/conf/schema-preanalyzed.xml | 2 +-
.../solr/configsets/cloud-hdfs/conf/schema.xml | 4 +-
.../conf/managed-schema | 4 +-
.../conf/schema.xml | 4 +-
.../cloud-minimal-jmx/conf/schema.xml | 4 +-
.../configsets/cloud-minimal/conf/schema.xml | 4 +-
.../solr/configsets/doc-expiry/conf/schema.xml | 20 +-
.../exitable-directory/conf/schema.xml | 4 +-
.../org/apache/solr/cloud/MoveReplicaTest.java | 50 +-
.../org/apache/solr/cloud/ReplaceNodeTest.java | 26 +-
.../solr/handler/admin/MetricsHandlerTest.java | 2 +
.../apache/solr/request/SimpleFacetsTest.java | 36 +-
.../solr/request/TestIntervalFaceting.java | 78 +-
.../org/apache/solr/schema/EnumFieldTest.java | 6 +-
.../org/apache/solr/schema/TestPointFields.java | 1363 ++++++++++--------
.../apache/solr/update/SoftAutoCommitTest.java | 122 +-
.../test/org/apache/solr/util/TestUtils.java | 14 +-
.../meta-docs/asciidoc-syntax.adoc | 144 +-
.../src/collapse-and-expand-results.adoc | 2 +-
solr/solr-ref-guide/src/collections-api.adoc | 12 +-
.../src/common-query-parameters.adoc | 143 +-
.../solr-ref-guide/src/configuring-logging.adoc | 2 +-
solr/solr-ref-guide/src/defining-fields.adoc | 2 +-
solr/solr-ref-guide/src/docvalues.adoc | 6 +-
solr/solr-ref-guide/src/faceting.adoc | 390 ++---
.../field-type-definitions-and-properties.adoc | 6 +-
solr/solr-ref-guide/src/function-queries.adoc | 2 +-
.../src/indexconfig-in-solrconfig.adoc | 2 +-
solr/solr-ref-guide/src/query-re-ranking.adoc | 2 +-
solr/solr-ref-guide/src/realtime-get.adoc | 2 +-
...lers-and-searchcomponents-in-solrconfig.adoc | 4 +-
solr/solr-ref-guide/src/spell-checking.adoc | 190 +--
.../src/the-dismax-query-parser.adoc | 58 +-
.../src/the-extended-dismax-query-parser.adoc | 88 +-
.../src/the-standard-query-parser.adoc | 96 +-
.../solr-ref-guide/src/the-stats-component.adoc | 2 +-
.../cloud/autoscaling/MoveReplicaSuggester.java | 18 +-
.../client/solrj/io/stream/CloudSolrStream.java | 22 +-
.../client/solrj/io/stream/FacetStream.java | 12 +-
.../solr/client/solrj/io/stream/PlotStream.java | 221 +++
.../solrj/request/CollectionAdminRequest.java | 27 +-
.../solr/common/params/CollectionParams.java | 9 +
.../solr/common/util/CommandOperation.java | 6 +-
.../java/org/apache/solr/common/util/Utils.java | 8 +-
.../solrj/io/stream/StreamExpressionTest.java | 34 +-
.../stream/StreamExpressionToExpessionTest.java | 5 +-
86 files changed, 2430 insertions(+), 1869 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cafd0714/solr/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cafd0714/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 3b78202,dee833f..512acbe
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@@ -58,7 -57,14 +58,15 @@@ import org.apache.solr.cloud.overseer.O
import org.apache.solr.cloud.overseer.SliceMutator;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
- import org.apache.solr.common.cloud.*;
+ import org.apache.solr.common.cloud.BeforeReconnect;
+ import org.apache.solr.common.cloud.ClusterState;
+ import org.apache.solr.common.cloud.DefaultConnectionStrategy;
+ import org.apache.solr.common.cloud.DefaultZkACLProvider;
+ import org.apache.solr.common.cloud.DefaultZkCredentialsProvider;
+ import org.apache.solr.common.cloud.DocCollection;
++import org.apache.solr.common.cloud.LiveNodesListener;
+ import org.apache.solr.common.cloud.OnReconnect;
+ import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Replica.Type;
import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cafd0714/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
index 3454ee6,e97cb0e..1e0f15b
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/MoveReplicaSuggester.java
@@@ -38,8 -39,8 +38,8 @@@ public class MoveReplicaSuggester exten
//iterate through elements and identify the least loaded
List<Clause.Violation> leastSeriousViolation = null;
Integer targetNodeIndex = null;
- Integer fromNodeIndex = null;
- ReplicaInfo fromReplicaInfo = null;
+ Integer sourceNodeIndex = null;
- ReplicaInfo fromReplicaInfo = null;
++ ReplicaInfo sourceReplicaInfo = null;
for (Pair<ReplicaInfo, Row> fromReplica : getValidReplicas(true, true, -1)) {
Row fromRow = fromReplica.second();
ReplicaInfo replicaInfo = fromReplica.first();
@@@ -62,17 -64,17 +62,17 @@@
if (!containsNewErrors(errs) && isLessSerious(errs, leastSeriousViolation)) {
leastSeriousViolation = errs;
targetNodeIndex = j;
- fromNodeIndex = i;
- fromReplicaInfo = replicaInfo;
+ sourceNodeIndex = i;
- fromReplicaInfo = replicaInfo;
++ sourceReplicaInfo = replicaInfo;
}
}
}
- if (targetNodeIndex != null && fromNodeIndex != null) {
- getMatrix().set(fromNodeIndex, getMatrix().get(fromNodeIndex).removeReplica(fromReplicaInfo.collection, fromReplicaInfo.shard, fromReplicaInfo.type).first());
- getMatrix().set(targetNodeIndex, getMatrix().get(targetNodeIndex).addReplica(fromReplicaInfo.collection, fromReplicaInfo.shard, fromReplicaInfo.type));
+ if (targetNodeIndex != null && sourceNodeIndex != null) {
- getMatrix().set(sourceNodeIndex, getMatrix().get(sourceNodeIndex).removeReplica(fromReplicaInfo.collection, fromReplicaInfo.shard).first());
- getMatrix().set(targetNodeIndex, getMatrix().get(targetNodeIndex).addReplica(fromReplicaInfo.collection, fromReplicaInfo.shard));
++ getMatrix().set(sourceNodeIndex, getMatrix().get(sourceNodeIndex).removeReplica(sourceReplicaInfo.collection, sourceReplicaInfo.shard, sourceReplicaInfo.type).first());
++ getMatrix().set(targetNodeIndex, getMatrix().get(targetNodeIndex).addReplica(sourceReplicaInfo.collection, sourceReplicaInfo.shard, sourceReplicaInfo.type));
return new CollectionAdminRequest.MoveReplica(
-- fromReplicaInfo.collection,
-- fromReplicaInfo.name,
++ sourceReplicaInfo.collection,
++ sourceReplicaInfo.name,
getMatrix().get(targetNodeIndex).node);
}
return null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cafd0714/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
----------------------------------------------------------------------