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/09/30 21:18:43 UTC
svn commit: r820400 - in /incubator/cassandra/branches/cassandra-0.4:
src/java/org/apache/cassandra/db/ test/unit/org/apache/cassandra/db/
Author: jbellis
Date: Wed Sep 30 19:18:41 2009
New Revision: 820400
URL: http://svn.apache.org/viewvc?rev=820400&view=rev
Log:
compute digest correctly, using byte[] contents instead of toString. switch to MD5 for non-wtfery. patch by jbellis; tested by Edmond Lau for CASSANDRA-462
Modified:
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Column.java
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamily.java
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/IColumn.java
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Row.java
incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/SuperColumn.java
incubator/cassandra/branches/cassandra-0.4/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Column.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Column.java?rev=820400&r1=820399&r2=820400&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Column.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Column.java Wed Sep 30 19:18:41 2009
@@ -20,10 +20,13 @@
import java.util.Collection;
import java.nio.ByteBuffer;
+import java.security.MessageDigest;
+import java.io.IOException;
import org.apache.commons.lang.ArrayUtils;
import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.io.DataOutputBuffer;
/**
@@ -172,13 +175,21 @@
return null;
}
- public byte[] digest()
+ public void updateDigest(MessageDigest digest)
{
- StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append(name);
- stringBuilder.append(":");
- stringBuilder.append(timestamp);
- return stringBuilder.toString().getBytes();
+ digest.update(name);
+ digest.update(value);
+ DataOutputBuffer buffer = new DataOutputBuffer();
+ try
+ {
+ buffer.writeLong(timestamp);
+ buffer.writeBoolean(isMarkedForDelete);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ digest.update(buffer.getData(), 0, buffer.getLength());
}
public int getLocalDeletionTime()
Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamily.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=820400&r1=820399&r2=820400&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamily.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/ColumnFamily.java Wed Sep 30 19:18:41 2009
@@ -26,12 +26,11 @@
import java.util.SortedSet;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.ConcurrentSkipListMap;
+import java.security.MessageDigest;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.log4j.Logger;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.io.ICompactSerializer2;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.db.marshal.AbstractType;
@@ -347,21 +346,12 @@
return sb.toString();
}
- public byte[] digest()
+ public void updateDigest(MessageDigest digest)
{
- byte[] xorHash = ArrayUtils.EMPTY_BYTE_ARRAY;
for (IColumn column : columns_.values())
{
- if (xorHash.length == 0)
- {
- xorHash = column.digest();
- }
- else
- {
- xorHash = FBUtilities.xor(xorHash, column.digest());
- }
+ column.updateDigest(digest);
}
- return xorHash;
}
public long getMarkedForDeleteAt()
Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/IColumn.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/IColumn.java?rev=820400&r1=820399&r2=820400&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/IColumn.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/IColumn.java Wed Sep 30 19:18:41 2009
@@ -19,6 +19,7 @@
package org.apache.cassandra.db;
import java.util.Collection;
+import java.security.MessageDigest;
import org.apache.cassandra.db.marshal.AbstractType;
@@ -42,7 +43,7 @@
public void addColumn(IColumn column);
public IColumn diff(IColumn column);
public int getObjectCount();
- public byte[] digest();
+ public void updateDigest(MessageDigest digest);
public int getLocalDeletionTime(); // for tombstone GC, so int is sufficient granularity
public String getString(AbstractType comparator);
}
Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Row.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Row.java?rev=820400&r1=820399&r2=820400&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Row.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/Row.java Wed Sep 30 19:18:41 2009
@@ -26,6 +26,8 @@
import java.util.Map;
import java.util.Set;
import java.util.Arrays;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
@@ -170,20 +172,22 @@
public byte[] digest()
{
- Set<String> cfamilies = columnFamilies_.keySet();
- byte[] xorHash = ArrayUtils.EMPTY_BYTE_ARRAY;
- for (String cFamily : cfamilies)
+ MessageDigest digest;
+ try
{
- if (xorHash.length == 0)
- {
- xorHash = columnFamilies_.get(cFamily).digest();
- }
- else
- {
- xorHash = FBUtilities.xor(xorHash, columnFamilies_.get(cFamily).digest());
- }
+ digest = MessageDigest.getInstance("MD5");
}
- return xorHash;
+ catch (NoSuchAlgorithmException e)
+ {
+ throw new AssertionError(e);
+ }
+
+ for (String cFamily : columnFamilies_.keySet())
+ {
+ columnFamilies_.get(cFamily).updateDigest(digest);
+ }
+
+ return digest.digest();
}
void clear()
Modified: incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/SuperColumn.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/SuperColumn.java?rev=820400&r1=820399&r2=820400&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/SuperColumn.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/src/java/org/apache/cassandra/db/SuperColumn.java Wed Sep 30 19:18:41 2009
@@ -23,15 +23,13 @@
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.ConcurrentSkipListMap;
+import java.security.MessageDigest;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.log4j.Logger;
-import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.io.ICompactSerializer2;
+import org.apache.cassandra.io.DataOutputBuffer;
import org.apache.cassandra.db.marshal.AbstractType;
-import org.apache.cassandra.db.marshal.MarshalException;
public final class SuperColumn implements IColumn, IColumnContainer
@@ -270,17 +268,24 @@
return null;
}
- public byte[] digest()
+ public void updateDigest(MessageDigest digest)
{
- byte[] xorHash = ArrayUtils.EMPTY_BYTE_ARRAY;
- if(name_ == null)
- return xorHash;
- xorHash = name_.clone();
- for(IColumn column : columns_.values())
- {
- xorHash = FBUtilities.xor(xorHash, column.digest());
- }
- return xorHash;
+ assert name_ != null;
+ digest.update(name_);
+ DataOutputBuffer buffer = new DataOutputBuffer();
+ try
+ {
+ buffer.writeLong(markedForDeleteAt);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ digest.update(buffer.getData(), 0, buffer.getLength());
+ for (IColumn column : columns_.values())
+ {
+ column.updateDigest(digest);
+ }
}
public String getString(AbstractType comparator)
Modified: incubator/cassandra/branches/cassandra-0.4/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.4/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java?rev=820400&r1=820399&r2=820400&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.4/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java (original)
+++ incubator/cassandra/branches/cassandra-0.4/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java Wed Sep 30 19:18:41 2009
@@ -132,11 +132,4 @@
//addcolumns will only add if timestamp >= old timestamp
assert Arrays.equals(val, cf_result.getColumn("col2".getBytes()).value());
}
-
- @Test
- public void testEmptyDigest()
- {
- ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1");
- assert cf.digest().length == 0;
- }
}