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/12/05 00:57:03 UTC
[01/10] git commit: CHANGES
Updated Branches:
refs/heads/cassandra-1.2 d8c4e89b3 -> e40bc759c
refs/heads/cassandra-2.0 32dbe5825 -> cf83c81d8
refs/heads/trunk e4d447240 -> 6772247f8
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e40bc759
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e40bc759
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e40bc759
Branch: refs/heads/cassandra-1.2
Commit: e40bc759cd34bd6d8839bd115d5b395842410759
Parents: d8c4e89
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 4 16:59:16 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 4 16:59:16 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e40bc759/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8e6cffa..09a3b07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,9 +5,11 @@
* Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750)
* cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
* Improve gossip performance for typical messages (CASSANDRA-6409)
- * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
+ * Throw IRE if a prepared statement has more markers than supported
+ (CASSANDRA-5598)
* Expose Thread metrics for the native protocol server (CASSANDRA-6234)
- * Change snapshot response message verb (CASSANDRA-6415)
+ * Change snapshot response message verb to INTERNAL to avoid dropping it
+ (CASSANDRA-6415)
* Warn when collection read has > 65K elements (CASSANDRA-5428)
[04/10] git commit: simplify
Posted by jb...@apache.org.
simplify
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/447c64c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/447c64c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/447c64c4
Branch: refs/heads/cassandra-2.0
Commit: 447c64c407f653467eaca73c8b8eda9b29fa91a4
Parents: 6724964
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 4 17:40:24 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 4 17:40:24 2013 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/447c64c4/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7cdc4e6..e84b819 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1118,7 +1118,7 @@ public class DatabaseDescriptor
public static File getSerializedCachePath(String ksName, String cfName, CacheService.CacheType cacheType, String version)
{
- return new File(conf.saved_caches_directory + File.separator + ksName + "-" + cfName + "-" + cacheType + (version == null ? "" : "-" + version + ".db"));
+ return new File(conf.saved_caches_directory, ksName + "-" + cfName + "-" + cacheType + (version == null ? "" : "-" + version + ".db"));
}
public static int getDynamicUpdateInterval()
[10/10] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6772247f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6772247f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6772247f
Branch: refs/heads/trunk
Commit: 6772247f828e3740aff737b8c4463612ba8d4b17
Parents: e4d4472 cf83c81
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 4 17:56:45 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 4 17:56:45 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 6 ++++--
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6772247f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6772247f/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
[09/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf83c81d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf83c81d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf83c81d
Branch: refs/heads/trunk
Commit: cf83c81d85fb20b50f988c23743ba2510308bf42
Parents: b892c09 e40bc75
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 4 17:56:25 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 4 17:56:25 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf83c81d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a7ab215,09a3b07..d485a69
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,15 +1,20 @@@
-1.2.13
+2.0.4
+ * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
+ * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
+ * Fix divide-by-zero in PCI (CASSANDRA-6403)
+ * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395)
+ * Expose a total memtable size metric for a CF (CASSANDRA-6391)
+ * cqlsh: hanlde symlinks properly (CASSANDRA-6425)
+Merged from 1.2:
* Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345)
- * Optimize FD phi calculation (CASSANDRA-6386)
- * Improve initial FD phi estimate when starting up (CASSANDRA-6385)
- * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750)
* cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
* Improve gossip performance for typical messages (CASSANDRA-6409)
- * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
+ * Throw IRE if a prepared statement has more markers than supported
+ (CASSANDRA-5598)
* Expose Thread metrics for the native protocol server (CASSANDRA-6234)
- * Change snapshot response message verb (CASSANDRA-6415)
+ * Change snapshot response message verb to INTERNAL to avoid dropping it
+ (CASSANDRA-6415)
* Warn when collection read has > 65K elements (CASSANDRA-5428)
[05/10] git commit: simplify
Posted by jb...@apache.org.
simplify
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/447c64c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/447c64c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/447c64c4
Branch: refs/heads/trunk
Commit: 447c64c407f653467eaca73c8b8eda9b29fa91a4
Parents: 6724964
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 4 17:40:24 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 4 17:40:24 2013 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/447c64c4/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 7cdc4e6..e84b819 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1118,7 +1118,7 @@ public class DatabaseDescriptor
public static File getSerializedCachePath(String ksName, String cfName, CacheService.CacheType cacheType, String version)
{
- return new File(conf.saved_caches_directory + File.separator + ksName + "-" + cfName + "-" + cacheType + (version == null ? "" : "-" + version + ".db"));
+ return new File(conf.saved_caches_directory, ksName + "-" + cfName + "-" + cacheType + (version == null ? "" : "-" + version + ".db"));
}
public static int getDynamicUpdateInterval()
[02/10] git commit: CHANGES
Posted by jb...@apache.org.
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e40bc759
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e40bc759
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e40bc759
Branch: refs/heads/cassandra-2.0
Commit: e40bc759cd34bd6d8839bd115d5b395842410759
Parents: d8c4e89
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 4 16:59:16 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 4 16:59:16 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e40bc759/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8e6cffa..09a3b07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,9 +5,11 @@
* Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750)
* cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
* Improve gossip performance for typical messages (CASSANDRA-6409)
- * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
+ * Throw IRE if a prepared statement has more markers than supported
+ (CASSANDRA-5598)
* Expose Thread metrics for the native protocol server (CASSANDRA-6234)
- * Change snapshot response message verb (CASSANDRA-6415)
+ * Change snapshot response message verb to INTERNAL to avoid dropping it
+ (CASSANDRA-6415)
* Warn when collection read has > 65K elements (CASSANDRA-5428)
[03/10] git commit: CHANGES
Posted by jb...@apache.org.
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e40bc759
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e40bc759
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e40bc759
Branch: refs/heads/trunk
Commit: e40bc759cd34bd6d8839bd115d5b395842410759
Parents: d8c4e89
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 4 16:59:16 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 4 16:59:16 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e40bc759/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8e6cffa..09a3b07 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,9 +5,11 @@
* Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750)
* cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
* Improve gossip performance for typical messages (CASSANDRA-6409)
- * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
+ * Throw IRE if a prepared statement has more markers than supported
+ (CASSANDRA-5598)
* Expose Thread metrics for the native protocol server (CASSANDRA-6234)
- * Change snapshot response message verb (CASSANDRA-6415)
+ * Change snapshot response message verb to INTERNAL to avoid dropping it
+ (CASSANDRA-6415)
* Warn when collection read has > 65K elements (CASSANDRA-5428)
[08/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf83c81d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf83c81d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf83c81d
Branch: refs/heads/cassandra-2.0
Commit: cf83c81d85fb20b50f988c23743ba2510308bf42
Parents: b892c09 e40bc75
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 4 17:56:25 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 4 17:56:25 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf83c81d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a7ab215,09a3b07..d485a69
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,15 +1,20 @@@
-1.2.13
+2.0.4
+ * Reduce gossip memory use by interning VersionedValue strings (CASSANDRA-6410)
+ * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
+ * Fix divide-by-zero in PCI (CASSANDRA-6403)
+ * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395)
+ * Expose a total memtable size metric for a CF (CASSANDRA-6391)
+ * cqlsh: hanlde symlinks properly (CASSANDRA-6425)
+Merged from 1.2:
* Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345)
- * Optimize FD phi calculation (CASSANDRA-6386)
- * Improve initial FD phi estimate when starting up (CASSANDRA-6385)
- * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750)
* cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
* Improve gossip performance for typical messages (CASSANDRA-6409)
- * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
+ * Throw IRE if a prepared statement has more markers than supported
+ (CASSANDRA-5598)
* Expose Thread metrics for the native protocol server (CASSANDRA-6234)
- * Change snapshot response message verb (CASSANDRA-6415)
+ * Change snapshot response message verb to INTERNAL to avoid dropping it
+ (CASSANDRA-6415)
* Warn when collection read has > 65K elements (CASSANDRA-5428)
[07/10] git commit: Merge remote-tracking branch
'origin/cassandra-2.0' into cassandra-2.0
Posted by jb...@apache.org.
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b892c09a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b892c09a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b892c09a
Branch: refs/heads/trunk
Commit: b892c09aca6a5a97553d3a02a008da7250498565
Parents: 447c64c 32dbe58
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 4 17:56:00 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 4 17:56:00 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/marshal/CollectionType.java | 17 +++++++++++++++++
.../org/apache/cassandra/db/marshal/ListType.java | 2 ++
.../org/apache/cassandra/db/marshal/MapType.java | 2 ++
.../org/apache/cassandra/db/marshal/SetType.java | 2 ++
.../org/apache/cassandra/service/MoveTest.java | 2 ++
6 files changed, 26 insertions(+)
----------------------------------------------------------------------
[06/10] git commit: Merge remote-tracking branch
'origin/cassandra-2.0' into cassandra-2.0
Posted by jb...@apache.org.
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b892c09a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b892c09a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b892c09a
Branch: refs/heads/cassandra-2.0
Commit: b892c09aca6a5a97553d3a02a008da7250498565
Parents: 447c64c 32dbe58
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Dec 4 17:56:00 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Dec 4 17:56:00 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/marshal/CollectionType.java | 17 +++++++++++++++++
.../org/apache/cassandra/db/marshal/ListType.java | 2 ++
.../org/apache/cassandra/db/marshal/MapType.java | 2 ++
.../org/apache/cassandra/db/marshal/SetType.java | 2 ++
.../org/apache/cassandra/service/MoveTest.java | 2 ++
6 files changed, 26 insertions(+)
----------------------------------------------------------------------