Commit Graph

2622 Commits

Author SHA1 Message Date
Gary Dusbabek feb4f034fa allow null CF comments. patch by Jon Hermes, reviewed by gdusbabek. CASSANDRA-2351
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082701 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 21:14:37 +00:00
Eric Evans a05f951a6c working slice-all queries (SELECT *)
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082662 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 19:40:56 +00:00
Gary Dusbabek d4c800b1c8 implement a real ResultSetMetaData
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082524 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 15:13:33 +00:00
Gary Dusbabek 7c4d54b34f fix jdbc test. patch by gdusbabek. CASSANDRA-1906
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082511 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 14:50:56 +00:00
Gary Dusbabek ebc7278d78 sanitize configuration code. patch by Jon Hermes, reviewed by gdusbabek. CASSANDRA-1906
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082510 13f79535-47bb-0310-9956-ffa450edef68
2011-03-17 14:50:32 +00:00
Brandon Williams e9e0191ea6 Forgotten files from 2272
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082254 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 18:37:19 +00:00
Brandon Williams 703e148b88 Refactor row/key cache handling.
Patch by slebresne, reviewed by Matthew Dennis for CASSANDRA-2272

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082236 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 17:52:53 +00:00
Gary Dusbabek 653dcc63e0 fix merge problem with CHANGES.txt, use right call in AbstractCommutativeType.compose()
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1082155 13f79535-47bb-0310-9956-ffa450edef68
2011-03-16 14:18:21 +00:00
Eric Evans 97558dc103 handle SchemaDisagreementException in cli
Patch by eevans; reviewed by brandon.williams for CASSANDRA-2334


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1081974 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 22:52:47 +00:00
Eric Evans 204d2db95a throw SchemaDisagreementException from DDL methods
Patch by eevans; reviewed by brandon.williams for CASSANDRA-2334


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1081972 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 22:52:24 +00:00
Jonathan Ellis be44f37e27 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1081925 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 20:12:03 +00:00
Jonathan Ellis f245882ae3 r/m obsolete assert
patch by jbellis; reviewed by Peter Schuller for CASSANDRA-2013

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081924 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 20:09:25 +00:00
Jonathan Ellis 7b03e7e6f1 merge from 0.6
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081923 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 20:08:42 +00:00
Jonathan Ellis 4ef269d017 add memtable_flush_queue_size defaulting to 4
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2333

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081908 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 19:08:11 +00:00
Jonathan Ellis c49a01b5b9 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1081899 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 18:42:11 +00:00
Brandon Williams f84aed6d44 Queue secondary indexes for flush before the parent.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-2330

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081876 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 17:36:21 +00:00
Jonathan Ellis 139203d25e merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1081872 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 17:31:28 +00:00
Brandon Williams efac0ca03f Allow Hadoop jobs to set the consistency level.
Patch by Eldon Stegall, reviewed by brandonwilliams for CASSANDRA-2331

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081867 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 17:22:45 +00:00
Jonathan Ellis 34a3c9d251 r/m unused code
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081866 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 17:21:20 +00:00
Jonathan Ellis 5eb724aa83 validate index names
patch by jhermes and jbellis for CASSANDRA-1761

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081838 13f79535-47bb-0310-9956-ffa450edef68
2011-03-15 16:25:41 +00:00
Jonathan Ellis 541e0b38d3 clear Built flag in system table when dropping an index
patch by jbellis; reviewed by mdennis for CASSANDRA-2320

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081546 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 19:57:52 +00:00
Eric Evans 404301ec37 more flexible keyword argument specification
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1081538 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 19:42:52 +00:00
Jonathan Ellis 7d44bbd308 fix tombstone handling in repair andsstable2json
patch by slebresne; reviewed by jbellis for CASSANDRA-2279

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081525 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 19:24:54 +00:00
Jonathan Ellis b3817177b5 Avoid seeking when sstable2json exports the entire file
patch by jbellis; tested by Jason Harvey for CASSANDRA-2318

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1081401 13f79535-47bb-0310-9956-ffa450edef68
2011-03-14 14:38:28 +00:00
Eric Evans bd10480eaa remove empty file
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080808 13f79535-47bb-0310-9956-ffa450edef68
2011-03-12 00:05:50 +00:00
Jonathan Ellis 1331479f16 fix memtable thresholds better
patch by Erik Foralsrud; reviewed by jbellis for CASSANDRA-2158

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080804 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 23:50:38 +00:00
Eric Evans 650039220b don't let antlr try to recover on bad input, always throw
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080774 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 21:57:12 +00:00
Eric Evans d0f1835d19 more flexible keyspace/column family specifications
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080772 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 21:57:04 +00:00
Jonathan Ellis 6a5baa564e make2ary indexes use parentCF flush thresholds during initial build
patch by jbellis; reviewed by slebresne for CASSANDRA-2294

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080718 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 18:39:13 +00:00
Jonathan Ellis a4b71120ff fix HH delivery when column index is larger than 2GB
patch by jbellis; reviewed by slebresne for CASSANDRA-2297

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080716 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 18:32:16 +00:00
Jonathan Ellis f652c69bf6 makerange queries respect snitch for local replicas
patch by jbellis; reviewed by slebresne for CASSANDRA-2286

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080713 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 18:27:48 +00:00
Jonathan Ellis c8600fcdcb revert unreviewed CFMetaData changes
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080711 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 18:24:57 +00:00
Jonathan Ellis 7a0ebb9cb5 fix stress.java column sizes
patch by jbellis; reviewed by Pavel Yaskevich for CASSANDRA-2312

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080710 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 18:22:00 +00:00
Jonathan Ellis 402e1edeb7 allow zero replicas in a NTSdatacenter
patch by slebresne; reviewed by jbellis for CASSANDRA-1924

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080709 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 18:17:10 +00:00
Jonathan Ellis 1946cfdfdd AES Counter Repair Improvements
patch by Alan Liang; reviewed by slebresne for CASSANDRA-2288

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080703 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 17:54:08 +00:00
Jonathan Ellis 7e8e6d3085 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080702 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 17:53:02 +00:00
Jonathan Ellis 7bc35b88ff purge tombstoned rows from cache after GCGraceSeconds
patch by slebresne; reviewed by jbellis for CASSANDRA-2305

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080577 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 14:25:49 +00:00
Jonathan Ellis b934e1eca8 reduce memory use during streaming of multiple sstables
patch by jbellis; reviewed by mdennis and tested by Joaquin Casares for CASSANDRA-2301

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080433 13f79535-47bb-0310-9956-ffa450edef68
2011-03-11 02:57:15 +00:00
Jonathan Ellis e40b07dc29 simplify ascii validation
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080346 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 20:56:57 +00:00
T Jake Luciani ab5a8c77e4 Use UUID as node identifiers in counters instead of IP addresses
Patch by Sylvain Lebresne; Reviewed by T Jake Luciani for CASSANDRA-1938



