You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2018/09/28 06:39:54 UTC
cassandra git commit: ninja-add missing .hashCode() in new fqltool
classes
Repository: cassandra
Updated Branches:
refs/heads/trunk 876666abe -> a0636881f
ninja-add missing .hashCode() in new fqltool classes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0636881
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0636881
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0636881
Branch: refs/heads/trunk
Commit: a0636881f4c8d5e79b179825f07fabf25c325db5
Parents: 876666a
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Sep 28 08:39:12 2018 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Sep 28 08:39:12 2018 +0200
----------------------------------------------------------------------
.../apache/cassandra/fqltool/DriverResultSet.java | 16 ++++++++++++++++
.../apache/cassandra/fqltool/StoredResultSet.java | 16 ++++++++++++++++
2 files changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0636881/tools/fqltool/src/org/apache/cassandra/fqltool/DriverResultSet.java
----------------------------------------------------------------------
diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/DriverResultSet.java b/tools/fqltool/src/org/apache/cassandra/fqltool/DriverResultSet.java
index ccff370..e85b23b 100644
--- a/tools/fqltool/src/org/apache/cassandra/fqltool/DriverResultSet.java
+++ b/tools/fqltool/src/org/apache/cassandra/fqltool/DriverResultSet.java
@@ -22,6 +22,7 @@ import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
import com.google.common.collect.AbstractIterator;
@@ -137,6 +138,11 @@ public class DriverResultSet implements ResultHandler.ComparableResultSet
return true;
}
+ public int hashCode()
+ {
+ return Objects.hash(row);
+ }
+
public String toString()
{
StringBuilder sb = new StringBuilder();
@@ -210,6 +216,11 @@ public class DriverResultSet implements ResultHandler.ComparableResultSet
return asList().equals(o.asList());
}
+
+ public int hashCode()
+ {
+ return Objects.hash(columnDefinitions, failed, failureException);
+ }
}
public static class DriverDefinition implements ResultHandler.ComparableDefinition
@@ -239,6 +250,11 @@ public class DriverResultSet implements ResultHandler.ComparableResultSet
return def.equals(((DriverDefinition)oo).def);
}
+ public int hashCode()
+ {
+ return Objects.hash(def);
+ }
+
public String toString()
{
return getName() + ':' + getType();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0636881/tools/fqltool/src/org/apache/cassandra/fqltool/StoredResultSet.java
----------------------------------------------------------------------
diff --git a/tools/fqltool/src/org/apache/cassandra/fqltool/StoredResultSet.java b/tools/fqltool/src/org/apache/cassandra/fqltool/StoredResultSet.java
index b08861d..39c4734 100644
--- a/tools/fqltool/src/org/apache/cassandra/fqltool/StoredResultSet.java
+++ b/tools/fqltool/src/org/apache/cassandra/fqltool/StoredResultSet.java
@@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Objects;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@@ -148,6 +149,11 @@ public class StoredResultSet implements ResultHandler.ComparableResultSet
return row.equals(((StoredComparableRow)other).row);
}
+ public int hashCode()
+ {
+ return Objects.hash(row, cds);
+ }
+
public String toString()
{
return row.stream().map(ByteBufferUtil::bytesToHex).collect(Collectors.joining(","));
@@ -198,6 +204,11 @@ public class StoredResultSet implements ResultHandler.ComparableResultSet
return defs.equals(((StoredComparableColumnDefinitions)other).defs);
}
+ public int hashCode()
+ {
+ return Objects.hash(defs, wasFailed, failureException);
+ }
+
public String toString()
{
return defs.toString();
@@ -229,6 +240,11 @@ public class StoredResultSet implements ResultHandler.ComparableResultSet
return p.equals(((StoredComparableDefinition)other).p);
}
+ public int hashCode()
+ {
+ return Objects.hash(p);
+ }
+
public String toString()
{
return getName() + ':' + getType();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org