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 2011/11/14 22:30:05 UTC
svn commit: r1201913 - in /cassandra/branches/cassandra-1.0: CHANGES.txt
src/java/org/apache/cassandra/db/CollationController.java
Author: jbellis
Date: Mon Nov 14 21:30:04 2011
New Revision: 1201913
URL: http://svn.apache.org/viewvc?rev=1201913&view=rev
Log:
revert #2503
patch by jbellis; reviewed by slebresne for CASSANDRA-3491
Modified:
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/CollationController.java
Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1201913&r1=1201912&r2=1201913&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Mon Nov 14 21:30:04 2011
@@ -1,3 +1,7 @@
+1.0.4
+ * revert name-based query defragmentation aka CASSANDRA-2503 (CASSANDRA-3491)
+
+
1.0.3
* fix invalidate-related test failures (CASSANDRA-3437)
* add next-gen cqlsh to bin/ (CASSANDRA-3188, 3131)
Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/CollationController.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/CollationController.java?rev=1201913&r1=1201912&r2=1201913&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/CollationController.java (original)
+++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/CollationController.java Mon Nov 14 21:30:04 2011
@@ -150,22 +150,7 @@ public class CollationController
};
ColumnFamily returnCF = container.cloneMeShallow();
filter.collateColumns(returnCF, Collections.singletonList(toCollate), cfs.metadata.comparator, gcBefore);
-
- // "hoist up" the requested data into a more recent sstable
- if (sstablesIterated >= cfs.getMinimumCompactionThreshold() && cfs.getCompactionStrategy() instanceof SizeTieredCompactionStrategy)
- {
- RowMutation rm = new RowMutation(cfs.table.name, new Row(filter.key, returnCF.cloneMe()));
- try
- {
- rm.applyUnsafe(); // skipping commitlog is fine since we're just de-fragmenting existing data
- }
- catch (IOException e)
- {
- // log and allow the result to be returned
- logger.error("Error re-writing read results", e);
- }
- }
-
+
// Caller is responsible for final removeDeletedCF. This is important for cacheRow to work correctly:
return returnCF;
}