You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/07/28 04:50:13 UTC

[50/50] [abbrv] lucene-solr:jira/solr-11990: Merge branch 'master' into jira/solr-11990

Merge branch 'master' into jira/solr-11990

# Conflicts:
#	solr/solr-ref-guide/src/collections-api.adoc
#	solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java
#	solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.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/dd840a2f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/dd840a2f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/dd840a2f

Branch: refs/heads/jira/solr-11990
Commit: dd840a2f7e765ee96c899d4d9ea89b6b67c5ae62
Parents: bb4ffb3 828d281
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Sat Jul 28 10:03:50 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Sat Jul 28 10:03:50 2018 +0530

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   30 +-
 lucene/MIGRATE.txt                              |    7 +
 lucene/analysis/opennlp/build.xml               |   16 +-
 lucene/analysis/opennlp/ivy.xml                 |    1 -
 .../lucene/analysis/opennlp/en-test-chunker.bin |  Bin 89915 -> 89914 bytes
 .../analysis/opennlp/en-test-lemmatizer.bin     |  Bin 7370 -> 7370 bytes
 .../analysis/opennlp/en-test-ner-person.bin     |  Bin 1700 -> 0 bytes
 .../lucene/analysis/opennlp/en-test-ner.bin     |  Bin 0 -> 2049 bytes
 .../analysis/opennlp/en-test-pos-maxent.bin     |  Bin 18424 -> 18494 bytes
 .../lucene/analysis/opennlp/en-test-sent.bin    |  Bin 1050 -> 1051 bytes
 .../analysis/opennlp/en-test-tokenizer.bin      |  Bin 15096 -> 15100 bytes
 .../opennlp/src/tools/test-model-data/ner.txt   |  143 ++
 .../src/tools/test-model-data/ner_flashman.txt  |  143 --
 .../lucene/benchmark/byTask/tasks/ReadTask.java |    7 -
 .../byTask/tasks/SearchWithSortTask.java        |    9 -
 .../document/LatLonDocValuesBoxQuery.java       |  153 ++
 .../document/LatLonDocValuesDistanceQuery.java  |  140 ++
 .../lucene/document/LatLonDocValuesField.java   |  181 ++
 .../org/apache/lucene/document/LatLonPoint.java |  255 +++
 .../document/LatLonPointDistanceComparator.java |  229 +++
 .../document/LatLonPointDistanceQuery.java      |  390 ++++
 .../document/LatLonPointInPolygonQuery.java     |  214 +++
 .../lucene/document/LatLonPointSortField.java   |  100 +
 .../src/java/org/apache/lucene/geo/Polygon.java |    2 +-
 .../lucene/index/FrozenBufferedUpdates.java     |   12 +-
 .../org/apache/lucene/index/IndexWriter.java    |   35 +-
 .../org/apache/lucene/index/PointValues.java    |    3 +-
 .../org/apache/lucene/index/ReaderPool.java     |    2 +-
 .../apache/lucene/index/ReadersAndUpdates.java  |    5 +-
 .../org/apache/lucene/index/SegmentReader.java  |   49 +-
 .../SoftDeletesDirectoryReaderWrapper.java      |    2 +-
 .../index/SoftDeletesRetentionMergePolicy.java  |   19 +-
 .../lucene/index/StandardDirectoryReader.java   |   16 +-
 .../search/BlockMaxConjunctionScorer.java       |   14 +
 .../search/DisjunctionMatchesIterator.java      |   17 +-
 .../lucene/search/DocValuesRewriteMethod.java   |    2 +-
 .../java/org/apache/lucene/search/HitQueue.java |   20 +-
 .../org/apache/lucene/search/IndexSearcher.java |    8 +-
 .../apache/lucene/search/MatchesIterator.java   |   24 +
 .../apache/lucene/search/MultiPhraseQuery.java  |    5 +-
 .../MultiTermQueryConstantScoreWrapper.java     |    2 +-
 .../org/apache/lucene/search/PhraseMatcher.java |    1 +
 .../org/apache/lucene/search/PhraseQuery.java   |    4 +-
 .../org/apache/lucene/search/PhraseWeight.java  |   10 +
 .../lucene/search/SloppyPhraseMatcher.java      |   65 +-
 .../org/apache/lucene/search/SortRescorer.java  |   21 +-
 .../org/apache/lucene/search/SynonymQuery.java  |    2 +-
 .../apache/lucene/search/TermInSetQuery.java    |    2 +-
 .../lucene/search/TermMatchesIterator.java      |   13 +-
 .../org/apache/lucene/search/TermQuery.java     |    2 +-
 .../apache/lucene/search/TopFieldCollector.java |  118 +-
 .../lucene/search/spans/SpanPositionQueue.java  |    2 +-
 .../lucene/search/spans/SpanTermQuery.java      |    7 +
 .../apache/lucene/search/spans/SpanWeight.java  |  140 ++
 .../java/org/apache/lucene/store/Directory.java |  194 +-
 .../org/apache/lucene/store/IndexOutput.java    |   13 +-
 .../org/apache/lucene/util/PriorityQueue.java   |  108 +-
 .../automaton/DaciukMihovAutomatonBuilder.java  |   12 +-
 .../document/TestLatLonDocValuesField.java      |   30 +
 .../apache/lucene/document/TestLatLonPoint.java |   37 +
 .../document/TestLatLonPointDistanceSort.java   |  264 +++
 .../org/apache/lucene/index/TestAddIndexes.java |    2 +-
 .../lucene/index/TestForceMergeForever.java     |    2 +-
 .../apache/lucene/index/TestIndexSorting.java   |    4 +-
 .../apache/lucene/index/TestIndexWriter.java    |  105 +-
 .../lucene/index/TestPerSegmentDeletes.java     |    6 +-
 .../TestSoftDeletesRetentionMergePolicy.java    |   14 +-
 .../lucene/index/TestTieredMergePolicy.java     |   16 +-
 .../org/apache/lucene/search/TestBoolean2.java  |    8 +-
 .../lucene/search/TestElevationComparator.java  |    2 +-
 .../search/TestLatLonDocValuesQueries.java      |   62 +
 .../lucene/search/TestLatLonPointQueries.java   |   91 +
 .../lucene/search/TestMatchesIterator.java      |  218 ++-
 .../apache/lucene/search/TestSortRandom.java    |    2 +-
 .../apache/lucene/search/TestTopDocsMerge.java  |    4 +-
 .../lucene/search/TestTopFieldCollector.java    |  179 +-
 .../TestTopFieldCollectorEarlyTermination.java  |    5 +-
 .../apache/lucene/util/TestPriorityQueue.java   |  170 +-
 .../TestDaciukMihovAutomatonBuilder.java        |   39 +
 .../org/apache/lucene/util/bkd/TestBKD.java     |    7 +-
 .../org/apache/lucene/facet/DrillSideways.java  |   16 +-
 .../apache/lucene/facet/FacetsCollector.java    |    4 +-
 .../lucene/facet/TopOrdAndFloatQueue.java       |    2 +-
 .../apache/lucene/facet/TopOrdAndIntQueue.java  |    2 +-
 .../search/grouping/BlockGroupingCollector.java |    2 +-
 .../lucene/search/grouping/GroupingSearch.java  |   17 +-
 .../search/grouping/TopGroupsCollector.java     |   11 +-
 .../lucene/search/grouping/TestGrouping.java    |   55 +-
 .../highlight/TokenStreamFromTermVector.java    |    8 -
 lucene/ivy-versions.properties                  |    3 +-
 lucene/licenses/opennlp-maxent-3.0.3.jar.sha1   |    1 -
 lucene/licenses/opennlp-maxent-LICENSE-ASL.txt  |  202 --
 lucene/licenses/opennlp-maxent-NOTICE.txt       |    6 -
 lucene/licenses/opennlp-tools-1.8.4.jar.sha1    |    1 -
 lucene/licenses/opennlp-tools-1.9.0.jar.sha1    |    1 +
 .../nrt/SegmentInfosSearcherManager.java        |    2 +-
 .../document/LatLonDocValuesBoxQuery.java       |  153 --
 .../document/LatLonDocValuesDistanceQuery.java  |  140 --
 .../lucene/document/LatLonDocValuesField.java   |  181 --
 .../org/apache/lucene/document/LatLonPoint.java |  335 ----
 .../document/LatLonPointDistanceComparator.java |  229 ---
 .../document/LatLonPointDistanceQuery.java      |  390 ----
 .../document/LatLonPointInPolygonQuery.java     |  214 ---
 .../lucene/document/LatLonPointSortField.java   |  100 -
 .../document/LatLonShapeBoundingBoxQuery.java   |   57 +-
 .../apache/lucene/document/NearestNeighbor.java |  328 ----
 .../java/org/apache/lucene/geo/Tessellator.java |   36 +-
 .../search/LatLonPointPrototypeQueries.java     |  111 ++
 .../apache/lucene/search/NearestNeighbor.java   |  329 ++++
 .../lucene/search/TermAutomatonScorer.java      |    4 +-
 .../document/TestFloatPointNearestNeighbor.java |    3 +-
 .../document/TestLatLonDocValuesField.java      |   30 -
 .../apache/lucene/document/TestLatLonPoint.java |   37 -
 .../document/TestLatLonPointDistanceSort.java   |  264 ---
 .../apache/lucene/document/TestLatLonShape.java |   36 +-
 .../lucene/document/TestLatLonShapeQueries.java |    2 -
 .../org/apache/lucene/document/TestNearest.java |  253 ---
 .../search/TestLatLonDocValuesQueries.java      |   62 -
 .../lucene/search/TestLatLonPointQueries.java   |   91 -
 .../org/apache/lucene/search/TestNearest.java   |  253 +++
 .../analyzing/AnalyzingInfixSuggester.java      |    2 +-
 .../org/apache/lucene/mockfile/ExtrasFS.java    |   18 +-
 .../lucene/search/AssertingMatchesIterator.java |   11 +
 .../lucene/store/BaseDirectoryTestCase.java     | 1652 ++++++++--------
 .../lucene/store/MockDirectoryWrapper.java      |   51 +-
 .../org/apache/lucene/util/LuceneTestCase.java  |   40 +-
 .../lucene/store/TestMockDirectoryWrapper.java  |    9 +-
 solr/CHANGES.txt                                |   28 +
 solr/contrib/analysis-extras/ivy.xml            |    1 -
 ...ractNamedEntitiesUpdateProcessorFactory.java |   16 +-
 .../collection1/conf/en-test-ner-person.bin     |  Bin 1700 -> 0 bytes
 .../solr/collection1/conf/en-test-ner.bin       |  Bin 0 -> 2049 bytes
 .../solr/collection1/conf/en-test-sent.bin      |  Bin 1050 -> 1051 bytes
 .../solr/collection1/conf/en-test-tokenizer.bin |  Bin 15096 -> 15100 bytes
 .../conf/solrconfig-opennlp-extract.xml         |   30 +-
 ...ractNamedEntitiesUpdateProcessorFactory.java |    9 +-
 .../TestSolrEntityProcessorEndToEnd.java        |    3 +-
 .../extraction/TestExtractionDateUtil.java      |    1 +
 .../solr/cloud/api/collections/MigrateCmd.java  |    5 +
 .../org/apache/solr/handler/ExportHandler.java  |    1 +
 .../org/apache/solr/handler/ExportWriter.java   | 1764 ------------------
 .../solr/handler/component/ExpandComponent.java |    4 +-
 .../solr/handler/component/QueryComponent.java  |    1 +
 .../solr/handler/export/BoolFieldWriter.java    |   52 +
 .../solr/handler/export/DateFieldWriter.java    |   46 +
 .../apache/solr/handler/export/DoubleCmp.java   |   43 +
 .../solr/handler/export/DoubleFieldWriter.java  |   45 +
 .../apache/solr/handler/export/DoubleValue.java |   81 +
 .../solr/handler/export/ExportWriter.java       |  448 +++++
 .../apache/solr/handler/export/FieldWriter.java |   27 +
 .../apache/solr/handler/export/FloatCmp.java    |   44 +
 .../solr/handler/export/FloatFieldWriter.java   |   45 +
 .../apache/solr/handler/export/FloatValue.java  |   78 +
 .../org/apache/solr/handler/export/IntComp.java |   45 +
 .../solr/handler/export/IntFieldWriter.java     |   45 +
 .../apache/solr/handler/export/IntValue.java    |   77 +
 .../org/apache/solr/handler/export/LongCmp.java |   45 +
 .../solr/handler/export/LongFieldWriter.java    |   45 +
 .../apache/solr/handler/export/LongValue.java   |   78 +
 .../solr/handler/export/MultiFieldWriter.java   |  104 ++
 .../solr/handler/export/PriorityQueue.java      |  218 +++
 .../org/apache/solr/handler/export/SortDoc.java |  114 ++
 .../apache/solr/handler/export/SortQueue.java   |   52 +
 .../apache/solr/handler/export/SortValue.java   |   30 +
 .../solr/handler/export/StringFieldWriter.java  |   52 +
 .../apache/solr/handler/export/StringValue.java |   99 +
 .../solr/handler/export/package-info.java       |   23 +
 .../java/org/apache/solr/search/Grouping.java   |   24 +-
 .../org/apache/solr/search/ReRankCollector.java |   15 +-
 .../search/SignificantTermsQParserPlugin.java   |   14 +-
 .../apache/solr/search/SolrIndexSearcher.java   |    9 +-
 .../apache/solr/search/ValueSourceParser.java   |    4 +-
 .../apache/solr/search/facet/FacetField.java    |   11 +-
 .../solr/search/facet/FacetFieldMerger.java     |    5 +
 .../apache/solr/search/facet/FacetMerger.java   |    8 +-
 .../apache/solr/search/facet/FacetRequest.java  |   57 +-
 .../search/facet/FacetRequestSortedMerger.java  |   53 +-
 .../solr/search/facet/RelatednessAgg.java       |  109 +-
 .../apache/solr/search/grouping/Command.java    |    7 +
 .../solr/search/grouping/CommandHandler.java    |    4 +
 .../distributed/command/QueryCommand.java       |   14 +-
 .../command/TopGroupsFieldCommand.java          |   44 +-
 .../processor/DistributedUpdateProcessor.java   |   19 +-
 .../collection1/conf/schema-sortingresponse.xml |    5 +-
 .../apache/solr/cloud/MigrateRouteKeyTest.java  |   18 +
 .../apache/solr/cloud/MoveReplicaHDFSTest.java  |    1 +
 .../apache/solr/cloud/MultiThreadedOCPTest.java |    2 +-
 .../solr/cloud/ReplicationFactorTest.java       |    1 +
 .../cloud/SharedFSAutoReplicaFailoverTest.java  |    3 +
 .../solr/cloud/TestCloudJSONFacetSKG.java       |    6 +-
 .../apache/solr/cloud/TestCloudRecovery.java    |    1 +
 .../cloud/TestPullReplicaErrorHandling.java     |    3 +-
 .../TestStressCloudBlindAtomicUpdates.java      |    1 +
 .../AbstractCloudBackupRestoreTestCase.java     |   20 +-
 .../HdfsAutoAddReplicasIntegrationTest.java     |    1 +
 .../cloud/autoscaling/ScheduledTriggerTest.java |    1 +
 .../sim/TestSimDistributedQueue.java            |    2 +-
 .../autoscaling/sim/TestTriggerIntegration.java |    2 +-
 .../cloud/hdfs/HdfsBasicDistributedZk2Test.java |    3 +-
 .../cloud/hdfs/HdfsBasicDistributedZkTest.java  |    3 +-
 ...HdfsTlogReplayBufferedWhileIndexingTest.java |    2 +
 .../apache/solr/core/TestDynamicLoading.java    |    1 +
 .../solr/handler/TestReplicationHandler.java    |    3 +-
 .../admin/MetricsHistoryHandlerTest.java        |    2 +
 .../solr/handler/export/TestExportWriter.java   |  747 ++++++++
 .../apache/solr/response/TestExportWriter.java  |  370 ----
 .../test/org/apache/solr/search/TestSort.java   |    3 +-
 .../org/apache/solr/search/facet/DebugAgg.java  |   82 +-
 .../search/facet/TestJsonFacetRefinement.java   |  603 +++++-
 .../solr/search/facet/TestJsonFacets.java       |   54 +
 .../facet/TestJsonFacetsStatsParsing.java       |  106 ++
 .../TestSolrCloudWithHadoopAuthPlugin.java      |    3 +-
 .../uninverting/TestFieldCacheSortRandom.java   |    4 +-
 .../DistributedUpdateProcessorTest.java         |   54 +
 .../processor/TestNamedUpdateProcessors.java    |    1 +
 .../TimeRoutedAliasUpdateProcessorTest.java     |    2 +
 solr/licenses/opennlp-maxent-3.0.3.jar.sha1     |    1 -
 solr/licenses/opennlp-maxent-LICENSE-ASL.txt    |  202 --
 solr/licenses/opennlp-maxent-NOTICE.txt         |    6 -
 solr/licenses/opennlp-tools-1.8.4.jar.sha1      |    1 -
 solr/licenses/opennlp-tools-1.9.0.jar.sha1      |    1 +
 solr/solr-ref-guide/src/cloud-screens.adoc      |   14 +-
 solr/solr-ref-guide/src/collections-api.adoc    |    6 +-
 .../solr-ref-guide/src/configuring-logging.adoc |    2 +-
 .../src/exporting-result-sets.adoc              |    3 +-
 .../src/images/cloud-screens/cloud-graph.png    |  Bin 54929 -> 94496 bytes
 .../src/images/cloud-screens/cloud-hover.png    |  Bin 0 -> 83343 bytes
 .../src/images/cloud-screens/cloud-radial.png   |  Bin 62572 -> 102878 bytes
 .../src/images/cloud-screens/cloud-tree.png     |  Bin 105371 -> 122158 bytes
 solr/solr-ref-guide/src/json-facet-api.adoc     |   66 +-
 .../src/near-real-time-searching.adoc           |    2 +-
 .../src/parallel-sql-interface.adoc             |    4 -
 solr/solr-ref-guide/src/result-grouping.adoc    |    9 +-
 ...olrcloud-autoscaling-policy-preferences.adoc |   34 +-
 ...rcloud-query-routing-and-read-tolerance.adoc |   57 +
 .../src/updatehandlers-in-solrconfig.adoc       |    2 +-
 .../client/solrj/cloud/autoscaling/Clause.java  |  116 +-
 .../client/solrj/cloud/autoscaling/Operand.java |    8 +
 .../client/solrj/cloud/autoscaling/Policy.java  |    2 +-
 .../client/solrj/cloud/autoscaling/Row.java     |    2 +-
 .../solrj/cloud/autoscaling/Suggestion.java     |   97 +-
 .../solrj/impl/SolrClientNodeStateProvider.java |   28 +-
 .../solrj/request/CollectionAdminRequest.java   |    3 +-
 .../org/apache/solr/common/SolrException.java   |    2 +-
 .../solrj/cloud/autoscaling/TestPolicy.java     |   91 +-
 .../solrj/cloud/autoscaling/TestPolicy2.java    |  223 +++
 .../solrj/io/stream/MathExpressionTest.java     |    1 +
 .../solrj/io/stream/StreamDecoratorTest.java    |    1 +
 .../cloud/TestCollectionStateWatchers.java      |   10 +-
 249 files changed, 9880 insertions(+), 7410 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dd840a2f/solr/solr-ref-guide/src/collections-api.adoc
