You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/01/17 01:21:02 UTC
[1/6] git commit: Check that key_aliases/column_aliases exists before
using them Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6589
Updated Branches:
refs/heads/cassandra-2.0 ee7938391 -> 90f661eee
refs/heads/trunk dd49497e9 -> fac3042db
Check that key_aliases/column_aliases exists before using them
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6589
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cead348d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cead348d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cead348d
Branch: refs/heads/cassandra-2.0
Commit: cead348d9d646b50f086d5cdcdceb5eecf66e806
Parents: ee79383
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 18:05:59 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 18:05:59 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 4 +++-
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cead348d/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 c026824..a693dee 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -1637,7 +1637,9 @@ public final class CFMetaData
* In other words, the ColumnDefinition the following lines add may be replaced later when ColumnDefinition.fromSchema
* is called but that's ok.
*/
- cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("key_aliases"))), cfm.keyValidator, ColumnDefinition.Type.PARTITION_KEY);
+ if (result.has("key_aliases"))
+ cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("key_aliases"))), cfm.keyValidator, ColumnDefinition.Type.PARTITION_KEY);
+ if (result.has("column_aliases"))
cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("column_aliases"))), cfm.comparator, ColumnDefinition.Type.CLUSTERING_KEY);
if (result.has("value_alias"))
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cead348d/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4d7d6f2..2cc325b 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -408,7 +408,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
Descriptor desc = entry.getKey();
generations.add(desc.generation);
if (!desc.isCompatible())
- throw new RuntimeException(String.format("Can't open incompatible SSTable! Current version %s, found file: %s", Descriptor.Version.CURRENT, desc));
+ logger.warn(String.format("Old SSTable found: Current version %s, found file: %s. Please run upgradesstables.", Descriptor.Version.CURRENT, desc));
}
Collections.sort(generations);
int value = (generations.size() > 0) ? (generations.get(generations.size() - 1)) : 0;
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@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/fac3042d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fac3042d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fac3042d
Branch: refs/heads/trunk
Commit: fac3042db80ff4129c04bc54204f5e02458e81e8
Parents: c17fb60 90f661e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 18:19:02 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 18:19:02 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/6] git commit: fix indentation
Posted by br...@apache.org.
fix indentation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90f661ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90f661ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90f661ee
Branch: refs/heads/cassandra-2.0
Commit: 90f661eeee77565941ef2a1395d2d98add4d80b9
Parents: cead348
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 18:18:53 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 18:18:53 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90f661ee/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 a693dee..714a8bc 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -1640,7 +1640,7 @@ public final class CFMetaData
if (result.has("key_aliases"))
cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("key_aliases"))), cfm.keyValidator, ColumnDefinition.Type.PARTITION_KEY);
if (result.has("column_aliases"))
- cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("column_aliases"))), cfm.comparator, ColumnDefinition.Type.CLUSTERING_KEY);
+ cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("column_aliases"))), cfm.comparator, ColumnDefinition.Type.CLUSTERING_KEY);
if (result.has("value_alias"))
cfm.addColumnMetadataFromAliases(Collections.<ByteBuffer>singletonList(result.getBytes("value_alias")), cfm.defaultValidator, ColumnDefinition.Type.COMPACT_VALUE);
[4/6] git commit: fix indentation
Posted by br...@apache.org.
fix indentation
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90f661ee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90f661ee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90f661ee
Branch: refs/heads/trunk
Commit: 90f661eeee77565941ef2a1395d2d98add4d80b9
Parents: cead348
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 18:18:53 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 18:18:53 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90f661ee/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 a693dee..714a8bc 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -1640,7 +1640,7 @@ public final class CFMetaData
if (result.has("key_aliases"))
cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("key_aliases"))), cfm.keyValidator, ColumnDefinition.Type.PARTITION_KEY);
if (result.has("column_aliases"))
- cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("column_aliases"))), cfm.comparator, ColumnDefinition.Type.CLUSTERING_KEY);
+ cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("column_aliases"))), cfm.comparator, ColumnDefinition.Type.CLUSTERING_KEY);
if (result.has("value_alias"))
cfm.addColumnMetadataFromAliases(Collections.<ByteBuffer>singletonList(result.getBytes("value_alias")), cfm.defaultValidator, ColumnDefinition.Type.COMPACT_VALUE);
[3/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@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/c17fb60c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c17fb60c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c17fb60c
Branch: refs/heads/trunk
Commit: c17fb60c953031f5f862aa049801a1fe40a5411a
Parents: dd49497 cead348
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 18:18:21 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 18:18:21 2014 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/6] git commit: Check that key_aliases/column_aliases exists before
using them Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6589
Posted by br...@apache.org.
Check that key_aliases/column_aliases exists before using them
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6589
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cead348d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cead348d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cead348d
Branch: refs/heads/trunk
Commit: cead348d9d646b50f086d5cdcdceb5eecf66e806
Parents: ee79383
Author: Brandon Williams <br...@apache.org>
Authored: Thu Jan 16 18:05:59 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Jan 16 18:05:59 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/config/CFMetaData.java | 4 +++-
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cead348d/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 c026824..a693dee 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -1637,7 +1637,9 @@ public final class CFMetaData
* In other words, the ColumnDefinition the following lines add may be replaced later when ColumnDefinition.fromSchema
* is called but that's ok.
*/
- cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("key_aliases"))), cfm.keyValidator, ColumnDefinition.Type.PARTITION_KEY);
+ if (result.has("key_aliases"))
+ cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("key_aliases"))), cfm.keyValidator, ColumnDefinition.Type.PARTITION_KEY);
+ if (result.has("column_aliases"))
cfm.addColumnMetadataFromAliases(aliasesFromStrings(fromJsonList(result.getString("column_aliases"))), cfm.comparator, ColumnDefinition.Type.CLUSTERING_KEY);
if (result.has("value_alias"))
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cead348d/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4d7d6f2..2cc325b 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -408,7 +408,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
Descriptor desc = entry.getKey();
generations.add(desc.generation);
if (!desc.isCompatible())
- throw new RuntimeException(String.format("Can't open incompatible SSTable! Current version %s, found file: %s", Descriptor.Version.CURRENT, desc));
+ logger.warn(String.format("Old SSTable found: Current version %s, found file: %s. Please run upgradesstables.", Descriptor.Version.CURRENT, desc));
}
Collections.sort(generations);
int value = (generations.size() > 0) ? (generations.get(generations.size() - 1)) : 0;