Commit Graph

61 Commits

Author SHA1 Message Date
Jonathan Ellis 83cce240bf Fix not returning live subcolumns of deleted supercolumns
patch by jbellis; reviewed by junrao for CASSANDRA-583

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@886886 13f79535-47bb-0310-9956-ffa450edef68
2009-12-03 19:17:03 +00:00
Eric Evans 393cbf15dc update test for new Super4 column family definition
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@886010 13f79535-47bb-0310-9956-ffa450edef68
2009-12-01 23:48:31 +00:00
Jonathan Ellis 95cbb3461a allow serializing null CF; add get_range_slice test exercising this
patch by jbellis; tested by Dan Di Spaltro for CASSANDRA-578

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@884333 13f79535-47bb-0310-9956-ffa450edef68
2009-11-25 23:16:58 +00:00
Jonathan Ellis fc518cbb6a add primitive get_range_slice. inefficient, but better than get_key_range + get_slices.
patch by gdusbabek; reviewed by jbellis for CASSANDRA-344

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@881998 13f79535-47bb-0310-9956-ffa450edef68
2009-11-18 23:27:14 +00:00
Jonathan Ellis 1bf797b943 various improvements to stress.py (see issue comments). patch by Scott White; reviewed by Brandon Williams for CASSANDRA-542
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@835196 13f79535-47bb-0310-9956-ffa450edef68
2009-11-12 02:20:41 +00:00
Eric Evans 07ad40f249 fix broken functional test (expect Super3 in list of CFs)
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@834186 13f79535-47bb-0310-9956-ffa450edef68
2009-11-09 19:32:14 +00:00
Jonathan Ellis f6b54dfc6b merge from 0.4
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@831186 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 02:40:35 +00:00
Jonathan Ellis f21b80836d improve stress.py client-side throughput by using the accelerated thrift protocol and multiprocessing instead of threads. patch by Brandon Williams; reviewed by jbellis for CASSANDRA-514
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@830776 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 22:07:50 +00:00
Jonathan Ellis c88e13cdc6 merge from 0.4 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824816 13f79535-47bb-0310-9956-ffa450edef68
2009-10-13 15:48:53 +00:00
Jonathan Ellis f6b95bf0e5 merge from 0.4 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@824426 13f79535-47bb-0310-9956-ffa450edef68
2009-10-12 17:10:53 +00:00
Jonathan Ellis 6d070498be r/m undocumented term aliases in favor of a single 'comment' field.
patch by jbellis and Brandon Williams; reviewed by Michael Greene for CASSANDRA-481

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@823349 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 22:30:55 +00:00
Jonathan Ellis ac5a194d4e merge from 0.4 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@819662 13f79535-47bb-0310-9956-ffa450edef68
2009-09-28 17:46:48 +00:00
Jonathan Ellis d44fb604fd add read testing to stress.py; make stress.py modestly configurable with minor editing
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-442

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@815459 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 19:55:46 +00:00
Jonathan Ellis 64c38a2657 inline BatchMutation into batch_insert params
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-403

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809793 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 01:52:03 +00:00
Jonathan Ellis fa1d99ac96 add forwards-compatible ConsistencyLevel parameter to get_key_range. Currently it is a no-op. patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-322
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@809639 13f79535-47bb-0310-9956-ffa450edef68
2009-08-31 15:50:58 +00:00
Jonathan Ellis 40641c73a6 remove multiget_count until/unless there is a demonstrated need for it. patch by jbellis for CASSANDRA-70
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808597 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 20:11:49 +00:00
Jonathan Ellis 6690c51359 Update AsyncResult to know when it started waiting so you can get() multiple Results in serial but have them wait in parallel. Use this to implement multiget methods. Remove unused MultiAsyncResult code and StorageProxy methods using it.
Patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-70

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808589 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 20:07:12 +00:00
Jonathan Ellis 0fc2d87e2b combine batch_insert and batch_insert_super the way we did get_slice and get_slice_super
patch by jbellis.  reviewed by Chris Goffinet and Evan Weaver for CASSANDRA-388

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808045 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 15:11:27 +00:00
Jonathan Ellis eb49a18acd need to include column container's deletion status when determining whether to include a column in the live count.
patch by jbellis; reviewed by Jun Rao for CASSANDRA-386

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807395 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 21:48:20 +00:00
Jonathan Ellis 568933f5c4 change LongType to read longs in big endian order to be consistent with network order and the UUID types.
patch by jbellis and Evan Weaver; reviewed by Michael Greene for CASSANDRA-384

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806342 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 20:37:45 +00:00
Jonathan Ellis 6be6f84d39 sanity check start, finish slice args
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-376

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806245 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 16:37:14 +00:00
Jonathan Ellis bb464c1f37 use the subcomparator when toStringing slice commands on subcolumns. this exposes a couple bugs: fix getString in non-string types to accept byte[0], and fix a test to send a long to a LongType subcolumn. patch by jbellis and Evan Weaver for CASSANDRA-377
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@805868 13f79535-47bb-0310-9956-ffa450edef68
2009-08-19 16:27:20 +00:00
Jonathan Ellis 9f570c192d respect "start" filter argument for subcolumns.
patch by jbellis; reviewed by Even Weaver for CASSANDRA-357

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802978 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 02:09:40 +00:00
Jonathan Ellis 480650b826 fix typo breaking CompareSubcolumnsWith. fix timeuuid compare with byte[0].
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-357

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802977 13f79535-47bb-0310-9956-ffa450edef68
2009-08-11 02:09:33 +00:00
Jonathan Ellis 6b7a1c300f switch "!isAscending" for "reversed."
patch by jbellis, Carl Bystrom, and Bill de hOra. reviewed by Eric Evans for CASSANDRA-311

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802953 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 23:17:08 +00:00
Jonathan Ellis ceb4a10808 use the existing collectReducedColumns api to make subcolumn slices conform as expected to filter semantics
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-356

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802827 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 15:30:12 +00:00
Jonathan Ellis 15354b4906 Combine thrift slice methods. Now we have one get() method, one get_slice(), and one get_count().
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-329

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802640 13f79535-47bb-0310-9956-ffa450edef68
2009-08-10 02:51:35 +00:00
Jonathan Ellis e24925d49e add SSTableWriter buffer size option; increase default.
patch by jbellis; reviewed by Sammy Yu for CASSANDRA-339

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@802185 13f79535-47bb-0310-9956-ffa450edef68
2009-08-07 20:57:02 +00:00
Jonathan Ellis 5782d175a0 table -> keyspace in stress.py. patch by Michael Greene; reviewed by jbellis for CASSANDRA-271
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799313 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 15:11:43 +00:00
Jonathan Ellis 572b5f852d table -> keyspace
patch by jbellis; reviewed by Michael Greene for CASSANDRA-271

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799140 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 00:29:28 +00:00
Jonathan Ellis acd50bd901 add ConsistencyLevel parameter to read ops. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-232
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798390 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 04:06:56 +00:00
Jonathan Ellis a178537d5b update stress.py for current thrift api
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798366 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:45:28 +00:00
Jonathan Ellis d76bbca3e2 add ConsistencyLevel Thrift enum to avoid client having to compute quorum size. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-300
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798298 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 21:44:47 +00:00
Jonathan Ellis 058eef0806 return columns from desc query in desc order. patch by Jun Rao; reviewed by jbellis for CASSANDRA-196
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796881 13f79535-47bb-0310-9956-ffa450edef68
2009-07-22 21:13:35 +00:00
Jonathan Ellis e425474af2 add get_slice for supercolumn, tests. add back updated TimeSortTest. we need to pass gcBefore to the filters so Slice can count correctly.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-303

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796129 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 02:58:20 +00:00
Jonathan Ellis a0cf703601 r/m tests that won't pass until we do #303.
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796109 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 01:37:00 +00:00
Jonathan Ellis 986cee6806 change String column names to byte[] to allow user-defined ordering.
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796108 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 01:36:52 +00:00
Eric Evans 6425603980 improved error handling for system test server startup
Capture stderr and stdout when process is dead; only kill if it isn't
already dead.

