Author: jbellis
Date: Wed Jan 13 19:14:23 2010
New Revision: 898895
URL: http://svn.apache.org/viewvc?rev=898895&view=rev
Log:
fix missing update of local deletion time introduced in #658.
patch by jbellis; reviewed by goffinet for CASSANDRA-689
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractType.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=898895&r1=898894&r2=898895&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
Wed Jan 13 19:14:23 2010
@@ -242,7 +242,7 @@
public void delete(ColumnFamily cf2)
{
- FBUtilities.atomicSetMax(localDeletionTime,
cf2.getLocalDeletionTime());
+ FBUtilities.atomicSetMax(localDeletionTime,
cf2.getLocalDeletionTime()); // do this first so we won't have a column that's
"deleted" but has no local deletion time
FBUtilities.atomicSetMax(markedForDeleteAt,
cf2.getMarkedForDeleteAt());
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=898895&r1=898894&r2=898895&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Wed Jan 13 19:14:23 2010
@@ -429,11 +429,6 @@
their contents; just the object itself as a "tombstone" that can be used
to repair other
replicas that do not know about the deletion.
*/
- static ColumnFamily removeDeleted(ColumnFamily cf)
- {
- return removeDeleted(cf, CompactionManager.getDefaultGCBefore());
- }
-
public static ColumnFamily removeDeleted(ColumnFamily cf, int gcBefore)
{
if (cf == null)
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java?rev=898895&r1=898894&r2=898895&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
Wed Jan 13 19:14:23 2010
@@ -183,6 +183,7 @@
{
addColumn(subColumn);
}
+ FBUtilities.atomicSetMax(localDeletionTime,
column.getLocalDeletionTime()); // do this first so we won't have a column
that's "deleted" but has no local deletion time
FBUtilities.atomicSetMax(markedForDeleteAt,
column.getMarkedForDeleteAt());
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractType.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractType.java?rev=898895&r1=898894&r2=898895&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractType.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractType.java
Wed Jan 13 19:14:23 2010
@@ -82,7 +82,7 @@
StringBuilder builder = new StringBuilder();
for (IColumn column : columns)
{
- builder.append(getString(column.name())).append(",");
+ builder.append(column.getString(this)).append(",");
}
return builder.toString();
}
