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/10/04 14:43:39 UTC

[43/45] lucene-solr:jira/solr-11285-sim: Merge branch 'jira/solr-11285' into jira/solr-11285-sim

Merge branch 'jira/solr-11285' into jira/solr-11285-sim


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1a3aab7a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1a3aab7a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1a3aab7a

Branch: refs/heads/jira/solr-11285-sim
Commit: 1a3aab7ac3cdd62befe48a327624689bec7be4a4
Parents: d199d77 06d89bb
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Oct 4 12:00:16 2017 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Oct 4 12:00:16 2017 +0200

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |   3 +
 .../lucene/analysis/synonym/SynonymMap.java     |   3 +-
 .../apache/lucene/search/ConjunctionScorer.java |   4 +-
 .../apache/lucene/search/TestConjunctions.java  |  56 ++-
 solr/CHANGES.txt                                |  66 ++--
 .../src/java/org/apache/solr/api/ApiBag.java    |   4 +
 .../org/apache/solr/cloud/AddReplicaCmd.java    |   4 +-
 .../src/java/org/apache/solr/cloud/Assign.java  |  83 +++--
 .../apache/solr/cloud/CreateCollectionCmd.java  |   2 +-
 .../org/apache/solr/cloud/CreateShardCmd.java   |   8 +-
 .../java/org/apache/solr/cloud/MigrateCmd.java  |   2 +-
 .../org/apache/solr/cloud/MoveReplicaCmd.java   |   2 +-
 .../java/org/apache/solr/cloud/Overseer.java    | 252 ++-----------
 .../OverseerCollectionConfigSetProcessor.java   |  10 +-
 .../cloud/OverseerCollectionMessageHandler.java |   4 +-
 .../apache/solr/cloud/OverseerStatusCmd.java    |   8 +-
 .../solr/cloud/OverseerTaskProcessor.java       |   4 +-
 .../apache/solr/cloud/OverseerTaskQueue.java    |   4 +-
 .../org/apache/solr/cloud/SplitShardCmd.java    |   2 +-
 .../src/java/org/apache/solr/cloud/Stats.java   | 147 ++++++++
 .../org/apache/solr/cloud/ZkController.java     |  24 +-
 .../apache/solr/cloud/ZkDistributedQueue.java   |  36 +-
 .../solr/cloud/autoscaling/ActionContext.java   |  12 +-
 .../autoscaling/AutoAddReplicasPlanAction.java  |  12 +-
 .../solr/cloud/autoscaling/AutoScaling.java     |  19 +-
 .../cloud/autoscaling/AutoScalingHandler.java   |  16 +-
 .../cloud/autoscaling/ComputePlanAction.java    |  65 +---
 .../cloud/autoscaling/ExecutePlanAction.java    | 115 +++++-
 .../cloud/autoscaling/HttpTriggerListener.java  |   4 +-
 .../cloud/autoscaling/NodeAddedTrigger.java     |  18 +-
 .../solr/cloud/autoscaling/NodeLostTrigger.java |   8 +-
 .../autoscaling/OverseerTriggerThread.java      |  59 ++-
 .../cloud/autoscaling/ScheduledTriggers.java    |  96 ++++-
 .../cloud/autoscaling/SearchRateTrigger.java    | 275 --------------
 .../cloud/autoscaling/SystemLogListener.java    |   4 +-
 .../solr/cloud/autoscaling/TriggerBase.java     |  20 +-
 .../cloud/autoscaling/TriggerEventQueue.java    |   6 +-
 .../solr/cloud/autoscaling/TriggerListener.java |   4 +-
 .../cloud/autoscaling/TriggerListenerBase.java  |   6 +-
 .../autoscaling/ZkDistributedQueueFactory.java  |   4 +-
 .../cloud/overseer/ClusterStateMutator.java     |  10 +-
 .../solr/cloud/overseer/CollectionMutator.java  |  10 +-
 .../apache/solr/cloud/overseer/NodeMutator.java |   3 +
 .../solr/cloud/overseer/ReplicaMutator.java     |  39 +-
 .../solr/cloud/overseer/SliceMutator.java       |  17 +-
 .../solr/cloud/overseer/ZkStateWriter.java      |   5 +-
 .../solr/handler/CdcrReplicatorManager.java     |   8 +-
 .../solr/handler/admin/MetricsHandler.java      |  11 +-
 .../org/apache/solr/response/DocsStreamer.java  |  87 +----
 .../solr/response/RetrieveFieldsOptimizer.java  | 130 +++++++
 .../apache/solr/search/SolrDocumentFetcher.java |  25 +-
 .../facet/FacetFieldProcessorByHashDV.java      |  11 +-
 .../org/apache/solr/search/facet/HLLAgg.java    |   1 +
 .../org/apache/solr/search/facet/UniqueAgg.java |   1 +
 .../solr/search/join/GraphPointsCollector.java  |   1 +
 .../test/org/apache/solr/cloud/AssignTest.java  |  19 +-
 .../apache/solr/cloud/CdcrBootstrapTest.java    |   1 -
 .../solr/cloud/DeleteInactiveReplicaTest.java   |   5 +-
 .../apache/solr/cloud/DistributedQueueTest.java |   6 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java |   4 +-
 ...verseerCollectionConfigSetProcessorTest.java |  73 +++-
 .../org/apache/solr/cloud/OverseerTest.java     |  31 +-
 .../cloud/SharedFSAutoReplicaFailoverTest.java  |  25 +-
 .../cloud/TestCloudJSONFacetJoinDomain.java     |  24 +-
 .../AutoAddReplicasIntegrationTest.java         |   2 +
 .../AutoAddReplicasPlanActionTest.java          |   2 +-
 .../autoscaling/ComputePlanActionTest.java      |  55 +--
 .../autoscaling/ExecutePlanActionTest.java      |  41 +-
 .../cloud/autoscaling/NodeAddedTriggerTest.java |  14 +-
 .../cloud/autoscaling/NodeLostTriggerTest.java  |  15 +-
 .../autoscaling/SearchRateTriggerTest.java      | 168 ---------
 .../solr/cloud/autoscaling/TestPolicyCloud.java |  16 +-
 .../autoscaling/TriggerIntegrationTest.java     |   4 +-
 .../cloud/overseer/TestClusterStateMutator.java |  16 +-
 .../solr/cloud/overseer/ZkStateReaderTest.java  |   8 +-
 .../solr/cloud/overseer/ZkStateWriterTest.java  |  12 +-
 .../admin/AutoscalingHistoryHandlerTest.java    |  21 +-
 .../solr/handler/admin/MetricsHandlerTest.java  |   9 -
 .../response/TestRetrieveFieldsOptimizer.java   |  56 +++
 .../solr/search/facet/TestJsonFacets.java       |  26 ++
 .../conf/solrconfig.xml                         |   1 -
 .../client/solrj/cloud/DistributedQueue.java    |   3 +
 .../autoscaling/AlreadyExistsException.java     |  35 ++
 .../cloud/autoscaling/BadVersionException.java  |  40 ++
 .../cloud/autoscaling/ClusterDataProvider.java  |  81 ----
 .../autoscaling/DelegatingCloudManager.java     |  65 ++++
 .../DelegatingClusterDataProvider.java          |  57 ---
 .../DelegatingClusterStateProvider.java         |  82 ++++
 .../DelegatingNodeStateProvider.java            |  43 +++
 .../cloud/autoscaling/DistribStateManager.java  |  44 ++-
 .../cloud/autoscaling/NodeStateProvider.java    |  43 +++
 .../solrj/cloud/autoscaling/NoneSuggester.java  |   4 +-
 .../client/solrj/cloud/autoscaling/Policy.java  |  74 ++--
 .../solrj/cloud/autoscaling/PolicyHelper.java   |  28 +-
 .../solrj/cloud/autoscaling/Preference.java     |   8 +
 .../solrj/cloud/autoscaling/ReplicaInfo.java    |   6 +-
 .../client/solrj/cloud/autoscaling/Row.java     |   9 +-
 .../autoscaling/SolrCloudDataProvider.java      |  63 ----
 .../cloud/autoscaling/SolrCloudManager.java     |  64 ++++
 .../solrj/cloud/autoscaling/VersionedData.java  |  44 +++
 .../solr/client/solrj/impl/CloudSolrClient.java |   6 +-
 .../client/solrj/impl/ClusterStateProvider.java |  35 +-
 .../solrj/impl/HttpClusterStateProvider.java    |  38 +-
 .../solrj/impl/SolrClientCloudDataProvider.java | 156 --------
 .../solrj/impl/SolrClientCloudManager.java      | 165 ++++++++
 .../impl/SolrClientClusterDataProvider.java     | 260 -------------
 .../solrj/impl/SolrClientNodeStateProvider.java | 227 +++++++++++
 .../impl/ZkClientClusterStateProvider.java      |  38 +-
 .../solrj/impl/ZkDistribStateManager.java       |  90 +++--
 .../solrj/request/CollectionAdminRequest.java   |   4 +
 .../apache/solr/common/cloud/ZkStateReader.java |   3 +-
 .../solr/common/params/AutoScalingParams.java   |   7 -
 .../solrj/cloud/autoscaling/TestPolicy.java     | 373 +++++++++++--------
 .../solrj/impl/CloudSolrClientCacheTest.java    |  20 +-
 114 files changed, 2593 insertions(+), 2106 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a3aab7a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DistribStateManager.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DistribStateManager.java