git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080345 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 20:54:50 +00:00
Jonathan Ellis 1a5d09c356 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080338 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 20:28:17 +00:00
Jonathan Ellis 45766ede2e include secondary index CFs when deciding which CFs to flush under memory pressure
patch by jbellis; tested by Matt Conway for CASSANDRA-2295

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080310 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 18:38:03 +00:00
Jonathan Ellis c7df15da53 fix fd leak in sstable2json with non-mmap'd i/o
patch by jbellis; reviewed by Pavel Yaskevich for CASSANDRA-2304

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1080286 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 17:13:16 +00:00
Eric Evans c361d204ae allow IDENT token as relaxed form of string literal
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080284 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 17:11:29 +00:00
Eric Evans 5996eb5d4b empty term no longer makes sense for TimeUUID
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080283 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 17:11:24 +00:00
Eric Evans 20082c5db6 remove timeuuid term type
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080282 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 17:11:18 +00:00
Eric Evans c4b4109f24 cleanup cruft left behind after refactorings
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080255 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 15:46:14 +00:00
Eric Evans 7ff0eae226 remove unicode term type
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080254 13f79535-47bb-0310-9956-ffa450edef68
2011-03-10 15:45:59 +00:00
Eric Evans df235c12cc handle NumberFormatExceptions from BytesType.fromString
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080025 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 22:00:36 +00:00
Eric Evans 57b83afa0d use AbstractType.fromString methods to marshal to BB
Patch by eevans for CASSANDRA-2027

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1080023 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 22:00:25 +00:00