Author: jbellis Date: Wed Oct 12 15:02:18 2011 New Revision: 1182415 URL: http://svn.apache.org/viewvc?rev=1182415&view=rev Log: merge from 0.8
Modified: cassandra/branches/cassandra-1.0/ (props changed) cassandra/branches/cassandra-1.0/CHANGES.txt cassandra/branches/cassandra-1.0/contrib/ (props changed) cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java (props changed) cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java (props changed) cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (props changed) cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (props changed) cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (props changed) cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java Propchange: cassandra/branches/cassandra-1.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 12 15:02:18 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7:1026516-1170333,1172024 /cassandra/branches/cassandra-0.7.0:1053690-1055654 -/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1178554,1178785,1178957,1179359,1179364,1180958 +/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1179359,1179364,1180958 /cassandra/branches/cassandra-0.8.0:1125021-1130369 /cassandra/branches/cassandra-0.8.1:1101014-1125018 /cassandra/branches/cassandra-1.0:1167106,1167185 Modified: cassandra/branches/cassandra-1.0/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1182415&r1=1182414&r2=1182415&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/CHANGES.txt (original) +++ cassandra/branches/cassandra-1.0/CHANGES.txt Wed Oct 12 15:02:18 2011 @@ -24,7 +24,6 @@ Fixes merged from 0.8 below: * Fix tool .bat files when CASSANDRA_HOME contains spaces (CASSANDRA-3258) * Force flush of status table when removing/updating token (CASSANDRA-3243) - * Evict gossip state immediately when a token is taken over by a new IP (CASSANDRA-3259) * Fix bug where the failure detector can take too long to mark a host down (CASSANDRA-3273) * (Hadoop) allow wrapping ranges in queries (CASSANDRA-3137) @@ -35,6 +34,12 @@ Fixes merged from 0.8 below: * Nodetool no longer leaks threads and closes JMX connections (CASSANDRA-3309) * fix truncate allowing data to be replayed post-restart (CASSANDRA-3297) * Move SimpleAuthority and SimpleAuthenticator to examples (CASSANDRA-2922) + * Fix exception during PIG 'dump' (CASSANDRA-2810) + * Fix transposition in cfHistograms (CASSANDRA-3222) + * Allow using number as DC name when creating keyspace in CQL (CASSANDRA-3239) + * Force flush of system table after updating/removing a token (CASSANDRA-3243) + * Make Pig storage handle implements LoadMetadata (CASSANDRA-2777) + * Improved CLI exceptions (CASSANDRA-3312) 1.0.0-rc2 @@ -47,6 +52,7 @@ Fixes merged from 0.8 below: contains non-hex characters (CASSANDRA-3231) * Keep SimpleSnitch proximity ordering unchanged from what the Strategy generates, as intended (CASSANDRA-3262) + * remove Scrub from compactionstats when finished (CASSANDRA-3255) * fix counter entry in jdbc TypesMap (CASSANDRA-3268) * fix full queue scenario for ParallelCompactionIterator (CASSANDRA-3270) * fix bootstrap process (CASSANDRA-3285) @@ -55,7 +61,8 @@ Fixes merged from 0.8 below: * ignore any CF ids sent by client for adding CF/KS (CASSANDRA-3288) * remove obsolete hints on first startup (CASSANDRA-3291) * use correct ISortedColumns for time-optimized reads (CASSANDRA-3289) - * Evict gossip state immediately when a token is taken over by a new IP (CASSANDRA-3259) + * Evict gossip state immediately when a token is taken over by a new IP + (CASSANDRA-3259) 1.0.0-rc1 Propchange: cassandra/branches/cassandra-1.0/contrib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 12 15:02:18 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009 /cassandra/branches/cassandra-0.7/contrib:1026516-1170333,1172024 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654 -/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1178554,1178785,1178957,1179359,1179364,1180958 +/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1179359,1179364,1180958 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018 /cassandra/branches/cassandra-1.0/contrib:1167106,1167185 Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 12 15:02:18 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1170333,1172024 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1178554,1178785,1178957,1179359,1179364,1180958 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1179359,1179364,1180958 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018 /cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167106,1167185 Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 12 15:02:18 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1170333,1172024 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1178554,1178785,1178957,1179359,1179364,1180958 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1179359,1179364,1180958 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1101014-1125018 /cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167106,1167185 Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 12 15:02:18 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1170333,1172024 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1178554,1178785,1178957,1179359,1179364,1180958 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1179359,1179364,1180958 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1101014-1125018 /cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1167106,1167185 Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 12 15:02:18 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1170333,1172024 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1178554,1178785,1178957,1179359,1179364,1180958 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1179359,1179364,1180958 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1101014-1125018 /cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1167106,1167185 Propchange: cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 12 15:02:18 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1170333,1172024 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1178554,1178785,1178957,1179359,1179364,1180958 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1179359,1179364,1180958 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1101014-1125018 /cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1167106,1167185 Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java?rev=1182415&r1=1182414&r2=1182415&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java (original) +++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java Wed Oct 12 15:02:18 2011 @@ -297,9 +297,7 @@ public class CliClient } catch (SchemaDisagreementException e) { - RuntimeException rtEx = new RuntimeException("schema does not match across nodes, (try again later)."); - rtEx.initCause(e); - throw new RuntimeException(); + throw new RuntimeException("schema does not match across nodes, (try again later).", e); } } @@ -542,7 +540,7 @@ public class CliClient { StringBuilder errorMessage = new StringBuilder("Unknown comparator '" + compareWith + "'. "); errorMessage.append("Available functions: "); - throw new RuntimeException(errorMessage.append(Function.getFunctionNames()).toString()); + throw new RuntimeException(errorMessage.append(Function.getFunctionNames()).toString(), e); } } @@ -768,7 +766,7 @@ public class CliClient } catch (Exception e) { - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e); } } @@ -797,11 +795,11 @@ public class CliClient } catch (InvalidRequestException e) { - throw new RuntimeException(e.getWhy()); + throw new RuntimeException(e); } catch (Exception e) { - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e); } } @@ -884,7 +882,7 @@ public class CliClient } catch (Exception e) { - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e); } } @@ -951,7 +949,7 @@ public class CliClient } catch (Exception e) { - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e); } } @@ -994,11 +992,11 @@ public class CliClient } catch (InvalidRequestException e) { - throw new RuntimeException(e.getWhy()); + throw new RuntimeException(e); } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); + throw new RuntimeException(e); } } @@ -1024,11 +1022,11 @@ public class CliClient } catch (InvalidRequestException e) { - throw new RuntimeException(e.getWhy()); + throw new RuntimeException(e); } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); + throw new RuntimeException(e); } } @@ -1055,11 +1053,11 @@ public class CliClient } catch (InvalidRequestException e) { - throw new RuntimeException(e.getWhy()); + throw new RuntimeException(e); } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); + throw new RuntimeException(e); } } @@ -1089,11 +1087,11 @@ public class CliClient } catch (InvalidRequestException e) { - throw new RuntimeException(e.getWhy()); + throw new RuntimeException(e); } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); + throw new RuntimeException(e); } } @@ -1153,7 +1151,7 @@ public class CliClient } catch (UnknownHostException e) { - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e); } ksDef.setStrategy_options(options); @@ -2244,7 +2242,7 @@ public class CliClient } catch (TException e) { - throw new RuntimeException(e.getMessage(), e); + throw new RuntimeException(e); } columnDefinitions.add(columnDefinition); @@ -2275,7 +2273,7 @@ public class CliClient } catch (IllegalArgumentException ie) { - throw new RuntimeException("IndexType '" + indexTypeAsString + "' is unsupported."); + throw new RuntimeException("IndexType '" + indexTypeAsString + "' is unsupported.", ie); } } @@ -2304,7 +2302,7 @@ public class CliClient } catch (MarshalException e) { - throw new RuntimeException(e.toString()); + throw new RuntimeException(e); } } @@ -2419,7 +2417,7 @@ public class CliClient } catch (Exception e) { - throw new RuntimeException(e.getMessage(), e); + throw new RuntimeException(e); } } } @@ -2560,7 +2558,7 @@ public class CliClient } catch (Exception e) { - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e); } } @@ -2581,7 +2579,7 @@ public class CliClient { StringBuilder errorMessage = new StringBuilder("Function '" + functionName + "' not found. "); errorMessage.append("Available functions: "); - throw new RuntimeException(errorMessage.append(Function.getFunctionNames()).toString()); + throw new RuntimeException(errorMessage.append(Function.getFunctionNames()).toString(), e); } return function.getValidator();