index 985d089,084c5b2..23bfb86
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DistribStateManager.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/DistribStateManager.java
@@@ -29,53 -29,36 +30,50 @@@ import org.apache.zookeeper.Watcher
  /**
   * Represents a distributed state repository.
   */
 -public interface DistribStateManager {
 +public interface DistribStateManager extends Closeable {
  
-   class VersionedData {
-     public final int version;
-     public final byte[] data;
- 
-     public VersionedData(int version, byte[] data) {
-       this.version = version;
-       this.data = data;
-     }
-   }
- 
-   default void close() throws IOException {
- 
-   }
- 
    // state accessors
  
-   boolean hasData(String path) throws IOException;
+   boolean hasData(String path) throws IOException, KeeperException, InterruptedException;
  
-   List<String> listData(String path) throws NoSuchElementException, IOException;
+   List<String> listData(String path) throws NoSuchElementException, IOException, KeeperException, InterruptedException;
  
-   VersionedData getData(String path, Watcher watcher) throws NoSuchElementException, IOException;
+   VersionedData getData(String path, Watcher watcher) throws NoSuchElementException, IOException, KeeperException, InterruptedException;
  
-   default VersionedData getData(String path) throws NoSuchElementException, IOException {
+   default VersionedData getData(String path) throws NoSuchElementException, IOException, KeeperException, InterruptedException {
      return getData(path, null);
    }
  
    // state mutators
  
-   void makePath(String path) throws IOException;
+   void makePath(String path) throws AlreadyExistsException, IOException, KeeperException, InterruptedException;
  
 +  /**
 +   * Create data (leaf) node at specified path.
 +   * @param path base path name of the node.
 +   * @param data data to be stored.
 +   * @param mode creation mode.
 +   * @return actual path of the node - in case of sequential nodes this will differ from the base path because
 +   * of the appended sequence number.
 +   * @throws IOException
 +   */
-   String createData(String path, byte[] data, CreateMode mode) throws IOException;
+   String createData(String path, byte[] data, CreateMode mode) throws AlreadyExistsException, IOException, KeeperException, InterruptedException;
  
-   void removeData(String path, int version) throws NoSuchElementException, IOException;
+   void removeData(String path, int version) throws NoSuchElementException, IOException, KeeperException, InterruptedException;
  
-   void setData(String path, byte[] data, int version) throws NoSuchElementException, IOException;
+   void setData(String path, byte[] data, int version) throws BadVersionException, NoSuchElementException, IOException, KeeperException, InterruptedException;
  
-   List<OpResult> multi(final Iterable<Op> ops) throws IOException;
+   List<OpResult> multi(final Iterable<Op> ops) throws BadVersionException, NoSuchElementException, AlreadyExistsException, IOException, KeeperException, InterruptedException;
+ 
+   AutoScalingConfig getAutoScalingConfig(Watcher watcher) throws InterruptedException, IOException;
+ 
+   default AutoScalingConfig getAutoScalingConfig() throws InterruptedException, IOException {
+     return getAutoScalingConfig(null);
+   }
+ 
++  @Override
++  default void close() {
++
++  }
 +
  }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a3aab7a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
index c24acd4,f6b9db1..ea14ca0
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/ReplicaInfo.java
@@@ -28,9 -27,10 +28,9 @@@ import org.apache.solr.common.cloud.ZkS
  public class ReplicaInfo implements MapWriter {
    final String name;
    String core, collection, shard;
 -  Replica.Type type;
    Map<String, Object> variables;
  
--  public ReplicaInfo(String name, String coll, String shard, Replica.Type type, Map<String, Object> vals) {
++  public ReplicaInfo(String name, String coll, String shard, Map<String, Object> vals) {
      this.name = name;
      this.variables = vals;
      this.collection = coll;

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

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a3aab7a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ZkDistribStateManager.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/impl/ZkDistribStateManager.java
index 8bf471e,7664ce2..7c6567d
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ZkDistribStateManager.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ZkDistribStateManager.java
@@@ -42,13 -52,11 +52,15 @@@ public class ZkDistribStateManager impl
    }
  
    @Override
-   public boolean hasData(String path) throws IOException {
+   public boolean hasData(String path) throws IOException, KeeperException, InterruptedException {
      try {
        return zkClient.exists(path, true);
 +    } catch (KeeperException.NoNodeException e) {
 +      return false;
-     } catch (KeeperException | InterruptedException e) {
++    } catch (KeeperException e) {
 +      throw new IOException(e);
+     } catch (InterruptedException e) {
+       throw e;
      }
    }