honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

more small optimizations

Browse Source
This commit is contained in:
kimchy 2011-07-22 19:53:05 +03:00
parent 1c2f25dd0f
commit 7de072b14e
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/elasticsearch/src/main/java/org/elasticsearch/cluster/routing/PlainShardIterator.java
View File

@ -51,15 +51,11 @@ public class PlainShardIterator extends PlainShardsIterator implements ShardIter
@Override public boolean equals(Object o) { @Override public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
ShardIterator that = (ShardIterator) o; ShardIterator that = (ShardIterator) o;
return shardId.equals(that.shardId());
if (shardId != null ? !shardId.equals(that.shardId()) : that.shardId() != null) return false;
return true;
} }
@Override public int hashCode() { @Override public int hashCode() {
return shardId != null ? shardId.hashCode() : 0; return shardId.hashCode();
} }
} }

10
modules/elasticsearch/src/main/java/org/elasticsearch/index/Index.java
View File

@ -57,17 +57,13 @@ public class Index implements Serializable, Streamable {
@Override public boolean equals(Object o) { @Override public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null) return false;
Index index1 = (Index) o; Index index1 = (Index) o;
return name.equals(index1.name);
if (name != null ? !name.equals(index1.name) : index1.name != null) return false;
return true;
} }
@Override public int hashCode() { @Override public int hashCode() {
return name != null ? name.hashCode() : 0; return name.hashCode();
} }
public static Index readIndexName(StreamInput in) throws IOException { public static Index readIndexName(StreamInput in) throws IOException {

16
modules/elasticsearch/src/main/java/org/elasticsearch/index/shard/ShardId.java
View File

@ -40,6 +40,8 @@ public class ShardId implements Serializable, Streamable {
private int shardId; private int shardId;
private int hashCode;
private ShardId() { private ShardId() {
} }
@ -51,6 +53,7 @@ public class ShardId implements Serializable, Streamable {
public ShardId(Index index, int shardId) { public ShardId(Index index, int shardId) {
this.index = index; this.index = index;
this.shardId = shardId; this.shardId = shardId;
this.hashCode = computeHashCode();
} }
public Index index() { public Index index() {
@ -75,17 +78,16 @@ public class ShardId implements Serializable, Streamable {
@Override public boolean equals(Object o) { @Override public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null) return false;
ShardId shardId1 = (ShardId) o; ShardId shardId1 = (ShardId) o;
return shardId == shardId1.shardId && index.name().equals(shardId1.index.name());
if (shardId != shardId1.shardId) return false;
if (index != null ? !index.equals(shardId1.index) : shardId1.index != null) return false;
return true;
} }
@Override public int hashCode() { @Override public int hashCode() {
return hashCode;
}
private int computeHashCode() {
int result = index != null ? index.hashCode() : 0; int result = index != null ? index.hashCode() : 0;
result = 31 * result + shardId; result = 31 * result + shardId;
return result; return result;