Commit Graph

1094 Commits

Author SHA1 Message Date
Jonathan Ellis ae7dbe3d2a merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1125113 13f79535-47bb-0310-9956-ffa450edef68
2011-05-19 21:19:30 +00:00
Jonathan Ellis f4f1781a8f merge from 0.8.1
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1102518 13f79535-47bb-0310-9956-ffa450edef68
2011-05-13 00:09:32 +00:00
Jonathan Ellis 50b490e046 add quote-escaping via backslash to CLI
patch by pyaskevich; reviewed by jbellis for CASSANDRA-2623

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1102352 13f79535-47bb-0310-9956-ffa450edef68
2011-05-12 15:31:01 +00:00
Sylvain Lebresne c5c07bd73d merge from 0.8.1
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1102350 13f79535-47bb-0310-9956-ffa450edef68
2011-05-12 15:24:08 +00:00
Sylvain Lebresne 42d5f0aab3 merge from 0.8.1
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1102341 13f79535-47bb-0310-9956-ffa450edef68
2011-05-12 15:15:58 +00:00
Sylvain Lebresne 4a604fbebc Avoid wrong empty result with secondary index when limit=1
patch by slebresne; reviewed by jbellis for CASSANDRA-2628


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1102337 13f79535-47bb-0310-9956-ffa450edef68
2011-05-12 15:06:48 +00:00
Jonathan Ellis d2c98b024d avoid using cached position of a keywhen GTis requested
patch by Richard Low and slebresne; reviewed by jbellis for CASSANDRA-2633

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1101933 13f79535-47bb-0310-9956-ffa450edef68
2011-05-11 16:03:12 +00:00
Jonathan Ellis fcd02e3a66 add CQL TTL support
patch by pyaskevich; reviewed by jbellis for CASSANDRA-2476

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8.1@1101234 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 21:40:27 +00:00
Jonathan Ellis 0427c832b0 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8.1@1101228 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 21:31:45 +00:00
Sylvain Lebresne 5d98581e9c Add CompositeType and DynamicCompositeType
patch by slebresne; reviewed by edanuff for CASSANDRA-2231


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8.1@1101120 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 17:24:34 +00:00
Sylvain Lebresne 522d0dd1e4 Allow comparator parameters and add generic ReverseType
patch by slebresne; reviewed by jbellis for CASSANDRA-2355


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8.1@1101116 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 17:08:23 +00:00
Sylvain Lebresne f759cb1933 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1100906 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 07:29:37 +00:00
Jonathan Ellis 835669aee8 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1100900 13f79535-47bb-0310-9956-ffa450edef68
2011-05-09 07:05:55 +00:00
Jonathan Ellis 5798effe33 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1100471 13f79535-47bb-0310-9956-ffa450edef68
2011-05-07 07:13:21 +00:00
Jonathan Ellis 94f5a6a12b clear up svn confusion on DefsTest
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1100465 13f79535-47bb-0310-9956-ffa450edef68
2011-05-07 06:52:53 +00:00
Jonathan Ellis 5f8991c73a recognize attempt todrop just the index while leaving the column definition
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2619

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1100464 13f79535-47bb-0310-9956-ffa450edef68
2011-05-07 06:52:02 +00:00
Jonathan Ellis 4398f831c3 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1100041 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 04:17:17 +00:00
Jonathan Ellis 3b907655c7 improve ignoring of obsoletemutations in index maintenance
patch by jbellis; reviewed by slebresne for CASSANDRA-2401

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1099892 13f79535-47bb-0310-9956-ffa450edef68
2011-05-05 17:46:23 +00:00
Jonathan Ellis c473679a23 add liveOnly flag to SSTable.componentsFor
patch by Aaron Morton; reviewed by jbellis for CASSANDRA-2602

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1099624 13f79535-47bb-0310-9956-ffa450edef68
2011-05-04 22:17:14 +00:00
Sylvain Lebresne a8d233cae1 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1099038 13f79535-47bb-0310-9956-ffa450edef68
2011-05-03 12:30:39 +00:00
Jonathan Ellis 8897ad5ac7 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1098754 13f79535-47bb-0310-9956-ffa450edef68
2011-05-02 19:20:44 +00:00
Jonathan Ellis f849aa210f merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097952 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 20:59:49 +00:00
Sylvain Lebresne 832a45d89c merge CASSANDRA-2571 from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097884 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 16:52:45 +00:00
Sylvain Lebresne d24d7ce6c4 Reject queries with missing mandatory super column and always validate super column name
patch by jbellis and slebresne for CASSANDRA-2571


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1097852 13f79535-47bb-0310-9956-ffa450edef68
2011-04-29 15:58:09 +00:00
Jonathan Ellis 8cd4dcd211 add timestamp support to cqlINSERT,UPDATE,and BATCH
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2555

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097511 13f79535-47bb-0310-9956-ffa450edef68
2011-04-28 15:39:52 +00:00
Jonathan Ellis bec125b777 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097145 13f79535-47bb-0310-9956-ffa450edef68
2011-04-27 15:27:52 +00:00
Jonathan Ellis cd62c0fef1 add support for IN to cql SELECT, UPDATE
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2553

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1096804 13f79535-47bb-0310-9956-ffa450edef68
2011-04-26 17:07:20 +00:00
Jonathan Ellis 299b7be025 add support for insert, delete in cql BATCH
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2537

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1096771 13f79535-47bb-0310-9956-ffa450edef68
2011-04-26 14:53:53 +00:00
Jonathan Ellis 1b24a02c4c force GC to reclaim disk space on flush, if necessary
patch by jbellis; reviewed by slebresne for CASSANDRA-2404

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1096531 13f79535-47bb-0310-9956-ffa450edef68
2011-04-25 17:29:08 +00:00
Jonathan Ellis 47026880b2 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095770 13f79535-47bb-0310-9956-ffa450edef68
2011-04-21 16:20:47 +00:00
Sylvain Lebresne c948fd2864 merge CASSANDRA-2512 from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095701 13f79535-47bb-0310-9956-ffa450edef68
2011-04-21 13:33:13 +00:00
Sylvain Lebresne 6dc75ce2f3 Fix updating column metadata validation class
patch by jbellis; reviewed by slebresne for CASSANDRA-2512


