cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject git commit: add tmp flag to Descriptor hashcode patch by Boris Yen; reviewed by jbellis for CASSANDRA-4021
Date Mon, 11 Mar 2013 23:15:09 GMT
Updated Branches:
  refs/heads/cassandra-1.1 a8c104369 -> ba06e4128


add tmp flag to Descriptor hashcode
patch by Boris Yen; reviewed by jbellis for CASSANDRA-4021


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba06e412
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba06e412
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba06e412

Branch: refs/heads/cassandra-1.1
Commit: ba06e4128b4cc66edb3e8e3ea02ce5cb5eae211c
Parents: a8c1043
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Mar 11 18:13:57 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Mar 11 18:13:57 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../apache/cassandra/io/sstable/Descriptor.java    |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba06e412/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 72e6288..da81b66 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.1.11
+ * add tmp flag to Descriptor hashcode (CASSANDRA-4021)
  * fix logging of "Found table data in data directories" when only system tables
    are present (CASSANDRA-5289)
  * cli: Add JMX authentication support (CASSANDRA-5080)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba06e412/src/java/org/apache/cassandra/io/sstable/Descriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/Descriptor.java b/src/java/org/apache/cassandra/io/sstable/Descriptor.java
index f4663b7..d2a9f46 100644
--- a/src/java/org/apache/cassandra/io/sstable/Descriptor.java
+++ b/src/java/org/apache/cassandra/io/sstable/Descriptor.java
@@ -100,7 +100,7 @@ public class Descriptor
         this.cfname = cfname;
         this.generation = generation;
         temporary = temp;
-        hashCode = Objects.hashCode(directory, generation, ksname, cfname);
+        hashCode = Objects.hashCode(directory, generation, ksname, cfname, temp);
 
         hasStringsInBloomFilter = version.compareTo("c") < 0;
         hasIntRowSize = version.compareTo("d") < 0;
@@ -266,7 +266,7 @@ public class Descriptor
         if (!(o instanceof Descriptor))
             return false;
         Descriptor that = (Descriptor)o;
-        return that.directory.equals(this.directory) && that.generation == this.generation
&& that.ksname.equals(this.ksname) && that.cfname.equals(this.cfname);
+        return that.directory.equals(this.directory) && that.generation == this.generation
&& that.ksname.equals(this.ksname) && that.cfname.equals(this.cfname) &&
that.temporary == this.temporary;
     }
 
     @Override


Mime
View raw message