You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/03/31 18:58:57 UTC
[1/6] cassandra git commit: remove unnecessary BB allocatetion;
follow up for CASSANDRA-8979
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 ec958f05e -> 74bfa773a
refs/heads/cassandra-2.1 eed27ac3e -> c9b83e0a8
refs/heads/trunk 4a4ea06a6 -> 230cca580
remove unnecessary BB allocatetion; follow up for CASSANDRA-8979
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74bfa773
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74bfa773
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74bfa773
Branch: refs/heads/cassandra-2.0
Commit: 74bfa773a299f2f0c825096c9c6ec521a5073e69
Parents: ec958f0
Author: Oleg Anastasyev <ol...@gmail.com>
Authored: Tue Mar 31 11:55:37 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 31 11:57:14 2015 -0500
----------------------------------------------------------------------
.../db/compaction/PrecompactedRow.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74bfa773/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
index 4627fa2..f41e073 100644
--- a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
@@ -157,20 +157,20 @@ public class PrecompactedRow extends AbstractCompactedRow
if (compactedCf == null)
return;
- DataOutputBuffer buffer = new DataOutputBuffer();
- try
+ // do not update digest in case of missing or purged row level tombstones, see CASSANDRA-8979
+ if (compactedCf.deletionInfo().getTopLevelDeletion() != DeletionTime.LIVE)
{
- DeletionTime.serializer.serialize(compactedCf.deletionInfo().getTopLevelDeletion(), buffer);
-
- // do not update digest in case of missing or purged row level tombstones, see CASSANDRA-8979
- if (compactedCf.deletionInfo().getTopLevelDeletion() != DeletionTime.LIVE)
+ DataOutputBuffer buffer = new DataOutputBuffer();
+ try
{
+ DeletionTime.serializer.serialize(compactedCf.deletionInfo().getTopLevelDeletion(), buffer);
+
digest.update(buffer.getData(), 0, buffer.getLength());
}
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
}
compactedCf.updateDigest(digest);
}
[2/6] cassandra git commit: remove unnecessary BB allocatetion;
follow up for CASSANDRA-8979
Posted by yu...@apache.org.
remove unnecessary BB allocatetion; follow up for CASSANDRA-8979
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74bfa773
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74bfa773
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74bfa773
Branch: refs/heads/cassandra-2.1
Commit: 74bfa773a299f2f0c825096c9c6ec521a5073e69
Parents: ec958f0
Author: Oleg Anastasyev <ol...@gmail.com>
Authored: Tue Mar 31 11:55:37 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 31 11:57:14 2015 -0500
----------------------------------------------------------------------
.../db/compaction/PrecompactedRow.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74bfa773/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
index 4627fa2..f41e073 100644
--- a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
@@ -157,20 +157,20 @@ public class PrecompactedRow extends AbstractCompactedRow
if (compactedCf == null)
return;
- DataOutputBuffer buffer = new DataOutputBuffer();
- try
+ // do not update digest in case of missing or purged row level tombstones, see CASSANDRA-8979
+ if (compactedCf.deletionInfo().getTopLevelDeletion() != DeletionTime.LIVE)
{
- DeletionTime.serializer.serialize(compactedCf.deletionInfo().getTopLevelDeletion(), buffer);
-
- // do not update digest in case of missing or purged row level tombstones, see CASSANDRA-8979
- if (compactedCf.deletionInfo().getTopLevelDeletion() != DeletionTime.LIVE)
+ DataOutputBuffer buffer = new DataOutputBuffer();
+ try
{
+ DeletionTime.serializer.serialize(compactedCf.deletionInfo().getTopLevelDeletion(), buffer);
+
digest.update(buffer.getData(), 0, buffer.getLength());
}
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
}
compactedCf.updateDigest(digest);
}
[5/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9b83e0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9b83e0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9b83e0a
Branch: refs/heads/cassandra-2.1
Commit: c9b83e0a811635428735a0b9e217cb106e499bea
Parents: eed27ac 74bfa77
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 31 11:57:31 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 31 11:57:31 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] cassandra git commit: remove unnecessary BB allocatetion;
follow up for CASSANDRA-8979
Posted by yu...@apache.org.
remove unnecessary BB allocatetion; follow up for CASSANDRA-8979
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74bfa773
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74bfa773
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74bfa773
Branch: refs/heads/trunk
Commit: 74bfa773a299f2f0c825096c9c6ec521a5073e69
Parents: ec958f0
Author: Oleg Anastasyev <ol...@gmail.com>
Authored: Tue Mar 31 11:55:37 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 31 11:57:14 2015 -0500
----------------------------------------------------------------------
.../db/compaction/PrecompactedRow.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/74bfa773/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
index 4627fa2..f41e073 100644
--- a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
@@ -157,20 +157,20 @@ public class PrecompactedRow extends AbstractCompactedRow
if (compactedCf == null)
return;
- DataOutputBuffer buffer = new DataOutputBuffer();
- try
+ // do not update digest in case of missing or purged row level tombstones, see CASSANDRA-8979
+ if (compactedCf.deletionInfo().getTopLevelDeletion() != DeletionTime.LIVE)
{
- DeletionTime.serializer.serialize(compactedCf.deletionInfo().getTopLevelDeletion(), buffer);
-
- // do not update digest in case of missing or purged row level tombstones, see CASSANDRA-8979
- if (compactedCf.deletionInfo().getTopLevelDeletion() != DeletionTime.LIVE)
+ DataOutputBuffer buffer = new DataOutputBuffer();
+ try
{
+ DeletionTime.serializer.serialize(compactedCf.deletionInfo().getTopLevelDeletion(), buffer);
+
digest.update(buffer.getData(), 0, buffer.getLength());
}
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
}
compactedCf.updateDigest(digest);
}
[6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/230cca58
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/230cca58
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/230cca58
Branch: refs/heads/trunk
Commit: 230cca580aa9a2c8704b41b29c0b6b2343478adc
Parents: 4a4ea06 c9b83e0
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 31 11:58:47 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 31 11:58:47 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/6] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9b83e0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9b83e0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9b83e0a
Branch: refs/heads/trunk
Commit: c9b83e0a811635428735a0b9e217cb106e499bea
Parents: eed27ac 74bfa77
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 31 11:57:31 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 31 11:57:31 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------