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 2013/05/14 20:34:09 UTC
[1/3] git commit: make BytesToken.toString only return hex bytes
patch by Juraj Sustek; reviewed by jbellis for CASSANDRA-5566
Updated Branches:
refs/heads/cassandra-1.2 11b0cfbe7 -> 3950de9e8
refs/heads/trunk 4adb583c2 -> 025477471
make BytesToken.toString only return hex bytes
patch by Juraj Sustek; reviewed by jbellis for CASSANDRA-5566
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3950de9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3950de9e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3950de9e
Branch: refs/heads/cassandra-1.2
Commit: 3950de9e830b8e5c21367ce98f7b34a5049dac00
Parents: 11b0cfb
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue May 14 13:33:57 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue May 14 13:33:57 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/dht/BytesToken.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3950de9e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index df13e6a..6432775 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.5
+ * make BytesToken.toString only return hex bytes (CASSANDRA-5566)
* Ensure that submitBackground enqueues at least one task (CASSANDRA-5554)
* fix 2i updates with identical values and timestamps (CASSANDRA-5540)
* fix compaction throttling bursty-ness (CASSANDRA-4316)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3950de9e/src/java/org/apache/cassandra/dht/BytesToken.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/BytesToken.java b/src/java/org/apache/cassandra/dht/BytesToken.java
index a95eb98..f2f9eab 100644
--- a/src/java/org/apache/cassandra/dht/BytesToken.java
+++ b/src/java/org/apache/cassandra/dht/BytesToken.java
@@ -41,7 +41,7 @@ public class BytesToken extends Token<byte[]>
@Override
public String toString()
{
- return "Token(bytes[" + Hex.bytesToHex(token) + "])";
+ return Hex.bytesToHex(token);
}
public int compareTo(Token<byte[]> o)
[2/3] git commit: make BytesToken.toString only return hex bytes
patch by Juraj Sustek; reviewed by jbellis for CASSANDRA-5566
Posted by jb...@apache.org.
make BytesToken.toString only return hex bytes
patch by Juraj Sustek; reviewed by jbellis for CASSANDRA-5566
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3950de9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3950de9e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3950de9e
Branch: refs/heads/trunk
Commit: 3950de9e830b8e5c21367ce98f7b34a5049dac00
Parents: 11b0cfb
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue May 14 13:33:57 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue May 14 13:33:57 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/dht/BytesToken.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3950de9e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index df13e6a..6432775 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.5
+ * make BytesToken.toString only return hex bytes (CASSANDRA-5566)
* Ensure that submitBackground enqueues at least one task (CASSANDRA-5554)
* fix 2i updates with identical values and timestamps (CASSANDRA-5540)
* fix compaction throttling bursty-ness (CASSANDRA-4316)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3950de9e/src/java/org/apache/cassandra/dht/BytesToken.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/BytesToken.java b/src/java/org/apache/cassandra/dht/BytesToken.java
index a95eb98..f2f9eab 100644
--- a/src/java/org/apache/cassandra/dht/BytesToken.java
+++ b/src/java/org/apache/cassandra/dht/BytesToken.java
@@ -41,7 +41,7 @@ public class BytesToken extends Token<byte[]>
@Override
public String toString()
{
- return "Token(bytes[" + Hex.bytesToHex(token) + "])";
+ return Hex.bytesToHex(token);
}
public int compareTo(Token<byte[]> o)
[3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02547747
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02547747
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02547747
Branch: refs/heads/trunk
Commit: 02547747198c0d14f9a4102a920b914bcfd57a23
Parents: 4adb583 3950de9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue May 14 13:34:04 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue May 14 13:34:04 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/dht/BytesToken.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02547747/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c137922,6432775..019dc16
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,52 -1,5 +1,53 @@@
+2.0
+ * JEMalloc support for off-heap allocation (CASSANDRA-3997)
+ * Single-pass compaction (CASSANDRA-4180)
+ * Removed token range bisection (CASSANDRA-5518)
+ * Removed compatibility with pre-1.2.5 sstables and network messages
+ (CASSANDRA-5511)
+ * removed PBSPredictor (CASSANDRA-5455)
+ * CAS support (CASSANDRA-5062, 5441, 5443)
+ * Leveled compaction performs size-tiered compactions in L0
+ (CASSANDRA-5371, 5439)
+ * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339)
+ * Log when a node is down longer than the hint window (CASSANDRA-4554)
+ * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917)
+ * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407)
+ * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430)
+ * Change Message IDs to ints (CASSANDRA-5307)
+ * Move sstable level information into the Stats component, removing the
+ need for a separate Manifest file (CASSANDRA-4872)
+ * avoid serializing to byte[] on commitlog append (CASSANDRA-5199)
+ * make index_interval configurable per columnfamily (CASSANDRA-3961)
+ * add default_time_to_live (CASSANDRA-3974)
+ * add memtable_flush_period_in_ms (CASSANDRA-4237)
+ * replace supercolumns internally by composites (CASSANDRA-3237, 5123)
+ * upgrade thrift to 0.9.0 (CASSANDRA-3719)
+ * drop unnecessary keyspace parameter from user-defined compaction API
+ (CASSANDRA-5139)
+ * more robust solution to incomplete compactions + counters (CASSANDRA-5151)
+ * Change order of directory searching for c*.in.sh (CASSANDRA-3983)
+ * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271)
+ * Allow custom configuration loader (CASSANDRA-5045)
+ * Remove memory emergency pressure valve logic (CASSANDRA-3534)
+ * Reduce request latency with eager retry (CASSANDRA-4705)
+ * cqlsh: Remove ASSUME command (CASSANDRA-5331)
+ * Rebuild BF when loading sstables if bloom_filter_fp_chance
+ has changed since compaction (CASSANDRA-5015)
+ * remove row-level bloom filters (CASSANDRA-4885)
+ * Change Kernel Page Cache skipping into row preheating (disabled by default)
+ (CASSANDRA-4937)
+ * Improve repair by deciding on a gcBefore before sending
+ out TreeRequests (CASSANDRA-4932)
+ * Add an official way to disable compactions (CASSANDRA-5074)
+ * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919)
+ * Add binary protocol versioning (CASSANDRA-5436)
+ * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530)
+ * Add alias support to SELECT statement (CASSANDRA-5075)
+ * Don't create empty RowMutations in CommitLogReplayer (CASSANDRA-5541)
+
+
1.2.5
+ * make BytesToken.toString only return hex bytes (CASSANDRA-5566)
* Ensure that submitBackground enqueues at least one task (CASSANDRA-5554)
* fix 2i updates with identical values and timestamps (CASSANDRA-5540)
* fix compaction throttling bursty-ness (CASSANDRA-4316)