cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [3/3] git commit: CLI to report when unsupported column_metadata pair was given patch by Dave Brosius; reviewed by Pavel Yaskevich for CASSANDRA-3959
Date Mon, 27 Feb 2012 21:48:15 GMT
CLI to report when unsupported column_metadata pair was given
patch by Dave Brosius; reviewed by Pavel Yaskevich for CASSANDRA-3959


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

Branch: refs/heads/trunk
Commit: c44a19a8090d105d1ecc417c8dce6319b6bf80f9
Parents: a043998
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Tue Feb 28 00:39:57 2012 +0300
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Tue Feb 28 00:43:33 2012 +0300

----------------------------------------------------------------------
 CHANGES.txt                                      |    1 +
 src/java/org/apache/cassandra/cli/CliClient.java |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c44a19a8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 640ff3f..525d85f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
  * add a convenient way to reset a node's schema (CASSANDRA-2963)
  * fix for intermittent SchemaDisagreementException (CASSANDRA-3884)
  * ignore deprecated KsDef/CfDef/ColumnDef fields in native schema (CASSANDRA-3963)
+ * CLI to report when unsupported column_metadata pair was given (CASSANDRA-3959)
 Merged from 1.0:
  * remove the wait on hint future during write (CASSANDRA-3870)
  * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c44a19a8/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index a4641b6..39ba3c9 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -2264,6 +2264,10 @@ public class CliClient
                 {
                     columnDefinition.setIndex_name(metaVal);
                 }
+                else
+                {
+                    throw new RuntimeException("Unsupported column_metadata pair given =>
" + metaKey + ": " + metaVal);
+                }
             }
 
             // validating columnDef structure, 'name' and 'validation_class' must be set


Mime
View raw message