[22/50] [abbrv] git commit: fix merge from 1.1 to use UUID instead of Integer for CF identifier.

2012-07-27 Thread yukim 
fix merge from 1.1 to use UUID instead of Integer for CF identifier.


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

Branch: refs/heads/cassandra-1.1
Commit: 655a76face34c18370d49c4fb0a1232395187ea1
Parents: 34cd691
Author: Pavel Yaskevich xe...@apache.org
Authored: Mon Jul 23 19:33:45 2012 +0300
Committer: Pavel Yaskevich xe...@apache.org
Committed: Mon Jul 23 19:33:45 2012 +0300

--
 .../org/apache/cassandra/config/CFMetaData.java|2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/655a76fa/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 a54b4ff..3cf41d7 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -886,7 +886,7 @@ public final class CFMetaData
 public void addDefaultIndexNames() throws ConfigurationException
 {
 // if this is ColumnFamily update we need to add previously defined 
index names to the existing columns first
-Integer cfId = Schema.instance.getId(ksName, cfName);
+UUID cfId = Schema.instance.getId(ksName, cfName);
 if (cfId != null)
 {
 CFMetaData cfm = Schema.instance.getCFMetaData(cfId);

git commit: fix merge from 1.1 to use UUID instead of Integer for CF identifier.

2012-07-23 Thread xedin 
Updated Branches:
  refs/heads/trunk 34cd6912b - 655a76fac


fix merge from 1.1 to use UUID instead of Integer for CF identifier.


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

Branch: refs/heads/trunk
Commit: 655a76face34c18370d49c4fb0a1232395187ea1
Parents: 34cd691
Author: Pavel Yaskevich xe...@apache.org
Authored: Mon Jul 23 19:33:45 2012 +0300
Committer: Pavel Yaskevich xe...@apache.org
Committed: Mon Jul 23 19:33:45 2012 +0300

--
 .../org/apache/cassandra/config/CFMetaData.java|2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/655a76fa/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 a54b4ff..3cf41d7 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -886,7 +886,7 @@ public final class CFMetaData
 public void addDefaultIndexNames() throws ConfigurationException
 {
 // if this is ColumnFamily update we need to add previously defined 
index names to the existing columns first
-Integer cfId = Schema.instance.getId(ksName, cfName);
+UUID cfId = Schema.instance.getId(ksName, cfName);
 if (cfId != null)
 {
 CFMetaData cfm = Schema.instance.getCFMetaData(cfId);