You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/11 03:09:03 UTC
[1/2] git commit: Turn MarshalException into ConfigurationException
for Thrift
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 926882095 -> 228f0ade8
Turn MarshalException into ConfigurationException for Thrift
CFMetaData#fromThrift() and CFMetaData#fromThriftForUpdate() should
rethrow MarshalException-s as ConfigurationException-s for Thrift -
for system_update_column_family() and system_add_column_family() sake.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6976d82e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6976d82e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6976d82e
Branch: refs/heads/cassandra-2.1.0
Commit: 6976d82ed64f7b48a6d2d465de176abf3c040f81
Parents: a771f60
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 11 03:33:09 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 11 03:33:09 2014 +0300
----------------------------------------------------------------------
.../org/apache/cassandra/config/CFMetaData.java | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6976d82e/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 650d6c4..9db1c75 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -900,7 +900,14 @@ public final class CFMetaData
if (cf_def.isSetKey_alias() && !(cfm.keyValidator instanceof CompositeType))
cfm.column_metadata.put(cf_def.key_alias, ColumnDefinition.partitionKeyDef(cf_def.key_alias, cfm.keyValidator, null));
- return cfm.rebuild();
+ try
+ {
+ return cfm.rebuild();
+ }
+ catch (MarshalException e)
+ {
+ throw new ConfigurationException(e.getMessage());
+ }
}
public static CFMetaData fromThriftForUpdate(org.apache.cassandra.thrift.CfDef cf_def, CFMetaData toUpdate) throws InvalidRequestException, ConfigurationException
@@ -927,7 +934,14 @@ public final class CFMetaData
cfm.addOrReplaceColumnDefinition(def);
}
- return cfm.rebuild();
+ try
+ {
+ return cfm.rebuild();
+ }
+ catch (MarshalException e)
+ {
+ throw new ConfigurationException(e.getMessage());
+ }
}
// Do most of the work, but don't handle CQL metadata (i.e. skip key_alias and don't rebuild())
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
src/java/org/apache/cassandra/config/CFMetaData.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/228f0ade
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/228f0ade
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/228f0ade
Branch: refs/heads/cassandra-2.1.0
Commit: 228f0ade8d5f570575db62a0fea19cdb33c821a0
Parents: 9268820 6976d82
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Aug 11 04:08:47 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Aug 11 04:08:47 2014 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------