[1/2] git commit: Use node's host id in place of counter ids

2014-06-11 Thread aleksey 
Repository: cassandra
Updated Branches:
  refs/heads/trunk 9aace4836 -> 5a9b1b4c1


Use node's host id in place of counter ids

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7366


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99594cd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99594cd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99594cd6

Branch: refs/heads/trunk
Commit: 99594cd6879c73da78d05a56232427936d2ee5d7
Parents: 5fe7557
Author: Aleksey Yeschenko 
Authored: Wed Jun 11 17:21:35 2014 -0500
Committer: Aleksey Yeschenko 
Committed: Wed Jun 11 17:21:35 2014 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java |  6 ---
 .../org/apache/cassandra/config/KSMetaData.java |  1 -
 .../org/apache/cassandra/db/SystemKeyspace.java | 49 +---
 .../cassandra/service/StorageService.java   | 17 +++
 .../org/apache/cassandra/utils/CounterId.java   | 38 +--
 .../apache/cassandra/utils/CounterIdTest.java   | 49 
 7 files changed, 9 insertions(+), 152 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/99594cd6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a8a84d8..9dd54f9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.0
+ * Use node's host id in place of counter ids (CASSANDRA-7366)
  * Explicitly use Long.MAX_VALUE timestamp for counter deletions
(CASSANDRA-7346)
  * Fix native protocol CAS batches (CASSANDRA-7337)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/99594cd6/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java 
b/src/java/org/apache/cassandra/config/CFMetaData.java
index f6935e5..de2466c 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -144,12 +144,6 @@ public final class CFMetaData
  + "PRIMARY KEY 
(table_name, index_name)"
  + ") WITH COMPACT STORAGE 
AND COMMENT='indexes that have been completed'");
 
-public static final CFMetaData CounterIdCf = compile("CREATE TABLE \"" + 
SystemKeyspace.COUNTER_ID_CF + "\" ("
- + "key text,"
- + "id timeuuid,"
- + "PRIMARY KEY (key, 
id)"
- + ") WITH COMPACT 
STORAGE AND COMMENT='counter node IDs'");
-
 public static final CFMetaData SchemaKeyspacesCf = compile("CREATE TABLE " 
+ SystemKeyspace.SCHEMA_KEYSPACES_CF + " ("
+ 
"keyspace_name text PRIMARY KEY,"
+ 
"durable_writes boolean,"

http://git-wip-us.apache.org/repos/asf/cassandra/blob/99594cd6/src/java/org/apache/cassandra/config/KSMetaData.java
--
diff --git a/src/java/org/apache/cassandra/config/KSMetaData.java 
b/src/java/org/apache/cassandra/config/KSMetaData.java
index d0cb613..7700394 100644
--- a/src/java/org/apache/cassandra/config/KSMetaData.java
+++ b/src/java/org/apache/cassandra/config/KSMetaData.java
@@ -96,7 +96,6 @@ public final class KSMetaData
 CFMetaData.PeerEventsCf,
 CFMetaData.HintsCf,
 CFMetaData.IndexCf,
-CFMetaData.CounterIdCf,
 CFMetaData.SchemaKeyspacesCf,
 
CFMetaData.SchemaColumnFamiliesCf,
 CFMetaData.SchemaColumnsCf,

http://git-wip-us.apache.org/repos/asf/cassandra/blob/99594cd6/src/java/org/apache/cassandra/db/SystemKeyspace.java
--
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java 
b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 9cb6e94..659bc69 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -29,7 +29,6 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect

git commit: Use node's host id in place of counter ids

2014-06-11 Thread aleksey 
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 5fe755762 -> 99594cd68


Use node's host id in place of counter ids

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7366


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99594cd6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99594cd6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99594cd6

Branch: refs/heads/cassandra-2.1
Commit: 99594cd6879c73da78d05a56232427936d2ee5d7
Parents: 5fe7557
Author: Aleksey Yeschenko 
Authored: Wed Jun 11 17:21:35 2014 -0500
Committer: Aleksey Yeschenko 
Committed: Wed Jun 11 17:21:35 2014 -0500

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java |  6 ---
 .../org/apache/cassandra/config/KSMetaData.java |  1 -
 .../org/apache/cassandra/db/SystemKeyspace.java | 49 +---
 .../cassandra/service/StorageService.java   | 17 +++
 .../org/apache/cassandra/utils/CounterId.java   | 38 +--
 .../apache/cassandra/utils/CounterIdTest.java   | 49 
 7 files changed, 9 insertions(+), 152 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/99594cd6/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index a8a84d8..9dd54f9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.0
+ * Use node's host id in place of counter ids (CASSANDRA-7366)
  * Explicitly use Long.MAX_VALUE timestamp for counter deletions
(CASSANDRA-7346)
  * Fix native protocol CAS batches (CASSANDRA-7337)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/99594cd6/src/java/org/apache/cassandra/config/CFMetaData.java
--
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java 
b/src/java/org/apache/cassandra/config/CFMetaData.java
index f6935e5..de2466c 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -144,12 +144,6 @@ public final class CFMetaData
  + "PRIMARY KEY 
(table_name, index_name)"
  + ") WITH COMPACT STORAGE 
AND COMMENT='indexes that have been completed'");
 
-public static final CFMetaData CounterIdCf = compile("CREATE TABLE \"" + 
SystemKeyspace.COUNTER_ID_CF + "\" ("
- + "key text,"
- + "id timeuuid,"
- + "PRIMARY KEY (key, 
id)"
- + ") WITH COMPACT 
STORAGE AND COMMENT='counter node IDs'");
-
 public static final CFMetaData SchemaKeyspacesCf = compile("CREATE TABLE " 
+ SystemKeyspace.SCHEMA_KEYSPACES_CF + " ("
+ 
"keyspace_name text PRIMARY KEY,"
+ 
"durable_writes boolean,"

http://git-wip-us.apache.org/repos/asf/cassandra/blob/99594cd6/src/java/org/apache/cassandra/config/KSMetaData.java
--
diff --git a/src/java/org/apache/cassandra/config/KSMetaData.java 
b/src/java/org/apache/cassandra/config/KSMetaData.java
index d0cb613..7700394 100644
--- a/src/java/org/apache/cassandra/config/KSMetaData.java
+++ b/src/java/org/apache/cassandra/config/KSMetaData.java
@@ -96,7 +96,6 @@ public final class KSMetaData
 CFMetaData.PeerEventsCf,
 CFMetaData.HintsCf,
 CFMetaData.IndexCf,
-CFMetaData.CounterIdCf,
 CFMetaData.SchemaKeyspacesCf,
 
CFMetaData.SchemaColumnFamiliesCf,
 CFMetaData.SchemaColumnsCf,

http://git-wip-us.apache.org/repos/asf/cassandra/blob/99594cd6/src/java/org/apache/cassandra/db/SystemKeyspace.java
--
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java 
b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 9cb6e94..659bc69 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -29,7 +29,6 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Iterables;
 import com.googl