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
Eric Evans
48a824d493
use ivy for commons-lang 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@911069 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:44:00 +00:00
Eric Evans
8529d64fd1
use ivy for commons-collections 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@911068 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:43:56 +00:00
Eric Evans
2087f77f39
use ivy for commons-cli; 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@911067 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:43:52 +00:00
Eric Evans
c19f8f2048
use ivy for google-collect; 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@911066 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 16:43:47 +00:00
Eric Evans
38c981efcc
pass args onto main class from cassandra-cli.bat
...
Patch by Mark Wolfe; reviewed by eevans for CASSANDRA-797
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910787 13f79535-47bb-0310-9956-ffa450edef68
2010-02-17 00:32:36 +00:00
Gary Dusbabek
1de70ebc45
merge from 0.5
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910754 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 23:08:32 +00:00
Gary Dusbabek
c65ec11be1
merge from 0.5
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910744 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 22:53:16 +00:00
Eric Evans
5edd6dd836
quiet stderr log output introduced by hadoop-core
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910703 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 21:31:22 +00:00
Jonathan Ellis
f5f81eee70
add range query stress testing. patch by Brandon Williams; reviewed by jbellis for CASSANDRA-765
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910681 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 20:44:56 +00:00
Jonathan Ellis
cc549fbecb
make check for range sanity partitioner-aware. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910679 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 20:39:04 +00:00
Eric Evans
4f0540d077
adapt build.xml to work from binary artifacts
...
Patch by eevans; reviewed by gdusbabek for CASSANDRA-796
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910649 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 18:53:59 +00:00
Jonathan Ellis
5e4c5ce61b
merge from 0.5
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910386 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 03:41:03 +00:00
Jonathan Ellis
9cc51b5f2c
fix range queries and Range/Bounds intersections. patch by jbellis; tested by Jack Culpepper for CASSANDRA-781
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910380 13f79535-47bb-0310-9956-ffa450edef68
2010-02-16 02:47:57 +00:00
Eric Evans
23a1787c02
update windows batch file for accumlated changes
...
* match JVM default opts to shell scripts
* update CassandraDaemon package
Patch by eevans
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910359 13f79535-47bb-0310-9956-ffa450edef68
2010-02-15 22:50:35 +00:00
Jonathan Ellis
128821e5b9
fix SSTableExportTest to work on Windows. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910325 13f79535-47bb-0310-9956-ffa450edef68
2010-02-15 20:06:39 +00:00
Eric Evans
a37fc2c147
better match up arguments from main include
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910245 13f79535-47bb-0310-9956-ffa450edef68
2010-02-15 16:04:36 +00:00
Johan Oskarsson
8b9990ce6a
Remove empty gen-java directory, missed in a previous commit
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@910243 13f79535-47bb-0310-9956-ffa450edef68
2010-02-15 15:59:00 +00:00
Jonathan Ellis
43b86fe61f
sub splits
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-342
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@909631 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 22:02:44 +00:00
Jonathan Ellis
f64fe14270
make predicate configurable
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-342
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@909628 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 21:58:16 +00:00
Jonathan Ellis
1e6ccecd47
add wordcount hadoop example
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-342
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@909626 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 21:55:31 +00:00
Jonathan Ellis
4e163c23bb
add basic hadoop support using Thrift, one split per node
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-342
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@909622 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 21:53:15 +00:00
Jonathan Ellis
2c6948cb0a
expose token-based range queries to thrift
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-775
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@909617 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 21:42:03 +00:00
Gary Dusbabek
ad6ad92e6f
clean up data directories + unit test for CassandraService. Patch by Ran Tavory, reviewed by Gary Dusbabek. CASSANDRA-782
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@909549 13f79535-47bb-0310-9956-ffa450edef68
2010-02-12 18:25:52 +00:00
Jonathan Ellis
a757d547e3
update thrift path. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908832 13f79535-47bb-0310-9956-ffa450edef68
2010-02-11 03:50:52 +00:00
Jonathan Ellis
03da50d62c
mv RecoverManager.doRecovery() -> CommitLog.recover()
...
patch by jbellis; reviewed by junrao for CASSANDRA-783
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908831 13f79535-47bb-0310-9956-ffa450edef68
2010-02-11 03:50:40 +00:00
Jonathan Ellis
fdba4279a0
encapsulate commitlog file operations in CommitLogSegment
...
patch by jbellis; reviewed by junrao for CASSANDRA-783
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908830 13f79535-47bb-0310-9956-ffa450edef68
2010-02-11 03:49:49 +00:00
Eric Evans
fd446ab90b
update circut for Range interface changes
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908731 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 23:02:49 +00:00
Gary Dusbabek
dade352715
jmx interface for tracking streams (incoming and outgoing) and a general operation-mode. Patch by Gary Dusbabek, reviewed by Jonathan Ellis. CASSANDRA-709
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908682 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 22:16:14 +00:00
Jonathan Ellis
ef6f0238ef
finish r/m of -f option. use log4j of WARN,stderr so that doesn't get in the way of redirecting stdout.
...
patch by jbellis; reviewed by eevans for CASSANDRA-766
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908652 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 19:53:56 +00:00
Gary Dusbabek
509d6308c7
initiate boostrapper in current thread. patch by Gary Dusbabek, reviewed by Jonthan Ellis. CASSANDRA-780
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908590 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 17:12:02 +00:00
Jonathan Ellis
2ac485b64c
replace map iteration via keys + value get w/ iteration over entryset. patch by gabriele renzi; reviewed by Stu Hood and jbellis for CASSANDRA-773
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908568 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 16:25:18 +00:00
Jonathan Ellis
e274575bdd
fix timeout bug. patch by jbellis; tested by Jack Culpepper for CASSANDRA-781
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908561 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 16:08:31 +00:00
Jonathan Ellis
04dd326277
merge from 0.5
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908557 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 16:00:19 +00:00
Jonathan Ellis
17bf5d8ef0
merge from 0.5
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908319 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 02:14:47 +00:00
Jonathan Ellis
dfdb54acce
make AbstractBounds serializable for the benefit of JMX
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908236 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 21:31:50 +00:00
Jonathan Ellis
84bfddff34
r/m underscores from CommitLog. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908163 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 19:22:35 +00:00
Jonathan Ellis
2ab1fca35a
replace double-checked locking in CL.open() with initialize on demand holder in CL.instance(). patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908162 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 19:22:12 +00:00
Eric Evans
9f880404c4
match up default options for debian package
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908134 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 17:53:59 +00:00
Jonathan Ellis
1c3c91f9e3
rename switchMemtable to maybeSwitchMemtable to indicate that it will only be switched/flushed once. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908133 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 17:53:48 +00:00
Eric Evans
a7a7a02482
remove redundant -XX:SurvivorRatio option
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908132 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 17:53:46 +00:00
Jonathan Ellis
fbb188f91a
mv commitlog classes into db.commitlog package. patch by jbellis
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908131 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 17:52:44 +00:00
Gary Dusbabek
c8889a7087
Embedded cassandra service to facilitate testing apps that depend on cassandra. Patch by Ran Tavory, reviewed by Gary Dusbabek. CASSANDRA-740.
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908038 13f79535-47bb-0310-9956-ffa450edef68
2010-02-09 14:05:00 +00:00
Gary Dusbabek
58225374f4
improve the concurrency of bootstrapping. Patch by Gary Dusbabek, reviewed by Jonathan Ellis. CASSANDRA-779
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907816 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 21:55:10 +00:00
Jonathan Ellis
027c86a873
s/Constants/constants/ in test_server
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907797 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 21:09:31 +00:00
Gary Dusbabek
75daa13317
Avoid deadlocks by creating all replication strategies when SS in instantiated. Patch by Gary Dusbabek, reviewed by Jonthan Ellis. CASSANDRA-778 (regression introduced in CASSANDRA-620).
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907771 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 19:38:16 +00:00
Jonathan Ellis
424742134d
r/m gen-py, committed accidentally
...
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907710 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 16:02:07 +00:00
Jonathan Ellis
c325fcab72
expose describe_ methods replacing the get_*_property ones. add TokenRange struct for describe_ring.
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-736
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907705 13f79535-47bb-0310-9956-ffa450edef68
2010-02-08 15:57:45 +00:00
Jonathan Ellis
6a72aa1005
iterate ranges rather than endpoints, and sort endpoints by proximity
...
patch by jbellis; reviewed by Stu Hood for CASSANDRA-771
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@907369 13f79535-47bb-0310-9956-ffa450edef68
2010-02-07 02:21:32 +00:00