Jonathan Ellis
8e3952a48d
Migrate rowCache into SSTableTracker and recalculate cache size when sstable collection changes
...
patch by Stu Hood and jbellis for CASSANDRA-801
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916960 13f79535-47bb-0310-9956-ffa450edef68
2010-02-27 15:13:55 +00:00
Jonathan Ellis
197f1ecbfe
Unify key cache per CF under SSTableTracker, hooked in w/ setTrackedBy replacing addFinalizingReference.
...
patch by Stu Hood and jbellis for CASSANDRA-801
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916958 13f79535-47bb-0310-9956-ffa450edef68
2010-02-27 15:10:33 +00:00
Jonathan Ellis
ac7b875bd6
Convert KeysCachedFraction to KeysCached, temporarily breaking things since it gives KeysCached per SSTable not per CF. Also refactors how key cache is instantiated, and removes SSTableAccessor from test suite.
...
patch by Stu Hood and jbellis for CASSANDRA-801
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916957 13f79535-47bb-0310-9956-ffa450edef68
2010-02-27 15:02:48 +00:00
Jonathan Ellis
81555f0ab9
merge r915533 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916955 13f79535-47bb-0310-9956-ffa450edef68
2010-02-27 14:52:40 +00:00
Jonathan Ellis
80abcc2f53
fix bulk loader build. (untested, but compiling is an improvement over not compiling). patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916910 13f79535-47bb-0310-9956-ffa450edef68
2010-02-27 04:59:27 +00:00
Eric Evans
4f8e363bd4
update version string to most current
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916430 13f79535-47bb-0310-9956-ffa450edef68
2010-02-25 20:01:00 +00:00
Eric Evans
f2c795c0eb
update installed jars and scripts in debian packaging
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916428 13f79535-47bb-0310-9956-ffa450edef68
2010-02-25 20:00:56 +00:00
Eric Evans
efb53a62aa
use correct daemon class name in debian init script
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916427 13f79535-47bb-0310-9956-ffa450edef68
2010-02-25 20:00:52 +00:00
Jonathan Ellis
07b9f04e96
increase default timeout to 10s. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916310 13f79535-47bb-0310-9956-ffa450edef68
2010-02-25 15:07:14 +00:00
Jonathan Ellis
2c848710ac
null check wasn't redundant after all. patch by gabriele renzi; reviewed by jbellis for CASSNDRA-828
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916008 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 22:33:02 +00:00
Jonathan Ellis
b85a7262d7
r/m redundant null check. patch by gabriele renzi; reviewed by jbellis for CASSANDRA-828
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916006 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 22:27:48 +00:00
Jonathan Ellis
6df320c2e4
use getToken instead of decorateKey.token. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@916002 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 22:19:33 +00:00
Eric Evans
ef5f7bd019
new rat-write target to add missing license headers
...
Patch by eevans for CASSANDRA-831
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915952 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 19:53:02 +00:00
Eric Evans
4b0a0f84ba
generate rat reports for release artifacts
...
Patch by eevans for CASSANDRA-831
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915951 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 19:52:58 +00:00
Eric Evans
ca47f33b26
optional RAT target for ant
...
This target runs RAT against the source tree and fails if any unknown
licenses are discovered, (it can be tuned for false positives by placing
patterns in the .rat-excludes). A report is generated under build/.
Patch by eevans; reviewed by jbellis for CASSANDRA-831
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915950 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 19:52:55 +00:00
Eric Evans
aeec97cc30
CASSANDRA-831 reorganize ivy dependencies into configs
...
Patch by eevans; reviewed by jbellis for CASSANDRA-831
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915949 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 19:52:50 +00:00
Eric Evans
6b33119639
cassandra-cli: friendlier error messages
...
* Print a useful error message (instead of an assertion error) when
column name is ommitted on set.
* Trap InvalidRequestExceptions and print the "why" string (which tends
to be quite informative).
Patch by eevans; reviewed by jbellis for CASSANDRA-738
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915856 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 16:37:14 +00:00
Gary Dusbabek
05b7b074fc
update CHANGES.txt. should have been in r915824
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915831 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 15:40:05 +00:00
Gary Dusbabek
88f6052ae0
general clean up of the batch file that launches cassandra on windows. Patch by Mark Wolfe, reviewed by Gary Dusbabek. CASSANDRA-824
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915824 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 15:33:59 +00:00
Eric Evans
5bb84e9293
less confusing handling of errors/exceptions
...
* replaces some printed exceptions with human readable error messages,
while re-enabling the printed exceptions if --debug is passed.
* pull cluster name property on connect or startup, and output, (this
also forces any connection errors to occur sooner).
Patch by Mark Wolfe; reviewed by eevans for CASSANDRA-807
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915622 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 00:42:17 +00:00
Eric Evans
f3bf9468dc
update debian packaging changelog
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915597 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 23:56:05 +00:00
Jonathan Ellis
3bdae0fa45
update NEWS w/ per-keyspace RF and CL.ANY
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915591 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 23:38:39 +00:00
Jonathan Ellis
715121a587
make InetAddress volatile. patch by gabriele renzi; reviewed by jbellis for CASSANDRA-828
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915580 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 23:15:38 +00:00
Jonathan Ellis
3a60408707
fix average compaction bucket size calculation. patch by jbellis; reviewed by Stu Hood for CASSANDRA-814
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915565 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 22:46:27 +00:00
Jonathan Ellis
3a96410cd9
rename CM.getCompactionBuckets -> CM.getBuckets. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915563 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 22:40:57 +00:00
Eric Evans
dc1a3898d8
exclude avro generated source from release artifacts
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915464 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 18:18:57 +00:00
Eric Evans
9085a638de
updated for licensing information (RAT automated)
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915463 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 18:13:07 +00:00
Jonathan Ellis
dd74bd4d42
merge from 0.5
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915441 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 17:12:21 +00:00
Eric Evans
6c253ceeef
remove incubating suffix from debian packaging
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915432 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 17:01:21 +00:00
Eric Evans
7630f387c2
drop incubator suffix. \o/
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915427 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 16:54:27 +00:00
Eric Evans
bf45ae304d
add licensing text to generated files
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915426 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 16:48:59 +00:00
Eric Evans
d591667c8b
update version for upcoming release
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915425 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 16:48:24 +00:00
Johan Oskarsson
12cb7efc36
Expose the Hadoop input split size to the user. Patch by johan, review by jbellis. CASSANDRA-823
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915364 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 14:57:27 +00:00
Johan Oskarsson
580c158602
Added interface/avro to svn:ignore
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915362 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 14:56:34 +00:00
Jonathan Ellis
dbfbaabc24
update NEWS
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@915090 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 22:15:12 +00:00
Johan Oskarsson
c99030c627
Fix bug where ivy downloaded jar files were not included. Patch by johan, review by jbellis. CASSANDRA-816
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@912671 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 17:27:40 +00:00
Johan Oskarsson
bbd597bc3f
Fix bug to allow distributed Hadoop jobs. Patch by johan, review by jbellis. CASSANDRA-817
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@912669 13f79535-47bb-0310-9956-ffa450edef68
2010-02-22 17:22:44 +00:00
Gary Dusbabek
19670f0165
merge 911841 from trunk (removes JVM debugger commands from cassandra.in.sh).
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@911853 13f79535-47bb-0310-9956-ffa450edef68
2010-02-19 16:05:32 +00:00
Eric Evans
bb3a8fdcb8
update release note for Ivy related changes
...
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@911597 13f79535-47bb-0310-9956-ffa450edef68
2010-02-18 21:31:15 +00:00
Jonathan Ellis
4b6cad5528
fix NPE in DatacenterShardStrategy. patch by vijay; reviewed by jbellis for CASSANDRA-787
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@911546 13f79535-47bb-0310-9956-ffa450edef68
2010-02-18 20:06:31 +00:00
Jonathan Ellis
baf357875e
branch 0.6
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/branches/cassandra-0.6@911237 13f79535-47bb-0310-9956-ffa450edef68
2010-02-18 00:35:15 +00:00
Jonathan Ellis
7b8542c8ba
refactor to make memtablesPendingFlush a member variable instead of a static, and Memtable to have a reference to CFS instead of table/cfname pair.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-799
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911224 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 23:22:41 +00:00
Jonathan Ellis
b55b26d790
use a sorted map for memtable contents to make range queries not have to sort every time
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-799
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911223 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 23:22:23 +00:00
Jonathan Ellis
a4e9b14d21
refactor IFlushable contract to push differences b/t Mt and BMT into their respective classes
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-799
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911222 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 23:21:57 +00:00
Gary Dusbabek
b511d0f1b0
Using realy keyspaces in tests so that their replication strategies can be queried. Patch by Gary Dusbabek, reviewed by Stu Hood.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911178 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 21:16:52 +00:00
Jonathan Ellis
41635b2646
use while loop instead of recursion when trimming sstables compaction list to avoid blowing stack in pathological cases.
...
patch by jbellis; reviewed by gdusbabe for CASSANDRA-804
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911074 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:59:18 +00:00
Eric Evans
7a451e5226
use ivy for junit and remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911073 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:44:19 +00:00
Eric Evans
5778a00d4c
use ivy for json-simple and remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911072 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:44:14 +00:00
Eric Evans
da3dc00d7e
use ivy for slf4j and remove local jars
...
Note, slf4j-log4j12 depends on log4j (a slightly older version), so
that jar was removed as well.
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911071 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:44:09 +00:00
Eric Evans
1c7697cbde
use ivy for jline and remove local copy
...
Patch by eevans; reviewed by Mark Wolfe for CASSANDRA-802
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@911070 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:44:05 +00:00