Commit Graph

108 Commits

Author SHA1 Message Date
Vijay Parthasarathy ac362dadd3 Merge branch 'cassandra-1.1' into trunk 2012-05-21 13:57:21 -07:00
Vijay Parthasarathy 02672936f6 update clhm to 1.3
patch by Vijay; reviewed by jbellis for CASSANDRA-4150
2012-05-21 13:56:17 -07:00
Jonathan Ellis d94314a143 Merge branch 'cassandra-1.1' into trunk 2012-04-24 13:12:19 -05:00
Sylvain Lebresne 7e8ee1539c Update versions and licence in preparation for 1.1.0 release 2012-04-24 13:11:29 -05:00
Pavel Yaskevich 9bdacf7df1 (CLI) jline version is bumped to 1.0 to properly support 'delete' key function
patch by Dave Brosius; reviewed by Pavel Yaskevich for CASSANDRA-4132
2012-04-10 00:38:52 +03:00
paul cannon b2de5f176c python-cql update to 1.0.10 2012-04-06 10:37:09 -05:00
Stephen Connolly 0a969449fb Add snaptree dependency to pom (and fix yammer metrics dependency)
patch by stephenc; reviewed by slebresne for CASSANDRA-3676
2012-04-03 17:35:24 +02:00
Peter Schuller 154daa03a6 expose counters for unavailable/timeout exceptions given to thrift clients
patch by scode; reviewed by driftx, eevans for CASSANDRA-3671
2012-03-05 22:03:32 -08:00
paul cannon 44406f1da8 add arch-indep thrift python bindings to lib/ 2012-01-29 19:01:25 -06:00
paul cannon 944e375c99 add python-cql zip to lib/ 2012-01-29 19:01:25 -06:00
T Jake Luciani 7c8c57041b Upgrade Thrift to 0.7.0
Patch by jfarrell; reviewed by tjake for CASSANDRA-3213
2012-01-10 15:46:22 -05:00
Jonathan Ellis bad90afc6f add row-level isolation via SnapTree
patch by slebresne; reviewed by jbellis for CASSANDRA-2893

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1225001 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 20:17:17 +00:00
Jonathan Ellis 0a5ac3d2de upgrade Jackson to 1.9.2
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1211984 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 17:07:28 +00:00
Sylvain Lebresne 514fe0509f merge from 1.0
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1198852 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 18:17:16 +00:00
Sylvain Lebresne 3c4f0404ad Remove old jamm jar and update cassandra.bat
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0.0@1171538 13f79535-47bb-0310-9956-ffa450edef68
2011-09-16 13:15:38 +00:00
Jonathan Ellis a23eea5f87 add jamm-0.2.5.jar
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0.0@1170947 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 04:00:33 +00:00
Pavel Yaskevich 8eb0a93893 Streams Compression
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-3015

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1164689 13f79535-47bb-0310-9956-ffa450edef68
2011-09-02 20:23:42 +00:00
Jonathan Ellis b95a49c5f9 Arena allocation for memtables
patch by jbellis and stuhood for CASSANDRA-2252

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1158927 13f79535-47bb-0310-9956-ffa450edef68
2011-08-17 21:52:41 +00:00
Sylvain Lebresne 1ecabe6842 Add optional compression for sstables
patch by xedin; reviewed by slebresne for CASSANDRA-47


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1153210 13f79535-47bb-0310-9956-ffa450edef68
2011-08-02 17:28:55 +00:00
Jonathan Ellis 35d9347bcc add missing src/java/org/apache/cassandra/utils/MergeIterator.java
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136514 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16 16:10:09 +00:00
Jonathan Ellis 54f2d0b123 upgrade to CLHM 1.2
patch by jbellis for CASSANDRA-2681

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1127559 13f79535-47bb-0310-9956-ffa450edef68
2011-05-25 15:33:23 +00:00
Jonathan Ellis b111610fac merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1097473 13f79535-47bb-0310-9956-ffa450edef68
2011-04-28 14:20:59 +00:00
Gary Dusbabek 8a6feefe8f merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1092687 13f79535-47bb-0310-9956-ffa450edef68
2011-04-15 12:48:15 +00:00
Jonathan Ellis 58307994b5 merge from 0.8
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1091784 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13 13:59:39 +00:00
Gary Dusbabek b03c685668 upgrade thrift jar to 0.6.0. patch by gdusbabek, reviewed by tjake. CASSANDRA-2412
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090074 13f79535-47bb-0310-9956-ffa450edef68
2011-04-08 00:47:18 +00:00
Jonathan Ellis f4b3c01dff add a server-wide cap on memtable memory usage
patch by jbellis; reviewed by Stu Hood for CASSANDRA-2006

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1090064 13f79535-47bb-0310-9956-ffa450edef68
2011-04-07 23:49:06 +00:00
Jonathan Ellis 88020c432f upgrade to high scale lib 1.1.2
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089534 13f79535-47bb-0310-9956-ffa450edef68
2011-04-06 16:56:12 +00:00
Jonathan Ellis 6d2f24cd63 Revert prematurely-committed "add a server-wide cap on memtable memory usage"
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089526 13f79535-47bb-0310-9956-ffa450edef68
2011-04-06 16:33:35 +00:00
Jonathan Ellis a287f42ceb add a server-wide cap on memtable memory usage
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1089521 13f79535-47bb-0310-9956-ffa450edef68
2011-04-06 16:21:17 +00:00
Jonathan Ellis e8bfce0a72 upgrade to guava r08
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1070936 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15 15:29:23 +00:00
Eric Evans c430b1d4aa remove JUG jar and license files
Patch by eevans for CASSANDRA-2067

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1065081 13f79535-47bb-0310-9956-ffa450edef68
2011-01-29 17:26:04 +00:00
Jonathan Ellis 48a1547196 r/m jetty
patch by Nate McCall; reviewed by stuhood for CASSANDRA-2050

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1064183 13f79535-47bb-0310-9956-ffa450edef68
2011-01-27 16:24:07 +00:00
Jonathan Ellis 40a48c27cc add back jetty jars until trunk
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1064178 13f79535-47bb-0310-9956-ffa450edef68
2011-01-27 16:18:52 +00:00
Jonathan Ellis e8151edc28 remove jetty dependency
patch by Nate McCall; reveiewed by stuhood for CASSANDRA-2050

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1064170 13f79535-47bb-0310-9956-ffa450edef68
2011-01-27 16:06:12 +00:00
Eric Evans aebfc9ccb2 merge w/ 0.7 branch
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1055626 13f79535-47bb-0310-9956-ffa450edef68
2011-01-05 20:36:35 +00:00
Eric Evans a67d395638 replace high-scale-lib.jar from maven central
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1055623 13f79535-47bb-0310-9956-ffa450edef68
2011-01-05 20:27:58 +00:00
Eric Evans bb1f6cbe18 merge w/ 7 branch
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1054809 13f79535-47bb-0310-9956-ffa450edef68
2011-01-03 22:23:07 +00:00
Eric Evans dd6ba16450 update lib/quava-r05.jar from maven central
Patch by Stephen Connolly; reviewed by eevans for CASSANDRA-1897

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1054805 13f79535-47bb-0310-9956-ffa450edef68
2011-01-03 22:21:31 +00:00
Jonathan Ellis 727196fa02 merge from 0.7
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1034096 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 20:06:14 +00:00
Jonathan Ellis 6879422aae upgrade to ConcurrentLinkedHashMap 1.1
patch by mdennis; reviewed by jbellis for CASSANDRA-975

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1032815 13f79535-47bb-0310-9956-ffa450edef68
2010-11-09 02:17:44 +00:00
Eric Evans 52dbb877ea misc (de)bug rollup
* propagate parse exceptions as avro InvalidRequestExceptions
* use more reasonable defaults for col and row limits (else OOM)
* working range query system test
* actually set column timestamp in return results
* validate keys in UPDATE
* process row mutations exactly once
* javadoc cleanup / updates
* explicitly disabled nagle in python driver
* query logging is brutal, move to trace
* upgrade jetty to 6.1.24

Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1029368 13f79535-47bb-0310-9956-ffa450edef68
2010-10-31 14:37:56 +00:00
Eric Evans 649acdd367 upgrade antlr jar to 3.2
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1029359 13f79535-47bb-0310-9956-ffa450edef68
2010-10-31 14:36:44 +00:00
Jonathan Ellis e94195b524 upgrade to slf4j 1.6.1. patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1028458 13f79535-47bb-0310-9956-ffa450edef68
2010-10-28 20:18:06 +00:00
Jonathan Ellis 187761a322 upgrade to Thrift 0.5
patch by Jake Luciani; reviewed by jbellis for CASSANDRA-1367

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1026201 13f79535-47bb-0310-9956-ffa450edef68
2010-10-22 03:23:51 +00:00
Gary Dusbabek f7f5877481 use avro includes and aliases in order to have less duplicated structures. patch by stuhood, reviewed by gdusbabek. CASSANDRA-1436
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1004678 13f79535-47bb-0310-9956-ffa450edef68
2010-10-05 15:43:41 +00:00
Jonathan Ellis 53ea7efe97 Switch to Cloudera`s Distribution of Hadoop for binary Streaming support. patch by Stu Hood; reviewed by jbellis for CASSANDRA-1368
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@992473 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 21:19:19 +00:00
Eric Evans 43d0f6de39 upgrade avro to formal release candidate (v4)
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@992346 13f79535-47bb-0310-9956-ffa450edef68
2010-09-03 16:00:18 +00:00
Eric Evans 47069290ec upgrade to avro 1.4.0 rc3
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@991544 13f79535-47bb-0310-9956-ffa450edef68
2010-09-01 14:01:11 +00:00
Eric Evans f93ebf4fa0 upgrade avro to 1.4.0 devel snapshot
* upgraded jars
* replace some use of Utf8 for java.lang.CharSequence
* actually start http server by invoking start()

Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@987199 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 15:50:42 +00:00
Jonathan Ellis 43383be219 revert switch to yamlbeans. patch by jbellis; reviewed by Jon Hermes for CASSANDRA-1394
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@986039 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 16:49:37 +00:00