You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2015/12/22 17:47:37 UTC
[1/2] cassandra git commit: Avoid building PartitionUpdate in
toString()
Repository: cassandra
Updated Branches:
refs/heads/trunk 9a27d3fab -> e1cb9b48f
Avoid building PartitionUpdate in toString()
Patch by Tyler Hobbs; reviewed by Benjamin Lerer for CASSANDRA-10897
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/270e9862
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/270e9862
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/270e9862
Branch: refs/heads/trunk
Commit: 270e986264392b1ea10689768dcbb9403e449fd9
Parents: f967257
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Dec 22 10:46:26 2015 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Dec 22 10:46:26 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/partitions/PartitionUpdate.java | 22 ++++++++++++++++++++
2 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/270e9862/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ff139c4..e83e46e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.3
+ * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
* Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
* Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
* Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/270e9862/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
index 52f8f67..f10b3b6 100644
--- a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
+++ b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
@@ -581,6 +581,28 @@ public class PartitionUpdate extends AbstractBTreePartition
isBuilt = true;
}
+ @Override
+ public String toString()
+ {
+ if (isBuilt)
+ return super.toString();
+
+ // We intentionally override AbstractBTreePartition#toString() to avoid iterating over the rows in the
+ // partition, which can result in build() being triggered and lead to errors if the PartitionUpdate is later
+ // modified.
+
+ StringBuilder sb = new StringBuilder();
+ sb.append(String.format("[%s.%s] key=%s columns=%s",
+ metadata.ksName,
+ metadata.cfName,
+ metadata.getKeyValidator().getString(partitionKey().getKey()),
+ columns()));
+
+ sb.append("\n deletionInfo=").append(deletionInfo);
+ sb.append(" (not built)");
+ return sb.toString();
+ }
+
public static class PartitionUpdateSerializer
{
public void serialize(PartitionUpdate update, DataOutputPlus out, int version) throws IOException
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1cb9b48
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1cb9b48
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1cb9b48
Branch: refs/heads/trunk
Commit: e1cb9b48fee745e337260ba7bbe264fdde1ada94
Parents: 9a27d3f 270e986
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue Dec 22 10:47:26 2015 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue Dec 22 10:47:26 2015 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/partitions/PartitionUpdate.java | 22 ++++++++++++++++++++
2 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1cb9b48/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7bbfec6,e83e46e..84e1cb8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
-3.0.3
+3.2
+ * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
+ * Fix EstimatedHistogram creation in nodetool tablehistograms (CASSANDRA-10859)
+ * Establish bootstrap stream sessions sequentially (CASSANDRA-6992)
+ * Sort compactionhistory output by timestamp (CASSANDRA-10464)
+ * More efficient BTree removal (CASSANDRA-9991)
+ * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149)
+ * Group pending compactions based on table (CASSANDRA-10718)
+ * Add compressor name in sstablemetadata output (CASSANDRA-9879)
+ * Fix type casting for counter columns (CASSANDRA-10824)
+ * Prevent running Cassandra as root (CASSANDRA-8142)
+ * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639)
+ * Normalize all scripts (CASSANDRA-10679)
+ * Make compression ratio much more accurate (CASSANDRA-10225)
+ * Optimize building of Clustering object when only one is created (CASSANDRA-10409)
+ * Make index building pluggable (CASSANDRA-10681)
+ * Add sstable flush observer (CASSANDRA-10678)
+ * Improve NTS endpoints calculation (CASSANDRA-10200)
+ * Improve performance of the folderSize function (CASSANDRA-10677)
+ * Add support for type casting in selection clause (CASSANDRA-10310)
+ * Added graphing option to cassandra-stress (CASSANDRA-7918)
+ * Abort in-progress queries that time out (CASSANDRA-7392)
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+Merged from 3.0:
+ * Avoid building PartitionUpdate in toString (CASSANDRA-10897)
* Reduce heap spent when receiving many SSTables (CASSANDRA-10797)
* Add back support for 3rd party auth providers to bulk loader (CASSANDRA-10873)
* Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653)