diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java index 5fc36393092..eb221cabeed 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/cluster/ping/replication/TransportShardReplicationPingAction.java @@ -23,7 +23,7 @@ import org.elasticsearch.action.support.replication.TransportShardReplicationOpe import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.action.shard.ShardStateAction; -import org.elasticsearch.cluster.routing.ShardsIterator; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.IndicesService; @@ -64,7 +64,7 @@ public class TransportShardReplicationPingAction extends TransportShardReplicati @Override protected void shardOperationOnReplica(ShardOperationRequest shardRequest) { } - @Override protected ShardsIterator shards(ClusterState clusterState, ShardReplicationPingRequest request) { + @Override protected ShardIterator shards(ClusterState clusterState, ShardReplicationPingRequest request) { return clusterService.state().routingTable().index(request.index()).shard(request.shardId()).shardsIt(); } } \ No newline at end of file diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java index d20440b12c8..1fafa25ce97 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/status/TransportIndicesStatusAction.java @@ -29,8 +29,8 @@ import org.elasticsearch.action.support.broadcast.TransportBroadcastOperationAct import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.GroupShardsIterator; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.cluster.routing.ShardRouting; -import org.elasticsearch.cluster.routing.ShardsIterator; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.engine.Engine; @@ -93,14 +93,14 @@ public class TransportIndicesStatusAction extends TransportBroadcastOperationAct /** * We want to go over all assigned nodes (to get recovery status) and not just active ones. */ - @Override protected ShardRouting nextShardOrNull(ShardsIterator shardIt) { + @Override protected ShardRouting nextShardOrNull(ShardIterator shardIt) { return shardIt.nextAssignedOrNull(); } /** * We want to go over all assigned nodes (to get recovery status) and not just active ones. */ - @Override protected boolean hasNextShard(ShardsIterator shardIt) { + @Override protected boolean hasNextShard(ShardIterator shardIt) { return shardIt.hasNextAssigned(); } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java index 874d3110c19..522398fd35a 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java @@ -34,7 +34,7 @@ import org.elasticsearch.cluster.ClusterService; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.routing.GroupShardsIterator; -import org.elasticsearch.cluster.routing.ShardsIterator; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.common.UUID; import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.collect.Maps; @@ -187,11 +187,11 @@ public class TransportBulkAction extends BaseAction { if (mappingMd != null && mappingMd.routing().required() && deleteRequest.routing() == null) { // if routing is required, and no routing on the delete request, we need to broadcast it.... GroupShardsIterator groupShards = clusterService.operationRouting().broadcastDeleteShards(clusterState, deleteRequest.index()); - for (ShardsIterator shardsId : groupShards) { - List list = requestsByShard.get(shardsId.shardId()); + for (ShardIterator shardIt : groupShards) { + List list = requestsByShard.get(shardIt.shardId()); if (list == null) { list = Lists.newArrayList(); - requestsByShard.put(shardsId.shardId(), list); + requestsByShard.put(shardIt.shardId(), list); } list.add(new BulkItemRequest(i, request)); } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java index 0c11e0e7f2c..d572f456c29 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java @@ -33,7 +33,7 @@ import org.elasticsearch.cluster.action.index.MappingUpdatedAction; import org.elasticsearch.cluster.action.shard.ShardStateAction; import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.cluster.metadata.MappingMetaData; -import org.elasticsearch.cluster.routing.ShardsIterator; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.common.collect.Sets; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; @@ -93,7 +93,7 @@ public class TransportShardBulkAction extends TransportShardReplicationOperation state.blocks().indexBlockedRaiseException(ClusterBlockLevel.WRITE, request.index()); } - @Override protected ShardsIterator shards(ClusterState clusterState, BulkShardRequest request) { + @Override protected ShardIterator shards(ClusterState clusterState, BulkShardRequest request) { return clusterState.routingTable().index(request.index()).shard(request.shardId()).shardsIt(); } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java index da1619094cd..16f425090dc 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/TransportDeleteAction.java @@ -34,7 +34,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.action.shard.ShardStateAction; import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.cluster.metadata.MappingMetaData; -import org.elasticsearch.cluster.routing.ShardsIterator; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.engine.Engine; @@ -149,7 +149,7 @@ public class TransportDeleteAction extends TransportShardReplicationOperationAct indexShard.delete(delete); } - @Override protected ShardsIterator shards(ClusterState clusterState, DeleteRequest request) { + @Override protected ShardIterator shards(ClusterState clusterState, DeleteRequest request) { return clusterService.operationRouting() .deleteShards(clusterService.state(), request.index(), request.type(), request.id(), request.routing()); } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java index 08355a258bc..ff823213af0 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/delete/index/TransportShardDeleteAction.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.action.shard.ShardStateAction; import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.cluster.routing.GroupShardsIterator; -import org.elasticsearch.cluster.routing.ShardsIterator; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.engine.Engine; @@ -83,11 +83,11 @@ public class TransportShardDeleteAction extends TransportShardReplicationOperati indexShard.delete(delete); } - @Override protected ShardsIterator shards(ClusterState clusterState, ShardDeleteRequest request) { + @Override protected ShardIterator shards(ClusterState clusterState, ShardDeleteRequest request) { GroupShardsIterator group = clusterService.operationRouting().broadcastDeleteShards(clusterService.state(), request.index()); - for (ShardsIterator shards : group) { - if (shards.shardId().id() == request.shardId()) { - return shards; + for (ShardIterator shardIt : group) { + if (shardIt.shardId().id() == request.shardId()) { + return shardIt; } } throw new ElasticSearchIllegalStateException("No shards iterator found for shard [" + request.shardId() + "]"); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java index f1f31960b24..a26eb57e3b3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java @@ -26,7 +26,7 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.action.shard.ShardStateAction; import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.cluster.routing.GroupShardsIterator; -import org.elasticsearch.cluster.routing.ShardsIterator; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.indices.IndicesService; @@ -75,11 +75,11 @@ public class TransportShardDeleteByQueryAction extends TransportShardReplication indexShard(shardRequest).deleteByQuery(request.querySource(), request.queryParserName(), request.types()); } - @Override protected ShardsIterator shards(ClusterState clusterState, ShardDeleteByQueryRequest request) { + @Override protected ShardIterator shards(ClusterState clusterState, ShardDeleteByQueryRequest request) { GroupShardsIterator group = clusterService.operationRouting().deleteByQueryShards(clusterService.state(), request.index(), request.routing()); - for (ShardsIterator shards : group) { - if (shards.shardId().id() == request.shardId()) { - return shards; + for (ShardIterator shardIt : group) { + if (shardIt.shardId().id() == request.shardId()) { + return shardIt; } } throw new ElasticSearchIllegalStateException("No shards iterator found for shard [" + request.shardId() + "]"); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java index 6c4c2f5e15e..d4d9710138d 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/index/TransportIndexAction.java @@ -34,7 +34,7 @@ import org.elasticsearch.cluster.action.shard.ShardStateAction; import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MetaData; -import org.elasticsearch.cluster.routing.ShardsIterator; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.common.UUID; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; @@ -143,7 +143,7 @@ public class TransportIndexAction extends TransportShardReplicationOperationActi state.blocks().indexBlockedRaiseException(ClusterBlockLevel.WRITE, request.index()); } - @Override protected ShardsIterator shards(ClusterState clusterState, IndexRequest request) { + @Override protected ShardIterator shards(ClusterState clusterState, IndexRequest request) { return clusterService.operationRouting() .indexShards(clusterService.state(), request.index(), request.type(), request.id(), request.routing()); } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java index 96cc02b6478..bf157f6ea81 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java @@ -28,8 +28,8 @@ import org.elasticsearch.cluster.block.ClusterBlockLevel; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.GroupShardsIterator; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.cluster.routing.ShardRouting; -import org.elasticsearch.cluster.routing.ShardsIterator; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.trove.ExtTIntArrayList; import org.elasticsearch.search.SearchPhaseResult; @@ -123,7 +123,7 @@ public abstract class TransportSearchTypeAction extends BaseActionNote, if overriding this method, make sure to also override {@link #hasNextShard(org.elasticsearch.cluster.routing.ShardsIterator)}. + *

Note, if overriding this method, make sure to also override {@link #hasNextShard(org.elasticsearch.cluster.routing.ShardIterator)}. */ - protected ShardRouting nextShardOrNull(ShardsIterator shardIt) { + protected ShardRouting nextShardOrNull(ShardIterator shardIt) { return shardIt.nextActiveOrNull(); } /** * Allows to override how shard routing is iterated over. Default implementation uses - * {@link ShardsIterator#hasNextActive()}. + * {@link org.elasticsearch.cluster.routing.ShardIterator#hasNextActive()}. * - *

Note, if overriding this method, make sure to also override {@link #nextShardOrNull(org.elasticsearch.cluster.routing.ShardsIterator)}. + *

Note, if overriding this method, make sure to also override {@link #nextShardOrNull(org.elasticsearch.cluster.routing.ShardIterator)}. */ - protected boolean hasNextShard(ShardsIterator shardIt) { + protected boolean hasNextShard(ShardIterator shardIt) { return shardIt.hasNextActive(); } @@ -168,7 +168,7 @@ public abstract class TransportBroadcastOperationAction shardsResponses = new AtomicReferenceArray(groups.size()); - for (final ShardsIterator shards : groups) { - ShardRequest shardRequest = newShardRequestInstance(request, shards.shardId().id()); + for (final ShardIterator shardIt : groups) { + ShardRequest shardRequest = newShardRequestInstance(request, shardIt.shardId().id()); - // TODO for now, we fork operations on shards of the index + // TODO for now, we fork operations on shardIt of the index shardRequest.beforeLocalFork(); // optimize for local fork shardRequest.operationThreaded(true); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java index 6ab3d57a0d7..615a1c4bd33 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/replication/TransportShardReplicationOperationAction.java @@ -33,8 +33,8 @@ import org.elasticsearch.cluster.TimeoutClusterStateListener; import org.elasticsearch.cluster.action.shard.ShardStateAction; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.node.DiscoveryNodes; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.cluster.routing.ShardRouting; -import org.elasticsearch.cluster.routing.ShardsIterator; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Streamable; @@ -107,7 +107,7 @@ public abstract class TransportShardReplicationOperationAction 2) { - // only for more than 2 in the number of shards it makes sense, otherwise its 1 shard with 1 replica, quorum is 1 (which is what it is initialized to) - requiredNumber = (shards.size() / 2) + 1; + if (consistencyLevel == WriteConsistencyLevel.QUORUM && shardIt.size() > 2) { + // only for more than 2 in the number of shardIt it makes sense, otherwise its 1 shard with 1 replica, quorum is 1 (which is what it is initialized to) + requiredNumber = (shardIt.size() / 2) + 1; } else if (consistencyLevel == WriteConsistencyLevel.ALL) { - requiredNumber = shards.size(); + requiredNumber = shardIt.size(); } - if (shards.sizeActive() < requiredNumber) { + if (shardIt.sizeActive() < requiredNumber) { retry(fromClusterEvent, shard.shardId()); return false; } @@ -353,7 +353,7 @@ public abstract class TransportShardReplicationOperationAction listener; - private final ShardsIterator shardsIt; + private final ShardIterator shardIt; private final Request request; @@ -101,7 +101,7 @@ public abstract class TransportShardSingleOperationAction { +public class GroupShardsIterator implements Iterable { - private final Collection iterators; + private final Collection iterators; - public GroupShardsIterator(Collection iterators) { + public GroupShardsIterator(Collection iterators) { this.iterators = iterators; } public int totalSize() { int size = 0; - for (ShardsIterator shard : iterators) { + for (ShardIterator shard : iterators) { size += shard.size(); } return size; @@ -43,7 +43,7 @@ public class GroupShardsIterator implements Iterable { public int totalSizeActive() { int size = 0; - for (ShardsIterator shard : iterators) { + for (ShardIterator shard : iterators) { size += shard.sizeActive(); } return size; @@ -53,11 +53,11 @@ public class GroupShardsIterator implements Iterable { return iterators.size(); } - public Collection iterators() { + public Collection iterators() { return iterators; } - @Override public Iterator iterator() { + @Override public Iterator iterator() { return iterators.iterator(); } } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java index 2e8410a8c22..81c626b8f39 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ImmutableShardRouting.java @@ -133,8 +133,8 @@ public class ImmutableShardRouting implements Streamable, Serializable, ShardRou return shardIdentifier; } - @Override public ShardsIterator shardsIt() { - return new PlainShardsIterator(shardId(), ImmutableList.of((ShardRouting) this)); + @Override public ShardIterator shardsIt() { + return new PlainShardIterator(shardId(), ImmutableList.of((ShardRouting) this)); } public static ImmutableShardRouting readShardRoutingEntry(StreamInput in) throws IOException { diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java index e7093594d1d..293ae8b32c3 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java @@ -138,12 +138,12 @@ public class IndexRoutingTable implements Iterable { } /** - * A group shards iterator where each group ({@link ShardsIterator} + * A group shards iterator where each group ({@link ShardIterator} * is an iterator across shard replication group. */ public GroupShardsIterator groupByShardsIt() { // use list here since we need to maintain identity across shards - ArrayList set = new ArrayList(); + ArrayList set = new ArrayList(shards.size()); for (IndexShardRoutingTable indexShard : this) { set.add(indexShard.shardsIt()); } @@ -159,7 +159,7 @@ public class IndexRoutingTable implements Iterable { */ public GroupShardsIterator groupByAllIt() { // use list here since we need to maintain identity across shards - ArrayList set = new ArrayList(); + ArrayList set = new ArrayList(); for (IndexShardRoutingTable indexShard : this) { for (ShardRouting shardRouting : indexShard) { set.add(shardRouting.shardsIt()); diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java index 246f64039dd..dd2db856643 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java @@ -90,12 +90,12 @@ public class IndexShardRoutingTable implements Iterable { return count; } - public ShardsIterator shardsIt() { - return new IndexShardsIterator(0); + public ShardIterator shardsIt() { + return new IndexShardIterator(0); } - public ShardsIterator shardsRandomIt() { - return new IndexShardsIterator(nextCounter()); + public ShardIterator shardsRandomIt() { + return new IndexShardIterator(nextCounter()); } public ShardRouting primaryShard() { @@ -141,7 +141,7 @@ public class IndexShardRoutingTable implements Iterable { *

The class can be used from different threads, though not designed to be used concurrently * from different threads. */ - class IndexShardsIterator implements ShardsIterator, Iterator { + class IndexShardIterator implements ShardIterator, Iterator { private final int origIndex; @@ -149,7 +149,7 @@ public class IndexShardRoutingTable implements Iterable { private volatile int counter = 0; - private IndexShardsIterator(int index) { + private IndexShardIterator(int index) { this.origIndex = index; this.index = index; } @@ -158,7 +158,7 @@ public class IndexShardRoutingTable implements Iterable { return this; } - @Override public ShardsIterator reset() { + @Override public ShardIterator reset() { counter = 0; index = origIndex; return this; @@ -283,7 +283,7 @@ public class IndexShardRoutingTable implements Iterable { @Override public boolean equals(Object o) { if (this == o) return true; - ShardsIterator that = (ShardsIterator) o; + ShardIterator that = (ShardIterator) o; if (shardId != null ? !shardId.equals(that.shardId()) : that.shardId() != null) return false; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java similarity index 94% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java index 64b2aa2bedc..17c65e1ef03 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardsIterator.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java @@ -28,7 +28,7 @@ import java.util.NoSuchElementException; /** * @author kimchy (shay.banon) */ -public class PlainShardsIterator implements ShardsIterator { +public class PlainShardIterator implements ShardIterator { private final ShardId shardId; @@ -36,12 +36,12 @@ public class PlainShardsIterator implements ShardsIterator { private volatile int counter = 0; - public PlainShardsIterator(ShardId shardId, List shards) { + public PlainShardIterator(ShardId shardId, List shards) { this.shardId = shardId; this.shards = shards; } - @Override public ShardsIterator reset() { + @Override public ShardIterator reset() { this.counter = 0; return this; } @@ -152,7 +152,7 @@ public class PlainShardsIterator implements ShardsIterator { @Override public boolean equals(Object o) { if (this == o) return true; - ShardsIterator that = (ShardsIterator) o; + ShardIterator that = (ShardIterator) o; if (shardId != null ? !shardId.equals(that.shardId()) : that.shardId() != null) return false; diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java index 0de160fdbc0..2afad53e176 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/RoutingTable.java @@ -145,7 +145,7 @@ public class RoutingTable implements Iterable { */ public GroupShardsIterator allShardsGrouped(String... indices) throws IndexMissingException { // use list here since we need to maintain identity across shards - ArrayList set = new ArrayList(); + ArrayList set = new ArrayList(); if (indices == null || indices.length == 0) { indices = indicesRouting.keySet().toArray(new String[indicesRouting.keySet().size()]); } @@ -177,7 +177,7 @@ public class RoutingTable implements Iterable { */ public GroupShardsIterator primaryShardsGrouped(String... indices) throws IndexMissingException { // use list here since we need to maintain identity across shards - ArrayList set = new ArrayList(); + ArrayList set = new ArrayList(); if (indices == null || indices.length == 0) { indices = indicesRouting.keySet().toArray(new String[indicesRouting.keySet().size()]); } diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java similarity index 95% rename from modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java rename to modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java index 2167958c323..625500cadf1 100644 --- a/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardsIterator.java +++ b/modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/ShardIterator.java @@ -29,7 +29,7 @@ import java.util.NoSuchElementException; * * @author kimchy (shay.banon) */ -public interface ShardsIterator extends Iterable, Iterator { +public interface ShardIterator extends Iterable, Iterator { /** * The shard id this group relates to. @@ -39,7 +39,7 @@ public interface ShardsIterator extends Iterable, Iterator set = new HashSet(); + HashSet set = new HashSet(); IndexRoutingTable indexRouting = indexRoutingTable(clusterState, index); for (String r : routings) { int shardId = shardId(clusterState, index, null, null, r); @@ -109,7 +109,7 @@ public class PlainOperationRouting extends AbstractComponent implements Operatio if (routings != null && routings.length > 0) { // we use set here and not list since we might get duplicates - HashSet set = new HashSet(); + HashSet set = new HashSet(); for (String index : indices) { IndexRoutingTable indexRouting = indexRoutingTable(clusterState, index); for (String r : routings) { @@ -125,7 +125,7 @@ public class PlainOperationRouting extends AbstractComponent implements Operatio return new GroupShardsIterator(set); } else { // we use list here since we know we are not going to create duplicates - ArrayList set = new ArrayList(); + ArrayList set = new ArrayList(); for (String index : indices) { IndexRoutingTable indexRouting = indexRoutingTable(clusterState, index); for (IndexShardRoutingTable indexShard : indexRouting) { diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceEmbeddedSearchTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceEmbeddedSearchTests.java index d9ccb372edc..16d7a503209 100644 --- a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceEmbeddedSearchTests.java +++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceEmbeddedSearchTests.java @@ -22,8 +22,8 @@ package org.elasticsearch.test.integration.search; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; import org.elasticsearch.cluster.ClusterService; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.cluster.routing.ShardRouting; -import org.elasticsearch.cluster.routing.ShardsIterator; import org.elasticsearch.common.collect.ImmutableMap; import org.elasticsearch.common.collect.Sets; import org.elasticsearch.common.trove.ExtTIntArrayList; @@ -114,8 +114,8 @@ public class TwoInstanceEmbeddedSearchTests extends AbstractNodesTests { .from(0).size(60).explain(true).indexBoost("test", 1.0f).indexBoost("test2", 2.0f); List dfsResults = newArrayList(); - for (ShardsIterator shardsIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { - for (ShardRouting shardRouting : shardsIt) { + for (ShardIterator shardIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { + for (ShardRouting shardRouting : shardIt) { InternalSearchRequest searchRequest = searchRequest(shardRouting, sourceBuilder) .scroll(new Scroll(new TimeValue(10, TimeUnit.MINUTES))); dfsResults.add(nodeToSearchService.get(shardRouting.currentNodeId()).executeDfsPhase(searchRequest)); @@ -182,8 +182,8 @@ public class TwoInstanceEmbeddedSearchTests extends AbstractNodesTests { .from(0).size(60).explain(true).sort("age", SortOrder.ASC); List dfsResults = newArrayList(); - for (ShardsIterator shardsIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { - for (ShardRouting shardRouting : shardsIt) { + for (ShardIterator shardIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { + for (ShardRouting shardRouting : shardIt) { InternalSearchRequest searchRequest = searchRequest(shardRouting, sourceBuilder) .scroll(new Scroll(new TimeValue(10, TimeUnit.MINUTES))); dfsResults.add(nodeToSearchService.get(shardRouting.currentNodeId()).executeDfsPhase(searchRequest)); @@ -276,8 +276,8 @@ public class TwoInstanceEmbeddedSearchTests extends AbstractNodesTests { } Map queryFetchResults = newHashMap(); - for (ShardsIterator shardsIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { - for (ShardRouting shardRouting : shardsIt) { + for (ShardIterator shardIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { + for (ShardRouting shardRouting : shardIt) { InternalSearchRequest searchRequest = searchRequest(shardRouting, sourceBuilder) .scroll(new Scroll(new TimeValue(10, TimeUnit.MINUTES))); QueryFetchSearchResult queryFetchResult = nodeToSearchService.get(shardRouting.currentNodeId()).executeFetchPhase(searchRequest); @@ -328,8 +328,8 @@ public class TwoInstanceEmbeddedSearchTests extends AbstractNodesTests { .facet(FacetBuilders.queryFacet("test1", termQuery("name", "test1"))); Map queryResults = newHashMap(); - for (ShardsIterator shardsIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { - for (ShardRouting shardRouting : shardsIt) { + for (ShardIterator shardIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { + for (ShardRouting shardRouting : shardIt) { InternalSearchRequest searchRequest = searchRequest(shardRouting, sourceBuilder) .scroll(new Scroll(new TimeValue(10, TimeUnit.MINUTES))); QuerySearchResult queryResult = nodeToSearchService.get(shardRouting.currentNodeId()).executeQueryPhase(searchRequest); diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceUnbalancedShardsEmbeddedSearchTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceUnbalancedShardsEmbeddedSearchTests.java index e3aacbb79d6..40b017b46a3 100644 --- a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceUnbalancedShardsEmbeddedSearchTests.java +++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/TwoInstanceUnbalancedShardsEmbeddedSearchTests.java @@ -22,8 +22,8 @@ package org.elasticsearch.test.integration.search; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; import org.elasticsearch.cluster.ClusterService; +import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.cluster.routing.ShardRouting; -import org.elasticsearch.cluster.routing.ShardsIterator; import org.elasticsearch.cluster.routing.operation.OperationRouting; import org.elasticsearch.cluster.routing.operation.plain.PlainOperationRouting; import org.elasticsearch.common.collect.ImmutableMap; @@ -118,8 +118,8 @@ public class TwoInstanceUnbalancedShardsEmbeddedSearchTests extends AbstractNode .from(0).size(60).explain(true); List dfsResults = newArrayList(); - for (ShardsIterator shardsIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { - for (ShardRouting shardRouting : shardsIt) { + for (ShardIterator shardIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { + for (ShardRouting shardRouting : shardIt) { InternalSearchRequest searchRequest = searchRequest(shardRouting, sourceBuilder) .scroll(new Scroll(new TimeValue(10, TimeUnit.MINUTES))); dfsResults.add(nodeToSearchService.get(shardRouting.currentNodeId()).executeDfsPhase(searchRequest)); @@ -185,8 +185,8 @@ public class TwoInstanceUnbalancedShardsEmbeddedSearchTests extends AbstractNode .from(0).size(60).explain(true).sort("age", SortOrder.ASC); List dfsResults = newArrayList(); - for (ShardsIterator shardsIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { - for (ShardRouting shardRouting : shardsIt) { + for (ShardIterator shardIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { + for (ShardRouting shardRouting : shardIt) { InternalSearchRequest searchRequest = searchRequest(shardRouting, sourceBuilder) .scroll(new Scroll(new TimeValue(10, TimeUnit.MINUTES))); dfsResults.add(nodeToSearchService.get(shardRouting.currentNodeId()).executeDfsPhase(searchRequest)); @@ -275,8 +275,8 @@ public class TwoInstanceUnbalancedShardsEmbeddedSearchTests extends AbstractNode // do this with dfs, since we have uneven distribution of docs between shards List dfsResults = newArrayList(); - for (ShardsIterator shardsIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { - for (ShardRouting shardRouting : shardsIt) { + for (ShardIterator shardIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { + for (ShardRouting shardRouting : shardIt) { InternalSearchRequest searchRequest = searchRequest(shardRouting, sourceBuilder) .scroll(new Scroll(new TimeValue(10, TimeUnit.MINUTES))); dfsResults.add(nodeToSearchService.get(shardRouting.currentNodeId()).executeDfsPhase(searchRequest)); @@ -330,8 +330,8 @@ public class TwoInstanceUnbalancedShardsEmbeddedSearchTests extends AbstractNode .facet(queryFacet("test1").query(termQuery("name", "test1"))); Map queryResults = newHashMap(); - for (ShardsIterator shardsIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { - for (ShardRouting shardRouting : shardsIt) { + for (ShardIterator shardIt : clusterService.operationRouting().searchShards(clusterService.state(), new String[]{"test"}, null, null)) { + for (ShardRouting shardRouting : shardIt) { InternalSearchRequest searchRequest = searchRequest(shardRouting, sourceBuilder) .scroll(new Scroll(new TimeValue(10, TimeUnit.MINUTES))); QuerySearchResult queryResult = nodeToSearchService.get(shardRouting.currentNodeId()).executeQueryPhase(searchRequest);