You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/01/30 08:48:10 UTC
git commit: Add UTMetaData equals()
Updated Branches:
refs/heads/trunk 5afc79b27 -> b1cb582a2
Add UTMetaData equals()
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1cb582a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1cb582a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1cb582a
Branch: refs/heads/trunk
Commit: b1cb582a259ba2b601958ba3a2e295c2ddbf44d2
Parents: 5afc79b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jan 30 08:43:01 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jan 30 08:43:01 2014 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/config/CFMetaData.java | 56 ++++++++++----------
.../org/apache/cassandra/config/KSMetaData.java | 13 ++---
.../org/apache/cassandra/config/UTMetaData.java | 7 +++
3 files changed, 41 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1cb582a/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index f377734..eeb5c68 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -32,7 +32,6 @@ import com.google.common.collect.Maps;
import org.apache.cassandra.db.composites.*;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.slf4j.Logger;
@@ -851,34 +850,33 @@ public final class CFMetaData
}
CFMetaData rhs = (CFMetaData) obj;
- return new EqualsBuilder()
- .append(ksName, rhs.ksName)
- .append(cfName, rhs.cfName)
- .append(cfType, rhs.cfType)
- .append(comparator, rhs.comparator)
- .append(comment, rhs.comment)
- .append(readRepairChance, rhs.readRepairChance)
- .append(dcLocalReadRepairChance, rhs.dcLocalReadRepairChance)
- .append(gcGraceSeconds, rhs.gcGraceSeconds)
- .append(defaultValidator, rhs.defaultValidator)
- .append(keyValidator, rhs.keyValidator)
- .append(minCompactionThreshold, rhs.minCompactionThreshold)
- .append(maxCompactionThreshold, rhs.maxCompactionThreshold)
- .append(cfId, rhs.cfId)
- .append(columnMetadata, rhs.columnMetadata)
- .append(compactionStrategyClass, rhs.compactionStrategyClass)
- .append(compactionStrategyOptions, rhs.compactionStrategyOptions)
- .append(compressionParameters, rhs.compressionParameters)
- .append(bloomFilterFpChance, rhs.bloomFilterFpChance)
- .append(memtableFlushPeriod, rhs.memtableFlushPeriod)
- .append(caching, rhs.caching)
- .append(defaultTimeToLive, rhs.defaultTimeToLive)
- .append(indexInterval, rhs.indexInterval)
- .append(speculativeRetry, rhs.speculativeRetry)
- .append(populateIoCacheOnFlush, rhs.populateIoCacheOnFlush)
- .append(droppedColumns, rhs.droppedColumns)
- .append(triggers, rhs.triggers)
- .isEquals();
+ if (!ksName.equals(rhs.ksName)) return false;
+ if (!cfName.equals(rhs.cfName)) return false;
+ if (!cfType.equals(rhs.cfType)) return false;
+ if (!comparator.equals(rhs.comparator)) return false;
+ if (!Objects.equal(comment, rhs.comment)) return false;
+ if (readRepairChance != rhs.readRepairChance) return false;
+ if (dcLocalReadRepairChance != rhs.dcLocalReadRepairChance) return false;
+ if (gcGraceSeconds != rhs.gcGraceSeconds) return false;
+ if (!Objects.equal(defaultValidator, rhs.defaultValidator)) return false;
+ if (!Objects.equal(keyValidator, rhs.keyValidator)) return false;
+ if (minCompactionThreshold != rhs.minCompactionThreshold) return false;
+ if (maxCompactionThreshold != rhs.maxCompactionThreshold) return false;
+ if (!Objects.equal(cfId, rhs.cfId)) return false;
+ if (!Objects.equal(columnMetadata, rhs.columnMetadata)) return false;
+ if (!Objects.equal(compactionStrategyClass, rhs.compactionStrategyClass)) return false;
+ if (!Objects.equal(compactionStrategyOptions, rhs.compactionStrategyOptions)) return false;
+ if (!Objects.equal(compressionParameters, rhs.compressionParameters)) return false;
+ if (!Objects.equal(bloomFilterFpChance, rhs.bloomFilterFpChance)) return false;
+ if (memtableFlushPeriod != rhs.memtableFlushPeriod) return false;
+ if (!Objects.equal(caching, rhs.caching)) return false;
+ if (defaultTimeToLive != rhs.defaultTimeToLive) return false;
+ if (indexInterval != rhs.indexInterval) return false;
+ if (!Objects.equal(speculativeRetry, rhs.speculativeRetry)) return false;
+ if (populateIoCacheOnFlush != rhs.populateIoCacheOnFlush) return false;
+ if (Objects.equal(droppedColumns, rhs.droppedColumns)) return false;
+ if (Objects.equal(triggers, rhs.triggers)) return false;
+ return true;
}
public int hashCode()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1cb582a/src/java/org/apache/cassandra/config/KSMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/KSMetaData.java b/src/java/org/apache/cassandra/config/KSMetaData.java
index 05e6248..9be1e2b 100644
--- a/src/java/org/apache/cassandra/config/KSMetaData.java
+++ b/src/java/org/apache/cassandra/config/KSMetaData.java
@@ -136,12 +136,13 @@ public final class KSMetaData
if (!(obj instanceof KSMetaData))
return false;
KSMetaData other = (KSMetaData)obj;
- return other.name.equals(name)
- && ObjectUtils.equals(other.strategyClass, strategyClass)
- && ObjectUtils.equals(other.strategyOptions, strategyOptions)
- && other.cfMetaData.equals(cfMetaData)
- && other.durableWrites == durableWrites
- && ObjectUtils.equals(other.userTypes, userTypes);
+ if (!other.name.equals(name)) return false;
+ if (!ObjectUtils.equals(other.strategyClass, strategyClass)) return false;
+ if (!ObjectUtils.equals(other.strategyOptions, strategyOptions)) return false;
+ if (!other.cfMetaData.equals(cfMetaData)) return false;
+ if (other.durableWrites != durableWrites) return false;
+ if (!ObjectUtils.equals(other.userTypes, userTypes)) return false;
+ return true;
}
public Map<String, CFMetaData> cfMetaData()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1cb582a/src/java/org/apache/cassandra/config/UTMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/UTMetaData.java b/src/java/org/apache/cassandra/config/UTMetaData.java
index b3061bb..b502910 100644
--- a/src/java/org/apache/cassandra/config/UTMetaData.java
+++ b/src/java/org/apache/cassandra/config/UTMetaData.java
@@ -151,4 +151,11 @@ public final class UTMetaData
{
userTypes.remove(type.name);
}
+
+ public boolean equals(Object that)
+ {
+ if (!(that instanceof UTMetaData))
+ return false;
+ return userTypes.equals(((UTMetaData) that).userTypes);
+ }
}