2514d6dc64
fix spelling, indents from old SequenceFile code
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799951 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:31:33 +00:00
45514cf1be
remove AbstractWriter. all it was providing was append methods, which are inlined into SSTableWriter now; the rest was all wrappers. also, rename some variables in SST/SSTW.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799950 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:31:24 +00:00
d1f4234d26
r/m SequenceFile. ColumnGroupReader moved to SSTableSliceIterator mostly unchanged for now. (finish cleaning this up in #332 )
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799949 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:31:15 +00:00
28df101aaa
replace SF.next with code in NamesIterator that doesn't rewrite data through an extra layer of DataOutput/Input
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799948 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:31:08 +00:00
b2397a763e
SF shouldn't duplicate position checking that was already done by SSTable. move utility methods to IndexHelper. fix off-by-4 in dataSizeReturned.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799947 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:31:01 +00:00
4c2d91c213
r/m code in SF.next handling being called multiple times, since it can only be called once.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799946 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:30:55 +00:00
8203a6cfb2
r/m special case that no column names=all columns; add test for no-columns cases.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799945 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:30:49 +00:00
0f95411c03
r/m SF.next(DataOutput) in favor of more-efficient IteratingRow.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799944 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:30:40 +00:00
c31d44ae89
move next, getColumnGroupReader out of SSTableReader.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799943 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:30:23 +00:00
22dc26bb9d
make CommitLog use a raw BufferedRandomAccessFile instead of overloading AbstractWriter/IFileReader unnecessarily. the set of AW features used by both CommitLog and SSTable was nil.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-330
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799942 13f79535-47bb-0310-9956-ffa450edef68
2009-08-01 22:30:14 +00:00
da9778d509
unmix line endings in Table.java. patch by Jeff Hodges; reviewed by jbellis for CASSANDRA-333
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799743 13f79535-47bb-0310-9956-ffa450edef68
2009-07-31 20:42:54 +00:00
70ce402fdd
Make range queries continue on the next node when necessary.
...
Patch by Arin Sarkissian; reviewed by jbellis for CASSANDRA-212
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799684 13f79535-47bb-0310-9956-ffa450edef68
2009-07-31 18:29:52 +00:00
9164940f41
allow start of [] to mean "start with the largest value" when ascending=false. patch by Jun Rao; reviewed by jbellis for CASSANDRA-263
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799632 13f79535-47bb-0310-9956-ffa450edef68
2009-07-31 15:06:35 +00:00
066ef58a96
run source files through dos2unix to standardize on \n line endings. patch by Jeff Hodges; reviewed by Michael Greene for CASSANDRA-111
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799331 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 15:30:21 +00:00
edf2226079
add CompareSubcolumnsWith to describe_keyspace. patch by Evan Weaver; reviewed by Michael Greene for CASSANDRA-326
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799320 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 15:18:03 +00:00
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
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
56a846ba1c
Pluggable replicaplacement, endpointsnitch classes (take 2). patch by Sammy Yu; reviewed by jbellis for CASSANDRA-323
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799065 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 20:39:01 +00:00
bd05521131
Revert "Pluggable replicaplacement, endpointsnitch classes." Breaks test suite.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799045 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 20:10:38 +00:00
51dbca6927
Pluggable replicaplacement, endpointsnitch classes. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-323
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@799043 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 20:05:46 +00:00
bfb5006420
add isTraceEnabled checks similar to isDebugEnabled. patch by jbellis for CASSANDRA-174
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798980 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 17:05:47 +00:00
f856364274
add more if-isDebugEnabled lines to reduce overhead when logging at INFO or higher. patch by Michael Greene; reviewed by jbellis for CASSANDRA-174
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798979 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 17:00:18 +00:00
8588982b85
combine switchMemtable and enqueueFlush so that they always operate on the same object. move forceFlush guts from MT to CFS since it encapsulates better there
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-320
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798935 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 15:05:07 +00:00
ab6d4b9a64
pass consistency_level param from thrift to internals. patch by Gasol Wu; reviewed by jbellis for CASSANDRA-232
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798509 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 12:51:03 +00:00
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
574cb8f549
Use arrayblockingqueue in commitlog executor; this cleans up the code a bit (performance is unaffected since the writes and syncs are far more expensive than any queue ops)
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798373 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:46:11 +00:00
fbe6c4a854
add config options for commitlog syncing
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798372 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:46:27 +00:00
35ff447ba4
custom CommitLogExecutorService that can fsync per multiple CL additions
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798371 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:45:55 +00:00
88a30f182a
move log ops to callables on a threadpoolexecutor instead of synchronizing. this prepares the way to merge multiple add() calls into a single sync.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798370 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:45:50 +00:00
68bd9489b7
naive fsync-after-each-log-entry
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798369 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:46:02 +00:00
5e5d8385be
mv AbstractWriter to its own top-level class and remove redundant IFileWriter
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798368 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:45:40 +00:00
bf9caf8feb
handle incomplete CL entries on recover
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-182
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798367 13f79535-47bb-0310-9956-ffa450edef68
2009-07-28 02:45:33 +00:00
1332c0ed65
use CSLS instead of NBHS for memtablesPendingFlush. See explanation here: http://sourceforge.net/tracker/?func=detail&aid=2828100&group_id=194172&atid=948362
...
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-157
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798316 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 22:40:38 +00:00
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
e3aef8e0ed
fix bug in comparing-to-empty-array; realize that we need compare-to-empty-array to specify start/finish of slices.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-119
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798273 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 20:19:53 +00:00
38d81587ac
finish snapshot support. patch by Sammy Yu; reviewed by jbellis and Michael Greene for CASSANDRA-279
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798228 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 17:28:57 +00:00
67deae8e40
fix cli/thrift map key regression. patch by Gasol Wu; reviewed by jbellis for CASSANDRA-317
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@798019 13f79535-47bb-0310-9956-ffa450edef68
2009-07-27 04:15:49 +00:00
227b270134
standardize more method and parameter names on underscores instead of camelcase. patch by Michael Greene; reviewed by jbellis for CASSANDRA-312
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@797674 13f79535-47bb-0310-9956-ffa450edef68
2009-07-24 22:32:21 +00:00
cf01ea1c49
Return standard/super designation to introspection and fix typo in DD. patch by Michael Greene; reviewed by jbellis for CASSANDRA-314
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@797209 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 20:11:57 +00:00
8d4b161f09
close temporary logWriters to avoid leaking FD. patch by Brandon Williams; reviewed by jbellis for CASSANDRA-313
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@797173 13f79535-47bb-0310-9956-ffa450edef68
2009-07-23 17:57:26 +00:00
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
878991bb32
r/m unwanted logger.debug, pointed out by Michael Greene. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796559 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 22:08:34 +00:00
32d964ff54
better handling of file names with spaces on windows
...
- Quote path names in startup bat file
- Pass File object instead of URI when parsing storage-conf.xml
Patch by Michael Greene; reviewed by eevans for CASSANDRA-307
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796345 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 15:21:59 +00:00
b866f81415
add SubcolumnCompareWith option and subcolumnComparator code.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-304
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796132 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 03:01:55 +00:00
438f387705
add BytesType comparator (like AsciiType but doesn't require that the bytes mean anything)
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-304
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796131 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 03:01:42 +00:00
985d96a52c
rename DD.getType -> getComparator
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-304
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796130 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 03:01:35 +00:00
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
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
8ff63a92ba
r/m time-sorted columns.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796107 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 01:36:10 +00:00
7435fc82c0
introduce column() compatibility layer to make writing tests a little less verbose.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-185
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@796106 13f79535-47bb-0310-9956-ffa450edef68
2009-07-21 01:35:47 +00:00
bad8fb5fae
allow separate config of thrift bind address
...
This patch adds a new configuration directive 'ThriftAddress', an
analogue to ListenAddress for the thrift service.
If left unconfigured, the thrift service will fall back to the same
default as ListenAddress (i.e., InetAddress.getLocalHost). Unlike
ListenAddress, it is OK to set ThriftAddress to 0.0.0.0 which
will result in the service listening on all interfaces.
Patch by eevans; reviewed by Michael Greene for CASSANDRA-288
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@795205 13f79535-47bb-0310-9956-ffa450edef68
2009-07-17 19:45:22 +00:00
f04b9d3ed4
remove ganglia analytics package
...
Patch by eevans; reviewed by Michael Greene for CASSANDRA-297
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794876 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 21:40:59 +00:00
840a64dcb9
move data files into per-table subdirectories. patch by Arin Sarkissian; reviewed by Michael Greene and jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794784 13f79535-47bb-0310-9956-ffa450edef68
2009-07-16 19:10:06 +00:00
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
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
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
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
f2da00fb0f
thrift changes to remove : api.
...
use ColumnPath, ColumnParent, etc. structs to encapsulate optional SuperColumns (and occasionally, optional Columns).
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@794429 13f79535-47bb-0310-9956-ffa450edef68
2009-07-15 22:04:43 +00:00
9c5274b4cd
rename confusing "random" magic number variables. patch by jbellis; reviewed by Michael Greene for CASSANDRA-74
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794079 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 21:46:43 +00:00
4b4459c0d1
r/m ZooKeeper vestiges. patch by Michael Greene; reviewed by jbellis for CASSANDRA-291
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793691 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 20:05:04 +00:00
dd4f4be2b4
add IdentityQueryFilter and finish removing IFilter.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793055 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:49:18 +00:00
7b6fb2b36c
add TimeQueryFilter; remove old TimeFilter.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793054 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:49:06 +00:00
48093358fb
replace namesfilter with NamesQueryFilter. mv filter code into separate package.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793053 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:49:01 +00:00
4d1395e0fa
refactor out QueryFilter, SliceQueryFilter.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793052 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:48:49 +00:00
7762e06571
rename lock_ -> sstableLock_.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793051 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:48:45 +00:00
f5a787af72
r/m unused (and dangerous) RowReadCommand.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-287
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793050 13f79535-47bb-0310-9956-ffa450edef68
2009-07-10 17:48:41 +00:00
0e4135933a
add PendingTasks attribute to NodeProbe cfstats output
...
Patch by Sammy Yu; reviewed by Arin Sarkissian for CASSANDRA-285
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792597 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 16:18:39 +00:00
8c04ffd52a
added CFS pending tasks JMX attribute
...
Patch by eevans; reviewed by Arin Sarkissian for CASSANDRA-173
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792343 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 22:49:08 +00:00
aaa6eee87d
expose CF write count/latency via JMX
...
Patch by Sammy Yu; reviewed by Eric Evans for CASSANDRA-272
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792161 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 14:24:25 +00:00
4e3a4404c9
spelling fixes. patch by Michael Greene; reviewed by jbellis for CASSANDRA-281
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@792126 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 12:56:23 +00:00
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
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
e324ef9051
disallow specifying ColumnSort on supercolumns. patch by jbellis; reviewed by Evan Weaver for CASSANDRA-251
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791598 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 20:07:52 +00:00
b54de30a02
per-table key cache size.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-259
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791592 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:58:13 +00:00
d6c0b0f259
refactor sstable into SSTable, SSTableReader, and SSTableWriter.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-259
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791591 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:58:05 +00:00
013d59fc00
add concurrentlinkedhashmap cache and config option. config option is NOT yet wired up to control cache sizes.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-259
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791590 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:57:50 +00:00
26aefa2f4a
encapsulate bloom filter access into sstable.getPosition
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-259
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791589 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 19:57:44 +00:00
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
0172497ad2
minor code cleanups. patch by Edward Ribeiro; reviewed by jbellis for CASSANDRA-273
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@791059 13f79535-47bb-0310-9956-ffa450edef68
2009-07-04 05:55:09 +00:00
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
83b203e61e
add test catching buggy update of header on flush; refactor so there is only one version of code doing those writes (the correct one).
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-264
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@789465 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 22:07:49 +00:00
f2cab86892
don't remove commitlog files when replay fails; you lose the chance to fix a bug, as well as your data.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-264
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@789464 13f79535-47bb-0310-9956-ffa450edef68
2009-06-29 22:07:41 +00:00
0077af40fd
add isDebugEnabled check for logger.debug for performance. patch by goffinet; reviewed by jbellis for CASSANDRA-174
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788914 13f79535-47bb-0310-9956-ffa450edef68
2009-06-27 01:22:49 +00:00
af82ca7ae1
Enhance describeTable to return Map of Column Family so that it can be programatically parsed. patch by Sammy Yu; reviewed by jbellis for CASSANDRA-258
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788895 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 22:37:42 +00:00
261340a342
r/m http server (use cli, nodeprobe, jmx as necessary instead).
...
patch by jbellis and Eric Evans for CASSANDRA-211
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788892 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 22:29:12 +00:00
fe2bd0103f
r/m refactor from CASSANDRA-249 that caused infinite recursion. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788781 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 17:38:22 +00:00
f55dd06ec5
avoid optimization of not checking older memtable and SSTables if we find _an_ answer early on; it causes bugs
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788776 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 17:26:36 +00:00
b9da215e06
some gms tests. patch by johano; reviewed by jbellis for CASSANDRA-249
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788771 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 17:22:40 +00:00
68564e1549
s/intepret/interpret/
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788770 13f79535-47bb-0310-9956-ffa450edef68
2009-06-26 17:22:30 +00:00
3a7a33ce0f
fix tombstone bug in 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@788518 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:27:00 +00:00
adaff5f215
reformat. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788517 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:26:53 +00:00
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
963a1b3bfd
add tests for supercolumnfamily removal; fix bugs.
...
(both the assert removal and the "if" removal are bug fixes.)
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-255
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788511 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:07:45 +00:00
27d66d8269
add asserts. patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-255
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788510 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 21:07:35 +00:00
4e7f8deac0
switch to passing a single filename to open an sstable for writing. this makes open-for-read and open-for-write consistent.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-254
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788473 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 19:14:07 +00:00
4283f0d879
add private constructor that doesn't init writers
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-254
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788472 13f79535-47bb-0310-9956-ffa450edef68
2009-06-25 19:13:59 +00:00
064a59cdb0
cleanup CFS.onstart
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788146 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 19:25:21 +00:00
b516ce8176
DBManager obscures rather than clarifies what is going on. Remove it.
...
At some point we stopped calling DBManager.instance(), so Table.onStart was
not getting called. Move that into CassandraDaemon so we don't rely on a side
effect to run it.
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788145 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 19:25:17 +00:00
81dd8ee5f6
use normal Table for system metadata
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788144 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 19:25:33 +00:00
682736ee5e
r/m recycle cf and undocumented/incomplete Loader code using it
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788143 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 19:25:04 +00:00
5cdc75d760
move Hints cf to SYSTEM_TABLE
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-235
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@788142 13f79535-47bb-0310-9956-ffa450edef68
2009-06-24 19:24:56 +00:00
a89e782556
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787767 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:57:04 +00:00
f9a1343d92
make static methods of SSTable that take a filename and then use the cache to grab an sstable object, simple non-static methods instead
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-224
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787762 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:48:18 +00:00
2f322a8bd0
encapsulate sstable bloom filter
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-224
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787761 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:48:08 +00:00
2493c9a565
encapsulate sstable index
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-224
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787760 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:48:18 +00:00
a2f9b40183
refactor read-only constructor to SSTable.open
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-224
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787759 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:47:53 +00:00
d48d8fcbf7
r/m unused code dealing with sstables, and ConcurrentWriter / FastConcurrentWriter. mmap is not faster than write() for sequential I/O, which is what the vast majority of our writes are. mmap _does_ have an advantage when we seek back to the start of a commitlog segment to update the headers after memtable flush, but we do that infrequently enough that it's not worth the disadvantages (primarily, blowing up if we exceed the 4MB size).
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-224
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787758 13f79535-47bb-0310-9956-ffa450edef68
2009-06-23 17:47:45 +00:00
bf660bb97f
fix more null table parameters.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787408 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:18:18 +00:00
509cbb85de
remove table_ from CommitLog and add multitable tests.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787407 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:18:12 +00:00
5ccebd43c9
fix columnfamily id generation in the face of multiple tables and rip out TableMetadata serialization, which only complicates things needlessly.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787406 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:18:02 +00:00
cc373761dc
cleanup of table.open.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787405 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:17:58 +00:00
3673e28186
multitable support.
...
fix CF table dependencies, making CommitLogTest pass. Also fixes CASSANDRA-188 in passing.
fix tablename being null bugs by always parsing tablename from filename.
fix last part of SequenceFile.
patch by jbellis; reviewed by goffinet for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787404 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:17:46 +00:00
9aeef94db8
Pass and write table parameter as needed throughout the codebase to add multitable support.
...
(Many places cheated and just assumed that tables.get(0) was the only table.)
Patch builds but does not yet pass tests.
Patch by goffinet; reviewed by jbellis for CASSANDRA-79
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787403 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 21:17:59 +00:00
1a66c10695
more CommitLog cleanup. patch by jbellis; reviewed by Jun Rao for CASSANDRA-243
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787284 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 15:49:57 +00:00
38f6446d08
rename "end" parameter to "finish" to avoid conflict w/ ruby keyword. patch by Stu Hood; reviewed by jbellis for CASSANDRA-247
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787258 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 14:46:27 +00:00
b6645156bc
replace new Foo(...) with Foo.valueOf. patch by Edward Ribeiro; reviewed by jbellis for CASSANDRA-246
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@787249 13f79535-47bb-0310-9956-ffa450edef68
2009-06-22 14:38:19 +00:00
1a23f9934f
r/m new String() redundancy. patch by Edward Ribeiro; reviewed by jbellis for CASSANDRA-244
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786888 13f79535-47bb-0310-9956-ffa450edef68
2009-06-20 19:22:28 +00:00
d9e69b4024
switch from byte[] to BitSet in CommitLogHeader. patch by jbellis; reviewed by goffinet for CASSANDRA-237
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786245 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 20:22:18 +00:00
5b99a22032
update comments, perform some renames, r/m unused code.
...
patch by jbellis; reviewed by goffinet for CASSANDRA-237
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786244 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 20:22:14 +00:00
a0c2b2a380
add CommitLog and RecoveryManager tests. patch by jbellis; reviewed by goffinet for CASSANDRA-237
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786243 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 20:22:10 +00:00
15955bf03e
minor cleanup of Row code. patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-199
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786242 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 20:17:29 +00:00
03f6f244a3
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786176 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 17:30:04 +00:00
a116ef72e8
rethrow IOException with more details. patch by jbellis; reviewed by Jun Rao for CASSANDRA-202
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@786025 13f79535-47bb-0310-9956-ffa450edef68
2009-06-18 11:46:39 +00:00
c1545f5214
fix off-by-one error in Range.contains(Token): the endpoint (right) of the range is always supposed to be exclusive, but it was inclusive in the non-wrapping case. patch by Stu Hood; reviewed by jbellis for CASSANDRA-236
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@785697 13f79535-47bb-0310-9956-ffa450edef68
2009-06-17 16:08:39 +00:00
01adb7a1aa
add nodeprobe cli tool. patch by Eric Evans; reviewed by jbellis for CASSANDRA-211
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@785178 13f79535-47bb-0310-9956-ffa450edef68
2009-06-16 12:38:30 +00:00
b356537196
r/m CM and CRAF. patch by jbellis; reviewed by Stu Hood for CASSANDRA-230
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@784842 13f79535-47bb-0310-9956-ffa450edef68
2009-06-15 16:20:04 +00:00
24fcbf4a95
switch singleton implementation from double-checked-locking to synchronized (code is not performance-sensitive). patch by Edward Ribeiro; reviewed by jbellis for CASSANDRA-228
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@784780 13f79535-47bb-0310-9956-ffa450edef68
2009-06-15 13:42:30 +00:00
6a2da22975
r/m unused Constants.java. patch by jbellis; reviewed by Edward Ribeiro for CASSANDRA-227
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@784495 13f79535-47bb-0310-9956-ffa450edef68
2009-06-14 01:14:34 +00:00
cd2139ee7c
system.exit on oome. patch by jbellis; reviewed by Eric Evans for CASSANDRA-218
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@783388 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 15:12:18 +00:00
72e6eea9e4
split sstable into data, index, and bloom filter files. this allows us to avoid saving up index chunks
...
in memory until the sstable data is completely written, while still allowing fast scanning of the index
on startup. it also simplifies the sstable/sequencefile code considerably.
patch by jbellis; reviewed by Jun Rao for CASSANDRA-208
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@783077 13f79535-47bb-0310-9956-ffa450edef68
2009-06-09 17:46:42 +00:00
f685f4dec8
expose compaction via JMX. patch by Eric Evans; reviewed by jbellis for CASSANDRA-211
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782774 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 20:37:38 +00:00
b244a2e645
rename Table.doGC to forceCleanup. patch by Eric Evans; reviewed by jbellis for CASSANDRA-211
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782773 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 20:37:31 +00:00
d342288f36
cleanup SSTable-related code. patch by jbellis; reviewed by Jun Rao for CASSANDRA-208
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782744 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 19:45:00 +00:00
f6d0154e23
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782740 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 19:37:57 +00:00
8f9e6a4516
To make available the Cassandra specific information available on the
...
node detail page:
- Exposed the existing StorageService.getLoadInfo()
- Created StorageService.getCurrentGenerationNumber() and added to
MBean interface.
patch by Eric Evans; reviewed by jbellis for CASSANDRA-211
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782629 13f79535-47bb-0310-9956-ffa450edef68
2009-06-08 13:59:52 +00:00
7520b4356b
add getRangeToEndPointMap to JMX. Requires making Token and Range Serializable. Patch by Eric Evans; reviewed by jbellis for CASSANDRA-211
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782182 13f79535-47bb-0310-9956-ffa450edef68
2009-06-06 02:45:20 +00:00
a087b97c96
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782117 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 19:52:29 +00:00
76a8f7b551
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@782096 13f79535-47bb-0310-9956-ffa450edef68
2009-06-05 18:40:06 +00:00
04dcee09ba
r/m Row.getColumnFamilyMap. replaced with Row.getColumnFamily or .getColumnFamilies as appropriate.
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-198
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779773 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 21:15:24 +00:00
f116a3e4e5
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779771 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 21:10:07 +00:00
edacc67c26
remove unnecessary List creation in getSliceFrom and move close() cleanup for to the finally block. patch by Jun Rao; reviewed by jbellis for CASSANDRA-201
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779322 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 21:41:04 +00:00
7acfcb0e45
r/m shutdown code (making Cassandra crash-only, which it has been de facto for a while).
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-115
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779290 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 19:59:33 +00:00
bb0d6dfa20
allow specifying a subset of columnfamilies to check for get_key_range.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-152
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@779261 13f79535-47bb-0310-9956-ffa450edef68
2009-05-27 18:04:56 +00:00
97c022f5ee
short circuits sending a message if the mutation's destination is the local node. does not implement hint handling; takes the full message route if hints are involved. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-132
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@778871 13f79535-47bb-0310-9956-ffa450edef68
2009-05-26 20:23:16 +00:00
56b499044b
use cloneMeShallow where appropriate. patch by jbellis for CASSANDRA-79
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@777583 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 15:37:19 +00:00
4ac9118f7c
Add get_slice_from functionality using column indexes for efficiency.
...
Patch by Jun Rao and jbellis for CASSANDRA-172
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@777578 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 15:33:42 +00:00
a432e18077
more cleanup of compaction code.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-184
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@776720 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 14:58:39 +00:00
d03d80b6ed
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@776716 13f79535-47bb-0310-9956-ffa450edef68
2009-05-20 14:44:41 +00:00
0ae07f299e
add block_for parameter to insert calls. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-154
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@776365 13f79535-47bb-0310-9956-ffa450edef68
2009-05-19 15:51:10 +00:00
88edbed30c
merge from 0.3 branch
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775983 13f79535-47bb-0310-9956-ffa450edef68
2009-05-18 15:22:23 +00:00
d52a110974
check for enough endpoints before starting a quorum wait.
...
patch by jbellis; reviewed by Jun Rao and Sandeep Tata for CASSANDRA-180
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775361 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 21:37:45 +00:00
784d968db9
omitted to add Sandeep's SBRRC.java in last commit
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775321 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 20:41:05 +00:00
20f7d032c7
add get_slice_by_name_range command. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-53
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775308 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 20:18:55 +00:00
324c3c32a1
allow specifying initial token. patch by Jun Rao; reviewed by jbellis for CASSANDRA-181
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@775203 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 15:55:35 +00:00
3d7203266a
replace executor with locking. the interaction between the executor service terminating and the CFS
...
was inherently unsafe -- you would have to lock anyway to make it safe, the atomic reference wasn't
enough, so at that point you might as well get rid of the executor.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774567 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 22:31:49 +00:00
735008dafc
more log cleanup. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774424 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 16:47:14 +00:00
bd3c6acf33
misc cleanup. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774166 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 02:19:34 +00:00
f86d47c242
to avoid adding work to terminating executor (which will raise an exception) we need to check for threshold violated _first_, and move puts to the new memtable once flush has started. patch by jbellis; reviewed by Eric Evans for CASSANDRA-165
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774165 13f79535-47bb-0310-9956-ffa450edef68
2009-05-13 02:17:23 +00:00
3aca0737cb
another workaround for register/select wonkiness. patch by jbellis; tested by Mark Robson for CASSANDRA-156
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774076 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 20:46:36 +00:00
da441aed29
cleanup ssTable filename tracking. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774025 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 19:11:31 +00:00
b460bd71c5
test to more reliably reproduce CME during range. fix by locking out compact during range query.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-161
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774024 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 19:11:27 +00:00
5886b7c9ac
fix race condition in compaction -- it was possible for a read thread to "snapshot" ssTables_, then have
...
the compactor thread delete those (after merging them into a new file) before the read thread checked
them. Since the read thread's "snapshot" doesn't include the new merged sstable, it incorrectly tells
the caller that the key does not exist.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-161
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774023 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 19:11:21 +00:00
41ee512d6f
fix race condition between when memtable is replaced as the active one and when it's added to
...
the set of historical (pending flush) memtables.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-161
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774022 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 19:11:15 +00:00
2fd856de35
unregister mbean on flush. patch by daishi; reviewed by jbellis for CASSANDRA-157
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@774002 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 17:56:31 +00:00
5964cd4c04
extract tests that could conflict with each other to a separate test class (= gets own jvm)
...
patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-162
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773941 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 15:26:52 +00:00
ad2cd9a9ba
more cleanup, mostly by reducing nesting level where possible. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773729 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 23:52:17 +00:00
dd1f0972bb
reformat. this is just whitespace changes, automated by the IDE. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773728 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 23:52:10 +00:00
fe3e1a8a09
check for at-end-of-data in iterator init. patch by jbellis; reviewed by Jun Rao for CASSANDRA-153
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773727 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 23:48:34 +00:00
dfa41ec103
cannonicalize all accesses to indexMetadataMap.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-153
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773726 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 23:48:28 +00:00
69bc7e97c8
unit test to expose bug system test is running into. patch by jbellis; reviewed by Jun Rao for CASSANDRA-153
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773725 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 23:48:20 +00:00
761e953afa
clean up compaction code and refactor to allow user-specified threadhold (minimum number of CFs to compact). patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773573 13f79535-47bb-0310-9956-ffa450edef68
2009-05-11 14:26:16 +00:00
44a0a3a54d
fix CME during range queries -- keyset call needs to go on the memtable exector.
...
patch by jbellis; tested by Tv for CASSANDRA-153
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773152 13f79535-47bb-0310-9956-ffa450edef68
2009-05-09 01:40:16 +00:00
61a8150420
fix iteration bug. it would always return hasNext=false if seekTo was called first. fixing this with maybeInit proved difficult, so init is now done in constructor and iterator itself is created lazily.
...
patch by jbellis; tested by nk11 for CASSANDRA-153
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773017 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:54:27 +00:00
f2260f107b
add more robust sanity checking of get_column arguments. patch by jbellis; reviewed by Jun Rao for CASSANDRA-151
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773016 13f79535-47bb-0310-9956-ffa450edef68
2009-05-08 14:53:25 +00:00
750d0a16b0
more logging cleanout. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772790 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 22:09:13 +00:00
85c7c39ad1
avoid creating empty sstables on recovery flush. (a) empty sstables are still work for the compactor later, and (b) sstable.close errors out when it's empty. patch by jbellis.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772773 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 21:09:51 +00:00
ccfe2d7c9e
make TSD threadsafe; note that BSD is not (since FailureDetector does its own locking). patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772765 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 20:33:55 +00:00
c129b6d5d7
clean up read/write path more; include message id in logging so we can trace what
...
happens to an individual op. patch by jbellis.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772713 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 17:13:05 +00:00
fb347bd3d1
fix CF.digest NPE. patch by jbellis; reviewed by Eric Evans for CASSANDRA-149
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772690 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 16:03:32 +00:00
3395efdb30
use explicit dirty flag instead of trying to cheat and use executor taskcount, which is race-prone. patch by jbellis; reviewed by Eric Evans for CASSANDRA-134
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772680 13f79535-47bb-0310-9956-ffa450edef68
2009-05-07 15:30:53 +00:00
4a2ba89fe3
r/m orphaned Leader code. patch by jbellis; reviewed by Eric Evans for CASSANDRA-143
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772455 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 22:40:16 +00:00
c3f0d10a8e
clean up more ad-hoc timing message and move to mbeans. add TimedStatsDeque to
...
simplify tracking load stats over a one-minute window.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-144
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772448 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 22:27:02 +00:00
65f66e982d
force flush when there are pending ops on the memtable executor even when none have finished yet. this fixes test case intermittent failures. patch by jbellis; reviewed by Eric Evans for CASSANDRA-141
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772361 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 17:04:32 +00:00
3ed4e051b8
add pending tasks mbean to all DebuggableTPE. clean out ad-hoc queue length logging.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-135
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772030 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 02:27:54 +00:00
8042a4e441
allow periodic flushing on a per-CF basis for infrequently-updated CFs (i.e.,
...
unlikely to reach the memtable size or object count limits often). this will allow
purging old commitlog segments in a more timely fashion.
patch by Jun Rao; reviewed by jbellis for CASSANDRA-134
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772026 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 01:55:51 +00:00
28e548a31c
initialize configFileName_. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-129
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772020 13f79535-47bb-0310-9956-ffa450edef68
2009-05-06 00:35:33 +00:00
362f287c84
refactor IColumn.addColumn to remove redundant name parameter. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-96
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@772000 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 22:47:22 +00:00
8dcf76ab27
tombstones take priority over non-tombstones w/ the same timestamp in supercolumn and column. this makes HH management deterministic.
...
patch by jbellis; reviewed by Jun Rao for CASSANDRA-34
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771935 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 17:03:25 +00:00
f17487c541
A make hint generation include a real timestamp so we can do meaningful deletes
...
B call removeDeleted on the data we read locally to purge tombstones
C because of (B) any supercolumn w/o subcolumns simply won't exist so we know we can skip re-deleting the endpoint data. so deleteKey becomes deleteHintedData.
D because deleted data is not immediately purged, increased the scheduled interval from 20min to 60 to reduce the load of scanning the hint CF.
patch by Jun Rao and jbellis for CASSANDRA-34
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771934 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 17:03:15 +00:00
017b576fba
cleanup and refactor HintedHandOffManager.
...
patch by jbellis and Jun Rao for CASSANDRA-34
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771933 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 17:03:04 +00:00
7779df6ce4
This patch adds ColumnFamilyStore.forceflush to the mbean so that it can be activated through the management agent. patch by Eric Evans; reviewed by jbellis for CASSANDRA-34
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771927 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 16:56:55 +00:00
fce0ee0d7b
This changeset abstracts the logic for placing a flush on the queue into a new method, Memtable.enqueueFlush. enqueueFlush is called from both forceflush and put (when a threshold is exceeded), without the need to apply a special flushKey. patch by Eric Evans; reviewed by jbellis for CASSANDRA-34
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771926 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 16:56:40 +00:00
494de44355
move more gossip log messages to trace and de-obfuscate some variable and method names.
...
patch by jbellis.
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771878 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 16:11:07 +00:00
b2e2b1c116
use `block` flag instead of separate _blocking methods. throw exception on error instead of returning bool for success. patch by jbellis; reviewed by Eric Evans for CASSANDRA-131
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771761 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 14:54:05 +00:00
7b2589ddb0
add logging for httpconnection to troubleshoot #133 . patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771591 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 06:57:16 +00:00
62ed2cbc16
user-friendly error when partitioner is missing. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771465 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 22:03:52 +00:00
219293b2b3
clean up logging. move some of it into MBeans. patch by jbellis; reviewed by Eric Evans for CASSANDRA-130
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771412 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 19:26:23 +00:00
49211d5e92
change Message body to byte[]. this reveals where there are problems: everything that is using any of the send messages already needs to be doing that or they're broken. the good ones I just unwrap; the broken ones I fixed except for MoveMessage which doesn't even have a byte[] serializer yet, so I left that one broken. writeResponseResolver is the specific case that caused the bug report.
...
patch by jbellis; reviewed by nk11 for CASSANDRA-120
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771402 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 19:02:23 +00:00
e044410ccd
r/m DataImporter; it's not useful outside of FB
...
patch by jbellis; reviewed by nk11 for CASSANDRA-120
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771401 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 19:02:05 +00:00
bcf4dcc666
refactor HttpConnection to use its own executor instead of abusing MessagingService. This will let us refactor Message body to a byte[].
...
patch by jbellis; reviewed by nk11 for CASSANDRA-120
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771400 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 19:02:01 +00:00
3bc3e4c335
add constructor to DTPE for most commonly used values (single thread, no timeout, LinkedBlockingQueue)
...
patch by jbellis; reviewed by nk11 for CASSANDRA-120
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771399 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 19:01:56 +00:00
3a4a0595da
use getTempFileName / closeRename to avoid problems w/ half-written sstables.
...
patch by jbellis; reviewed by Eric Evans for CASSANDRA-78
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771340 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 15:59:16 +00:00
f70a5a0c8c
clean up anticompaction code a little.
...
patch by jbellis; reveiewed by Eric Evans for CASSANDRA-78
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771339 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 15:59:12 +00:00
bbe89e795b
do not leave variables uninitialized in ConsistencyManager constructor. fixes regression from #95 . patch by jbellis for CASSANDRA-124
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771325 13f79535-47bb-0310-9956-ffa450edef68
2009-05-04 14:59:51 +00:00
93abe8d3e5
make sendMessage only return true after ack by recipient.
...
patch by Jun Rao; reviewed by jbellis for CASSANDRA-34
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@771019 13f79535-47bb-0310-9956-ffa450edef68
2009-05-03 03:26:07 +00:00
e4e5629b13
make out-of-the-box config 1GB-friendly. patch by jbellis; reviewed by Eric Evans for CASSANDRA-118
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770811 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 20:14:35 +00:00
22525a8e12
make CassandraServer constructor public
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770688 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 14:13:11 +00:00
4a5620dea2
avoid raising an exception in SequenceFile.next when a key does not exist (e.g. when bloom filter gives a false positive). patch by Jun Rao; reviewed by jbellis for CASSANDRA-126
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770517 13f79535-47bb-0310-9956-ffa450edef68
2009-05-01 02:24:10 +00:00
ebcbeb5af9
close FileStructs after range query. patch by jbellis; reviewed by Jun Rao for CASSANDRA-71
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770424 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 20:01:31 +00:00
ec291721dd
add string de/serialize code to TokenFactory for ApplicationState's benefit.
...
patch by jbellis; tested by nk11 and MarkR42 for CASSANDRA-114
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@770307 13f79535-47bb-0310-9956-ffa450edef68
2009-04-30 16:09:38 +00:00
71739ef76a
move src/ to src/java/. patch by johano; reviewed by jbellis for CASSANDRA-112
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@769886 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 19:18:48 +00:00
Jonathan Ellis