You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/11/08 01:36:24 UTC
svn commit: r833783 - in /incubator/cassandra/branches/cassandra-0.4: ./
interface/gen-java/org/apache/cassandra/service/ src/java/org/
src/java/org/apache/cassandra/db/ test/unit/org/
Author: jbellis
Date: Sun Nov 8 00:36:23 2009
New Revision: 833783
URL: http://svn.apache.org/viewvc?rev=833783&view=rev
Log:
merge 833498 from trunk
Modified:
incubator/cassandra/branches/cassandra-0.4/ (props changed)
incubator/cassandra/branches/cassandra-0.4/CHANGES.txt
incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java (props changed)
incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java (props changed)
incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java (props changed)
incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java (props changed)
incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java (props changed)
incubator/cassandra/branches/cassandra-0.4/src/java/org/ (props changed)
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/BinaryMemtable.java
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Memtable.java
incubator/cassandra/branches/cassandra-0.4/test/unit/org/ (props changed)
Propchange: incubator/cassandra/branches/cassandra-0.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 8 00:36:23 2009
@@ -1,2 +1,2 @@
/incubator/cassandra/branches/cassandra-0.3:774578-796573
-/incubator/cassandra/trunk:810540,819612,822878
+/incubator/cassandra/trunk:810540,819612,822878,833498
Modified: incubator/cassandra/branches/cassandra-0.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/CHANGES.txt?rev=833783&r1=833782&r2=833783&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/CHANGES.txt (original)
+++ incubator/cassandra/branches/cassandra-0.4/CHANGES.txt Sun Nov 8 00:36:23 2009
@@ -1,3 +1,7 @@
+0.4-dev
+ * avoid flushing empty binarymemtable (CASSANDRA-532)
+ * explicitly close bloom filter, index filehandles (CASSANDRA-533)
+
0.4.2
* Add validation disallowing null keys (CASSANDRA-486)
* Fix race conditions in TCPConnectionManager (CASSANDRA-487)
Propchange: incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 8 00:36:23 2009
@@ -1,2 +1,2 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573
-/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java:749219-768588,810540,819612,822878
+/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Cassandra.java:749219-768588,810540,819612,822878,833498
Propchange: incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 8 00:36:23 2009
@@ -1,3 +1,3 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/column_t.java:774578-792198
-/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java:810540,819612,822878
+/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/Column.java:810540,819612,822878,833498
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/column_t.java:749219-768588
Propchange: incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 8 00:36:23 2009
@@ -1,2 +1,2 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:774578-796573
-/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:749219-768588,810540,819612,822878
+/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/InvalidRequestException.java:749219-768588,810540,819612,822878,833498
Propchange: incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 8 00:36:23 2009
@@ -1,2 +1,2 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:774578-796573
-/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:749219-768588,810540,819612,822878
+/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java:749219-768588,810540,819612,822878,833498
Propchange: incubator/cassandra/branches/cassandra-0.4/interface/gen-java/org/apache/cassandra/service/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 8 00:36:23 2009
@@ -1,3 +1,3 @@
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:774578-792198
-/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810540,819612,822878
+/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java:810540,819612,822878,833498
/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/superColumn_t.java:749219-768588
Propchange: incubator/cassandra/branches/cassandra-0.4/src/java/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 8 00:36:23 2009
@@ -1,2 +1,2 @@
/incubator/cassandra/branches/cassandra-0.3/src/java/org:774578-796573
-/incubator/cassandra/trunk/src/java/org:749219-769885,810540,819612,822878
+/incubator/cassandra/trunk/src/java/org:749219-769885,810540,819612,822878,833498
Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/BinaryMemtable.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/BinaryMemtable.java?rev=833783&r1=833782&r2=833783&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/BinaryMemtable.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/BinaryMemtable.java Sun Nov 8 00:36:23 2009
@@ -121,6 +121,11 @@
}
}
+ public boolean isClean()
+ {
+ return columnFamilies_.isEmpty();
+ }
+
private void resolve(String key, byte[] buffer)
{
columnFamilies_.put(key, buffer);
Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=833783&r1=833782&r2=833783&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Sun Nov 8 00:36:23 2009
@@ -423,6 +423,9 @@
public void forceFlushBinary()
{
+ if (memtable_.isClean())
+ return;
+
submitFlush(binaryMemtable_.get());
}
Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Memtable.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Memtable.java?rev=833783&r1=833782&r2=833783&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Memtable.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Memtable.java Sun Nov 8 00:36:23 2009
@@ -42,7 +42,6 @@
private static Logger logger_ = Logger.getLogger( Memtable.class );
private boolean isFrozen_;
- private volatile boolean isDirty_;
private volatile boolean isFlushed_; // for tests, in particular forceBlockingFlush asserts this
private int threshold_ = DatabaseDescriptor.getMemtableSize()*1024*1024;
@@ -135,7 +134,6 @@
void put(String key, ColumnFamily columnFamily)
{
assert !isFrozen_; // not 100% foolproof but hell, it's an assert
- isDirty_ = true;
resolve(key, columnFamily);
}
@@ -248,9 +246,7 @@
public boolean isClean()
{
- // executor taskcount is inadequate for our needs here -- it can return zero under certain
- // race conditions even though a task has been processed.
- return !isDirty_;
+ return columnFamilies_.isEmpty();
}
/**
Propchange: incubator/cassandra/branches/cassandra-0.4/test/unit/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 8 00:36:23 2009
@@ -1,2 +1,2 @@
/incubator/cassandra/branches/cassandra-0.3/test/unit/org:774578-796573
-/incubator/cassandra/trunk/test/unit/org:749219-768583,810540,819612,822878
+/incubator/cassandra/trunk/test/unit/org:749219-768583,810540,819612,822878,833498