----------------------------------------------------------------------
diff --cc solr/solr-ref-guide/src/collections-api.adoc
index 4d6d9f4,c266f96..527f4c7
--- a/solr/solr-ref-guide/src/collections-api.adoc
+++ b/solr/solr-ref-guide/src/collections-api.adoc
@@@ -186,8 -181,7 +186,8 @@@ The attributes that can be modified are
  * rule
  * snitch
  * policy
 +* withCollection
- +
+ 
  See the <<create,CREATE action>> section above for details on these attributes.
  
  [[reload]]

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dd840a2f/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Clause.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dd840a2f/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Policy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dd840a2f/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java
index 4b860cd,c00a90eb..8a14abd
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Row.java
@@@ -112,17 -106,9 +112,17 @@@ public class Row implements MapWriter 
  
    @Override
    public String toString() {
-     return node;
+     return jsonStr();
    }
  
 +  public Row addReplica(String coll, String shard, Replica.Type type) {
 +    return addReplica(coll, shard, type, 0, true);
 +  }
 +
 +  public Row addReplica(String coll, String shard, Replica.Type type, boolean strictMode) {
 +    return addReplica(coll, shard, type, 0, strictMode);
 +  }
 +
    /**
     * this simulates adding a replica of a certain coll+shard to node. as a result of adding a replica ,
     * values of certain attributes will be modified, in this node as well as other nodes. Please note that

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dd840a2f/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
index 74a3fa6,a481a40..11858f4
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/Suggestion.java
@@@ -23,12 -23,14 +23,13 @@@ import java.lang.annotation.RetentionPo
  import java.lang.annotation.Target;
  import java.util.ArrayList;
  import java.util.Arrays;
+ import java.util.Collection;
  import java.util.Comparator;
 -import java.util.HashMap;
  import java.util.HashSet;
  import java.util.List;
 -import java.util.Map;
  import java.util.Set;
  import java.util.concurrent.atomic.AtomicInteger;
 +import java.util.function.Consumer;
  import java.util.function.Function;
  import java.util.stream.Collectors;
  
@@@ -77,10 -78,10 +78,12 @@@ public class Suggestion 
  
      double max() default -1d;
  
+     boolean supportArrayVals() default false;
+ 
      String metricsKey() default NULL;
  
 +    Class implementation() default void.class;
 +
      ComputedType[] computedValues() default ComputedType.NULL;
    }
  
@@@ -524,9 -557,7 +565,8 @@@
      public final String perReplicaValue;
      public final Set<String> associatedPerNodeValues;
      public final String metricsAttribute;
-     public final boolean isPerNodeValue;
      public final Set<ComputedType> supportedComputedTypes;
 +    private final VarType impl;
  
  
      ConditionType() {
@@@ -560,12 -582,13 +600,14 @@@
        this.supportedComputedTypes = meta.computedValues()[0] == ComputedType.NULL ?
            emptySet() :
            unmodifiableSet(new HashSet(Arrays.asList(meta.computedValues())));
-       this.isHidden = meta.isHidden();
        this.wildCards = readSet(meta.wildCards());
 +
      }
  
+     public String getTagName() {
+       return meta.name();
+     }
+ 
      private String readStr(String s) {
        return NULL.equals(s) ? null : s;
      }
@@@ -589,14 -607,9 +631,14 @@@
        perNodeSuggestions(ctx);
      }
  
 +    @Override
      public void addViolatingReplicas(ViolationCtx ctx) {
 +      if (impl != null) {
 +        impl.addViolatingReplicas(ctx);
 +        return;
 +      }
        for (Row row : ctx.allRows) {
-         if (ctx.clause.tag.varType.isPerNodeValue && !row.node.equals(ctx.tagKey)) continue;
+         if (ctx.clause.tag.varType.meta.isNodeSpecificVal() && !row.node.equals(ctx.tagKey)) continue;
          collectViolatingReplicas(ctx, row);
        }
      }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dd840a2f/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
index faf43b8,a770102..2015b52
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
@@@ -74,10 -72,9 +74,10 @@@ public class SolrClientNodeStateProvide
  
  
    private final CloudSolrClient solrClient;
-   private final Map<String, Map<String, Map<String, List<ReplicaInfo>>>> nodeVsCollectionVsShardVsReplicaInfo = new HashMap<>();
+   protected final Map<String, Map<String, Map<String, List<ReplicaInfo>>>> nodeVsCollectionVsShardVsReplicaInfo = new HashMap<>();
    private Map<String, Object> snitchSession = new HashMap<>();
    private Map<String, Map> nodeVsTags = new HashMap<>();
 +  private Map<String, String> withCollectionsMap = new HashMap<>();
  
    public SolrClientNodeStateProvider(CloudSolrClient solrClient) {
      this.solrClient = solrClient;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dd840a2f/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dd840a2f/solr/solrj/src/test/org/apache/solr/client/solrj/cloud/autoscaling/TestPolicy.java
----------------------------------------------------------------------