natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add tmp flag to Descriptor hashcode 

patch by Boris Yen; reviewed by jbellis for CASSANDRA-4021
This commit is contained in:
Jonathan Ellis 2013-03-11 18:13:57 -05:00
parent a8c1043698
commit ba06e4128b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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)

4
src/java/org/apache/cassandra/io/sstable/Descriptor.java
View File

@ -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