Patch by Sammy Yu; reviewed by eevans for CASSANDRA-306

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794951 13f79535-47bb-0310-9956-ffa450edef68
2009-07-17 03:32:25 +00:00
Jonathan Ellis 715b60d147 fix not including tombstone-only keys in keyRange.
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-286

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794475 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 00:39:01 +00:00
Jonathan Ellis ff764ff22b r/m offset from slice api; we could live with being inefficient but not with breaking read repair.
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-286

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794474 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 00:38:53 +00:00
Jonathan Ellis 0b1aeda97c missed one: rename column.column_name -> column.name
patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794431 13f79535-47bb-0310-9956-ffa450edef68
2009-07-15 22:04:57 +00:00
Jonathan Ellis 85ba194e7c update system tests; fix get_column_count
patch by jbellis; reviewed by Evan Weaver and Sandeep Tata for CASSANDRA-139

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794430 13f79535-47bb-0310-9956-ffa450edef68
2009-07-15 22:04:51 +00:00
Eric Evans f49f3e7ea9 abort system tests if previous run shutdown uncleanly
Patch by eevans; reviewed by Michael Greene for CASSANDRA-282

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792615 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 17:38:42 +00:00
Eric Evans fdf95da464 move ports used in system tests; shorten timeout
Patch by Michael Greene; reviewed by eevans for CASSANDRA-282

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792614 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 17:38:36 +00:00
Jonathan Ellis 2b18bade55 make get_key_range act on a single CF.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-280

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791961 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 19:57:37 +00:00
Jonathan Ellis 23fa1bc0bd combine range version of get_slice into get_slice itself.
patch by jbellis; reviewed by Michael Greene for CASSANDRA-277

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791872 13f79535-47bb-0310-9956-ffa450edef68
2009-07-07 15:40:46 +00:00
Jonathan Ellis cdd8b17062 add offset support to get_slice. patch by Jun Rao; reviewed by jbellis for CASSANDRA-261
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791553 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 17:50:16 +00:00
Jonathan Ellis ca56a3eab3 more consistent checking of thrift parameters; fixes multiple bugs.
patch by jbellis; reviewed by Evan Weaver for CASSANDRA-266

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@789979 13f79535-47bb-0310-9956-ffa450edef68
2009-06-30 22:06:56 +00:00
Jonathan Ellis 6342512a34 CASSANDRA-217 rename get_slice_from to get_slice. implement get_slice_super in terms of SliceFrom too.
(time-based columns can continue to be sliced with get_columns_since)

patch by jbellis; reviewed by Eric Evans for CASSANDRA-217

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788516 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:26:33 +00:00
Jonathan Ellis 3514c66221 add system test for slice_by_name_range. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-53
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@783812 13f79535-47bb-0310-9956-ffa450edef68
2009-06-11 15:14:55 +00:00