git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1095696 13f79535-47bb-0310-9956-ffa450edef68
2011-04-21 13:25:36 +00:00
Jonathan Ellis 2d95cb4957 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095492 13f79535-47bb-0310-9956-ffa450edef68
2011-04-20 19:50:50 +00:00
Jonathan Ellis 1adcd1c52e merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1095139 13f79535-47bb-0310-9956-ffa450edef68
2011-04-19 17:13:19 +00:00
Jonathan Ellis a3ab11865b fix backslash substitutions in CLI
patch by Aaron Morton; reviewed by jbellis for CASSANDRA-2492

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1095084 13f79535-47bb-0310-9956-ffa450edef68
2011-04-19 13:42:19 +00:00
Sylvain Lebresne b8534fa167 Merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1094960 13f79535-47bb-0310-9956-ffa450edef68
2011-04-19 09:22:30 +00:00
Sylvain Lebresne 3edbee223f Fix unit test for CASSANDRA-2290
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1094945 13f79535-47bb-0310-9956-ffa450edef68
2011-04-19 08:59:31 +00:00
Jonathan Ellis 7dbb7983c2 preserve version when streaming data from old sstables
patch by jbellis; reviewed by Stu Hood for CASSANDRA-2283

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1094789 13f79535-47bb-0310-9956-ffa450edef68
2011-04-18 21:58:20 +00:00
Gary Dusbabek 5ff7dee6c9 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1094086 13f79535-47bb-0310-9956-ffa450edef68
2011-04-16 23:10:11 +00:00
Jonathan Ellis b553e77331 fix duplicate results from CFS.scan
patch by Pavel Yaskevich and jbellis for CASSANDRA-2406

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1092722 13f79535-47bb-0310-9956-ffa450edef68
2011-04-15 14:33:59 +00:00
Gary Dusbabek 8a6feefe8f merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1092687 13f79535-47bb-0310-9956-ffa450edef68
2011-04-15 12:48:15 +00:00
Jonathan Ellis 58307994b5 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1091784 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 13:59:39 +00:00
Sylvain Lebresne eed330ec08 Merge CASSANDRA-2342 from 0.8.
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1091151 13f79535-47bb-0310-9956-ffa450edef68
2011-04-11 18:00:23 +00:00
Sylvain Lebresne beac419bd3 Multithreaded compactions
patch by stuhood; reviewed by slebresne for CASSANDRA-2191


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090978 13f79535-47bb-0310-9956-ffa450edef68
2011-04-11 08:36:55 +00:00
Jonathan Ellis 264ffbe9b3 make text (utf8) the default comparator again (regression from type renames)
patch by jbellis

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090927 13f79535-47bb-0310-9956-ffa450edef68
2011-04-11 03:27:04 +00:00
Jonathan Ellis 570ac26fc6 give snapshots the same name on each node
patch by Nick Bailey; reviewed by jbellis for CASSANDRA-1791

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090925 13f79535-47bb-0310-9956-ffa450edef68
2011-04-11 03:08:29 +00:00
Jonathan Ellis 8c7bc2fe87 push replication_factor into strategy_options
patch by jhermes and jbellis; reviewed by jhanna for CASSANDRA-1263

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090905 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 22:59:57 +00:00
Sylvain Lebresne 9a0bbc542b Merge COSC and Counter thrift structure
patch by slebresne; reviewed by jbellis for CASSANDRA-2440


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090842 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 17:31:15 +00:00
Sylvain Lebresne dc89826fd8 Make repair work on a token range instead of the full ring
patch by slebresne; reviewed by stuhood for CASSANDRA-2324


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090840 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 17:25:57 +00:00
Jonathan Ellis 798db242c4 add 'int' as sql alias for 'bigint'
patch by jbellis

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090798 13f79535-47bb-0310-9956-ffa450edef68
2011-04-10 13:39:11 +00:00