Commit Graph

497 Commits

Author SHA1 Message Date
Robert Stupp 511129ddbd Accept Java source code for user-defined functions
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7562
2014-09-03 14:37:15 -05:00
Jason Brown 936dea8952 Merge branch 'cassandra-2.1' into trunk
Conflicts:
	CHANGES.txt
2014-09-03 10:48:50 -07:00
Jason Brown cae8715750 Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
	CHANGES.txt
	build.xml
	lib/thrift-server-0.3.5.jar
	lib/thrift-server-0.3.6.jar
2014-09-03 10:45:52 -07:00
Pavel Yaskevich b22089d7c8 Make disruptor_thrift_server invocation pool configurable
patch by Pavel Yaskevich; reviewed by Jason Brown for CASSANDRA-7594
2014-09-02 16:14:27 -07:00
Aleksey Yeschenko 78142080dd Merge branch 'cassandra-2.1' into trunk 2014-08-12 17:45:22 +03:00
Tyler Hobbs 0471f40648 (cqlsh) Fix DESCRIBE for NTS keyspaces
patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7729
2014-08-12 17:40:50 +03:00
Tyler Hobbs 049adcd831 Merge branch 'cassandra-2.1' into trunk 2014-08-01 18:10:21 -05:00
Tyler Hobbs fe78e81496 cqlsh: Upgrade bundled py driver to fix nulls in UDTS and tuples
Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7656
2014-08-01 18:08:19 -05:00
Tyler Hobbs 14826794c3 Merge branch 'cassandra-2.1' into trunk 2014-07-16 11:57:48 -05:00
Tyler Hobbs 88e05719b6 Update cqlsh python driver to 2.1
Patch by Mikhail Stepura and Tyler Hobbs; reviewed by Aleksey Yeschenko
for CASSANDRA-7509
2014-07-16 11:56:29 -05:00
Jonathan Ellis 36640fcac9 Merge branch 'cassandra-2.1' into trunk 2014-06-30 21:13:17 -07:00
Jonathan Ellis c23eccf3c6 Upgrade to snappy-java 1.0.5.2 2014-06-30 21:12:46 -07:00
Brandon Williams 1e819233f6 Merge branch 'cassandra-2.1' into trunk 2014-06-18 14:31:17 -05:00
Brandon Williams cf9b8c998f Upgrade to snappy 1.0.5.1
Patch by Iheanyi Ekechukwu, reviewed by brandonwilliams for
CASSANDRA-7381
2014-06-18 14:30:28 -05:00
Jake Luciani 805a4aeebe Merge branch 'cassandra-2.1' into trunk 2014-06-17 15:09:31 -04:00
Jake Luciani a3dc7b8b41 Upgrade netty to 4.0.20 2014-06-17 15:09:03 -04:00
Dave Brosius 43292388e2 Merge branch 'cassandra-2.1' into trunk 2014-06-05 23:31:46 -04:00
Dave Brosius 9b536eca9d update netty-all license 2014-06-05 23:30:59 -04:00
Jake Luciani 8a91a1a59e Merge branch 'cassandra-2.1' into trunk
Conflicts:
	src/java/org/apache/cassandra/transport/CBUtil.java
2014-06-05 14:22:19 -04:00
Jake Luciani 4722fe70aa RefCount native frames from netty to avoid corruption bugs
patch by tjake; reviewed by bes for CASSANDRA-7245
2014-06-05 14:15:32 -04:00
Mikhail Stepura c6eaffc2a1 Merge branch 'cassandra-2.1' into trunk 2014-05-21 13:28:48 -07:00
Mikhail Stepura a3effe6698 Support new UDT serialization format for CQLSH
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7261
2014-05-21 13:27:55 -07:00
Mikhail Stepura c2cfefc507 Merge branch 'cassandra-2.1' into trunk 2014-05-19 14:34:04 -07:00
Mikhail Stepura 0f706c528e Ninja: thrift-server-0.3.5.jar for CASSANDRA-6285 2014-05-19 14:33:19 -07:00
Mikhail Stepura f760e1f8b3 Merge branch 'cassandra-2.1' into trunk 2014-05-19 14:03:43 -07:00
Mikhail Stepura 98696714fb Ninja: removed old cassandra-dbapi licenses. Added new one for ptyhon-driver 2014-05-19 14:02:53 -07:00
Jake Luciani 4b8f667d04 Merge branch 'cassandra-2.1' into trunk 2014-05-14 09:06:34 -04:00
Jake Luciani 4ee372106f Followup commit to fix maven deps on boundary's NBHM for CASSANDRA-7128 2014-05-14 09:02:45 -04:00
T Jake Luciani 5c66dc819b Merge branch 'cassandra-2.1' into trunk 2014-05-05 17:13:08 -04:00
T Jake Luciani f0575f153b high-scale-lib upgrade
Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-7128
2014-05-05 16:37:22 -04:00
Dave Brosius a44ba68cf8 Merge branch 'cassandra-2.1' into trunk 2014-05-02 23:35:05 -04:00
Dave Brosius 9432870658 add license for commons-math3.3.2 2014-05-02 23:34:33 -04:00
Dave Brosius 5c2f89a0e9 Merge branch 'cassandra-2.1' into trunk 2014-05-02 23:08:30 -04:00
Dave Brosius 6708d05ec5 netty >= version 4.0 now has an artifact name of netty-all 2014-05-02 23:07:34 -04:00
Dave Brosius b6974fb94b Merge branch 'cassandra-2.1' into trunk 2014-05-02 22:54:26 -04:00
Dave Brosius df62c62617 fix logback version string typo: 1.1.12 s/b 1.1.2 2014-05-02 22:52:11 -04:00
Mikhail Stepura f0def34125 Merge branch 'cassandra-2.1' into trunk 2014-05-01 15:21:32 -07:00
Mikhail Stepura 31cd61387e Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-01 15:21:22 -07:00
Mikhail Stepura 26633caa9c Patched version of Disruptor Thrift Server
patch by Mikhail Stepura; reviewed by Brandon Williams for CASSANDRA-6545
2014-05-01 15:03:24 -07:00
Dave Brosius 4d0691759a Allow cassandra to compile under java 8
patch by dbrosius reviewed by jmckenzie for cassandra-7028
2014-04-15 20:38:32 -04:00
Dave Brosius f3d8ecf84c update logback to version 1.1.2 2014-04-02 20:53:58 -04:00
belliottsmith cbf304ebd0 Update native server to Netty 4
patch by benedict; reviewed by slebresne for CASSANDRA-6236
2014-03-20 18:23:53 +01:00
Mikhail Stepura a2ceb22c59 Python-driver without a hard dependency on `scales` 2014-03-13 11:07:09 -07:00
Mikhail Stepura caf609cf6f Switch cqlsh from cassandra-dbapi2 to python-driver
patch by Mikhail Stepura for CASSANDRA-6307; reviewed by Aleksey Yeschenko and Tyler Hobbs
2014-03-12 15:02:14 -07:00
Jonathan Ellis f628bd8a4d Merge branch 'cassandra-2.0' into cassandra-2.1 2014-02-18 11:22:24 -06:00
Jonathan Ellis 500c62d6b9 Allow per-dc enabling of hints
patch by Sankalp Kohli; reviewed by Lyuben Todorov for CASSANDRA-6157
2014-02-18 11:21:13 -06:00
Sylvain Lebresne 1828b929c2 Remove now unused depency on snaptree 2014-02-17 17:23:04 +01:00
Jonathan Ellis ee020c9446 Revert 6157 until we can commit to 2.0 and merge forwards
This reverts commit f64b31c426.
2014-02-15 11:38:51 -06:00
Jonathan Ellis f64b31c426 wip 2014-02-15 10:18:12 -06:00
Mikhail Stepura 88bef0cbf3 Switched to Guava 16.0 for CASSANDRA-6639 2014-02-06 20:22:28 -08:00
Yuki Morishita 0f83a8610b update stream-lib for HLL++ serialization thread-safety 2014-02-05 20:44:20 -06:00
Jonathan Ellis 4b54b8acd2 remove Table.switchlock and introduce o.a.c.utils.memory package
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-5549
2014-01-30 17:09:18 -06:00
Jonathan Ellis 2ba394676d bundle jna 4.0
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5872
2014-01-28 16:41:33 -06:00
Jonathan Ellis 4edfe4ee78 add airline and javax.inject jars 2014-01-11 18:56:59 -06:00
Pavel Yaskevich 25d2893dd0 Merge branch 'cassandra-2.0' into trunk 2014-01-10 17:25:40 -08:00
Pavel Yaskevich c543215918 update thrift-server to version 0.3.3 to fix CASSANDRA-6373 and CASSANDRA-6407 2014-01-10 17:20:22 -08:00
belliottsmith 2e1e98ad04 Improve Stress Tool
patch by Benedict; reviewed by Pavel Yaskevich for CASSANDRA-6199
2013-12-23 18:05:43 -08:00
Yuki Morishita 642ce366d9 Add cardinality estimator for key count estimation
patch by yukim; reviewed by jbellis for CASSANDRA-5906
2013-12-20 14:14:46 -06:00
Dave Brosius 460fc03ee1 Merge branch 'cassandra-2.0' into trunk 2013-10-23 21:32:03 -04:00
Dave Brosius 3cf18d71dc update lz4 license to 1.2.0 2013-10-23 21:25:26 -04:00
Sylvain Lebresne 9bf5b45d88 Merge branch 'cassandra-2.0' into trunk
Conflicts:
	build.xml
	lib/lz4-1.1.2.jar
2013-10-23 11:25:12 +02:00
Sylvain Lebresne 93da683e0c Update LZ4 lib to 1.2.0 2013-10-23 11:20:23 +02:00
Brandon Williams 3017dd34f7 Merge branch 'cassandra-2.0' into trunk 2013-10-18 10:08:45 -05:00
Brandon Williams 718e3ec8b7 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-10-18 10:08:37 -05:00
Brandon Williams 300f153a71 match internal only filename to internal directory version 2013-10-18 10:08:25 -05:00
Jason Brown 231b345ffd Merge branch 'cassandra-2.0' into trunk 2013-10-17 14:09:45 -07:00
Jason Brown 20d91b0ba9 add update cql-internal-only zip 2013-10-17 14:06:29 -07:00
Jason Brown 5c0c84b3d1 implementing CL.LOCAL_ONE 2013-10-17 13:37:12 -07:00
Jonathan Ellis 023589bf30 Merge branch 'cassandra-2.0' into trunk 2013-10-01 14:25:57 -05:00
Jonathan Ellis 32c3f44a68 Add configurable metrics reporting
patch by Chris Burroughs; reviewed by Tyler Hobbs for CASSANDRA-4430
2013-10-01 14:25:42 -05:00
Jonathan Ellis 681312393b merge from 2.0 2013-09-19 16:54:26 -05:00
Pavel Yaskevich b4bc50e44d bump Distruptor Thrift Server version to 0.3.2 2013-09-19 14:08:38 -07:00
Jonathan Ellis b95fd08187 upgrade to CLHM 1.4
patch by jbellis for CASSANDRA-5821
2013-09-17 15:52:19 -05:00
Aleksey Yeschenko d57ce28450 Merge branch 'cassandra-2.0' into trunk 2013-09-12 18:45:34 +03:00
Aleksey Yeschenko 53f19c8495 Update guava to 15.0 2013-09-12 18:44:27 +03:00
Sylvain Lebresne 5ea3b15384 Merge branch 'cassandra-2.0' into trunk
Conflicts:
	lib/licenses/slf4j-log4j12-1.7.2.txt
2013-09-03 16:38:09 +02:00
Sylvain Lebresne a3534910e1 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-03 16:36:32 +02:00
Sylvain Lebresne 8c33e72e1f License filename renaming 2013-09-03 16:36:19 +02:00
Sylvain Lebresne 14e7895e59 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-09-03 16:35:27 +02:00
Sylvain Lebresne c7a835d1f4 Add back updated licenses 2013-09-03 16:30:10 +02:00
Sylvain Lebresne 4ca9217a2b Merge tag 'cassandra-2.0.0' into cassandra-2.0
Apache Cassandra 2.0.0 release
2013-09-03 16:28:57 +02:00
Sylvain Lebresne 196038b73e Update netty dependency to 3.6.6 2013-09-02 18:00:27 +02:00
Jonathan Ellis ca037b08e8 Merge branch 'cassandra-2.0' into trunk 2013-08-30 13:55:47 -05:00
Jonathan Ellis 583d98b475 rename license file 2013-08-30 13:55:45 -05:00
Jonathan Ellis 2be4241380 merge from 1.2 2013-08-30 13:55:06 -05:00
Jonathan Ellis de1a91fe5e Upgrade metrics-core to version 2.2.0
patch by jbellis for CASSANDRA-5947
2013-08-30 13:50:12 -05:00
Jonathan Ellis 3205e5dbbc Revert CASSANDRA-5838 2013-08-30 13:35:16 -05:00
Marcus Eriksson 14da6bca01 Switch to LZ4 compression for internode communication.
Patch by marcuse, reviewed by jbellis for CASSANDRA-5887.
2013-08-30 09:30:14 +02:00
Aleksey Yeschenko 84dfa06475 Merge branch 'cassandra-2.0' into trunk 2013-08-30 03:49:21 +03:00
Aleksey Yeschenko d6be037b37 Fix licenses 2013-08-30 03:48:45 +03:00
Aleksey Yeschenko 5b5d41d4b8 Merge branch 'cassandra-2.0' into trunk
Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
	tools/stress/src/org/apache/cassandra/stress/Session.java
	tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
2013-08-30 03:03:29 +03:00
Aleksey Yeschenko bffd9ea8eb Upgrade Thrift to 0.9.1
patch by Carl Yeksigian and Jake Farrell; reviewed by Aleksey Yeschenko
for CASSANDRA-5923
2013-08-30 02:57:12 +03:00
Sylvain Lebresne 03045ca22b Update versions for 2.0 final release 2013-08-28 13:37:31 +02:00
Dave Brosius 5e33b9b039 remove servlet-api and license, unused since avro removal 2013-08-21 22:17:00 -04:00
Dave Brosius 6f114c9318 Merge branch 'cassandra-2.0' into trunk 2013-08-21 21:53:01 -04:00
Dave Brosius 372af0854f Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 21:50:30 -04:00
Dave Brosius 4bc8c895db remove licenses for jars not used 2013-08-21 21:49:34 -04:00
Yuki Morishita 72a702a3d4 Merge branch 'cassandra-1.2' into cassandra-2.0.0 2013-08-21 15:41:05 -05:00
Yuki Morishita 0db3413548 add metrics-core license 2013-08-21 15:40:26 -05:00
Jonathan Ellis fa0b7cf8b2 add logback-classic jar 2013-08-15 11:41:54 -05:00
Dave Brosius 29605aedd9 switch logging from log4j to logback
patch by dbrosius reviewed by jbellis for cassandra-5883
2013-08-15 06:54:37 -04:00
Dave Brosius 4a34a20867 add license for metrics-core 2013-08-11 15:49:22 -04:00
Dave Brosius c27a161920 update metrics-core to 3.0.1
patch by dbrosius reviewed by jbellis for cassandra-5838
2013-08-10 10:34:07 -04:00
Pavel Yaskevich 7a8cbb3ea7 add thrift-server and LMAX Disruptor licences 2013-08-08 11:30:02 -07:00
Pavel Yaskevich 19767fcd17 fix HsHa to respect max frame size
patch by Pavel Yaskevich; reviewed by Tyler Hobbs (CASSANDRA-4573)
2013-08-06 15:20:48 -07:00
Pavel Yaskevich cf96baa6dd bump thrift-server version to 0.2.1 2013-07-18 12:24:03 -07:00
Jason Brown 47ac42fdbb Expire entries out of ThriftSessionManager (round two, for THsHaDisruptorServer on trunk)
patch by jasobrown; reviewed by jbellis for CASSANDRA-5719
2013-07-10 07:00:15 -07:00
Pavel Yaskevich 98eec0a223 Replace Thrift HsHa with LMAX Disruptor based implementation
patch by Pavel Yaskevich; reviewed by Aleksey Yeschenko for CASSANDRA-5582
2013-06-07 15:36:48 -07:00
Aleksey Yeschenko 6f5d8a56fc Ninja-kill what's left from avro 2013-05-31 04:05:07 +03:00
Yuki Morishita 8b410078a4 Merge branch 'cassandra-1.2' into trunk 2013-05-17 10:29:10 -05:00
Yuki Morishita b69c1aa4cc snappy-java upgrade to 1.0.5 2013-05-17 10:27:25 -05:00
Jonathan Ellis 3cb11519ae upgrade to snakeyaml 1.11 2013-03-22 23:28:56 -05:00
Aleksey Yeschenko e5a04918b2 Merge branch 'cassandra-1.2' into trunk 2013-03-07 19:58:16 +03:00
Aleksey Yeschenko c3d75e4a79 Merge branch 'cassandra-1.1' into cassandra-1.2 2013-03-07 19:57:28 +03:00
Aleksey Yeschenko ea08e01a09 cqlsh: Add inet type support on Windows (ipv4-only)
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-4801
2013-03-07 19:54:48 +03:00
Aleksey Yeschenko 36f632c9eb Merge branch 'cassandra-1.2' into trunk 2013-02-15 01:27:36 +03:00
Aleksey Yeschenko 0b83682b40 Add CQL3-based implementations of IAuthenticator and IAuthorizer
Patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-4898
2013-02-15 01:26:10 +03:00
Jonathan Ellis aa7c7d9cd7 Add support for LZ4 compression
patch by Adrien Grand; reviewed by tjake for CASSANDRA-5038
2013-02-12 12:25:32 -06:00
Jonathan Ellis c3f9ee7d91 Add support for LZ4 compression
patch by Adrien Grand; reviewed by tjake for CASSANDRA-5038
2013-02-11 13:47:56 -06:00
Jake Luciani b153d45644 Upgrade thrift version to 0.9.0
Patch by jfarrell; reviewed by tjake for CASSANDRA-3719
2013-01-14 15:14:04 -05:00
Aleksey Yeschenko 7cfdb14efb cqlsh: improve COPY FROM performance; Patch by Aleksey Yeschenko,
reviewed by Brandon Williams for CASSANDRA-4921
2012-11-19 22:08:43 +03:00
Sylvain Lebresne 03f8fec8c4 Update slf4j to a modern version 2012-11-09 16:48:31 +01:00
Sylvain Lebresne 7aee6602d6 Update to last stable netty release 2012-10-30 15:46:37 +01:00
Brandon Williams f8129b4356 cqlsh: support moving CL to the protocol level
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4823
2012-10-19 14:11:53 -05:00
Jonathan Ellis f0fcc4cd87 Revert "cqlsh: add thrift transport factory"
This reverts commit 3f31642c39.
2012-10-09 09:35:45 -05:00
Brandon Williams 3f31642c39 cqlsh: add thrift transport factory
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4610
2012-10-04 10:08:35 -05:00
Brandon Williams 1c2922c223 cqlsh: add thrift transport factory imeplementation
Patch by Aleksey Yeschenko, reviewed brandonwilliams
2012-10-04 10:04:43 -05:00
Sylvain Lebresne 60bf68caa9 Update version, licenses, etc... for 1.2.0-beta1 release 2012-09-18 18:01:22 +02:00
Brandon Williams 75c4cfa5c5 cqlsh: support inet data type
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4627
2012-09-13 14:15:33 -05:00
Jonathan Ellis a85b57770e update guava to r13 2012-09-07 16:18:21 -05:00
Brandon Williams 94b3d26018 rm old cql lib 2012-09-01 11:51:11 -05:00
Brandon Williams bd27527211 cqlsh: update encoding for collections
Patch by paul cannon reviewed by brandonwilliams for CASSANDRA-4500
2012-08-31 07:42:31 -05:00
Dave Brosius 1dadaa708a fix extension 2012-07-19 22:06:25 -04:00
Dave Brosius 82e6edd95b update versions on license files 2012-07-19 22:00:21 -04:00
Sylvain Lebresne 6399c94e48 Fix validation of dates
patch by slebresne; reviewed by jbellis for CASSANDRA-4441
2012-07-16 20:32:21 +02:00
Dave Brosius 1440079d44 add netty license file 2012-07-05 20:49:00 -04:00
Dave Brosius 58e3961ea7 fix name of guava 12 license file (extension) 2012-07-05 20:41:06 -04:00
Jonathan Ellis 04a18020e5 upgrade to guava 12
patch by dralves
2012-07-05 19:24:46 -05:00
Sylvain Lebresne 6d3a3eed27 Custom CQL protocol
patch by slebresne; reviewed by yukim and norman for CASSANDRA-2478
2012-07-05 18:21:09 +02:00
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
Jonathan Ellis 4d7481316b fix yamlbeans license text
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@985278 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 16:43:17 +00:00
Jonathan Ellis 1defd006c3 add back percentage option for cache size configuration, and replace SnakeYAML with YamlBeans. patch by Jon Hermes; reviewed by jbellis for CASSANDRA-1313
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@985264 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 16:20:18 +00:00
Jonathan Ellis 63b77c5361 upgrade log4j to 1.2.16
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@981052 13f79535-47bb-0310-9956-ffa450edef68
2010-07-31 13:10:28 +00:00
Jonathan Ellis d849c697a5 upgrade to latest thrift. patch by Nate McCall; reviewed by jbellis for CASSANDRA-1266
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@963928 13f79535-47bb-0310-9956-ffa450edef68
2010-07-14 02:47:03 +00:00
Eric Evans cd15433843 alternately patched avro jar
This version includes a different genavro patch for defaults, one with
a more intuitive syntax:

  long timestamp = 10;
  string attrib = "value";

Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@959749 13f79535-47bb-0310-9956-ffa450edef68
2010-07-01 19:10:04 +00:00
Eric Evans 8eeaa1469c custom avro build (genavro patched for defaults)
See AVRO-494

Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@956978 13f79535-47bb-0310-9956-ffa450edef68
2010-06-22 19:03:15 +00:00
Eric Evans 67be06a7d2 upgrade to avro 1.3.3
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@955285 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 16:16:18 +00:00
Jonathan Ellis 32273ec3a0 upgrade from google-collections to guava. patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@954935 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 15:41:25 +00:00
Jonathan Ellis c75230c3a1 add bin/config-convert for xml -> yaml migration. patch by Todd Blose; reviewed by Stu Hood for CASSANDRA-1000
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@936511 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 21:05:34 +00:00
Jonathan Ellis 04384943fe convert cassandra.xml to cassandra.yaml. patch by Todd Blose and Stu Hood for CASSANDRA-990
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@936510 13f79535-47bb-0310-9956-ffa450edef68
2010-04-21 21:05:26 +00:00
Eric Evans 6c92730341 upgrade avro jar from 1.3.1 to 1.3.2
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@930906 13f79535-47bb-0310-9956-ffa450edef68
2010-04-05 17:01:45 +00:00
Eric Evans 06248ea220 merge with 0.6 branch (post-850)
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@927954 13f79535-47bb-0310-9956-ffa450edef68
2010-03-26 16:31:52 +00:00
Eric Evans e22bc52466 avro 1.3.0 has been release; remove embedded copy
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@917755 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 22:15:20 +00:00
Jonathan Ellis 2b69c401cb merge from 0.6
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@917685 13f79535-47bb-0310-9956-ffa450edef68
2010-03-01 20:02:34 +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
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 26c95ff453 avro and friends (some via ivy)
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@904541 13f79535-47bb-0310-9956-ffa450edef68
2010-01-29 16:23:49 +00:00
Eric Evans 55b617c6a9 applied new thrift jar
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@896206 13f79535-47bb-0310-9956-ffa450edef68
2010-01-05 20:32:58 +00:00
Eric Evans cb828319c5 consolidate json libraries
Patch by eevans; reviewed by jbellis for CASSANDRA-587

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@894259 13f79535-47bb-0310-9956-ffa450edef68
2009-12-28 22:20:52 +00:00
Eric Evans 5f5f0ca2f0 update thrift jar to current recommended revision
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@888687 13f79535-47bb-0310-9956-ffa450edef68
2009-12-09 03:04:26 +00:00
Eric Evans ebbbfc4d70 add new JSON parsing library
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@885323 13f79535-47bb-0310-9956-ffa450edef68
2009-11-30 03:24:53 +00:00
Eric Evans 0be4eb0404 clhm licensing/attribution that match current practice
Patch by eevans; reviewed by jbellis for CASSANDRA-528

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@833222 13f79535-47bb-0310-9956-ffa450edef68
2009-11-05 22:46:42 +00:00
Jonathan Ellis 6915e8f60b add clhm-production.jar
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828752 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 15:37:13 +00:00
Jonathan Ellis 26971fb3ff CLHM, fixed version
patch by jbellis; reviewed by goffinet for CASSANDRA-423

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828734 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 14:58:53 +00:00
Eric Evans 70d9ef46d1 merge with cassandra-0.4 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@813501 13f79535-47bb-0310-9956-ffa450edef68
2009-09-10 16:32:57 +00:00
Eric Evans 3e96baefd1 merge with cassandra-0.4 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@812698 13f79535-47bb-0310-9956-ffa450edef68
2009-09-08 21:21:28 +00:00
Jonathan Ellis ab392a6ee7 remove buggy concurrentlinkedhashmap library and lru cache. too late in 0.4 to try to debug the library -- will revisit for 0.5. patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-405
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810540 13f79535-47bb-0310-9956-ffa450edef68
2009-09-02 15:04:16 +00:00
Eric Evans e2af28a6e3 merged from cassandra-0.4 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810282 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 22:25:00 +00:00
Jonathan Ellis 59ec4109e4 bump thrift version to 808609 to fix regression from THRIFT-562. patch by jbellis for CASSANDRA-387
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808620 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 20:47:21 +00:00
Jonathan Ellis 0f56a25553 update to thrift trunk and rename jar after the svn revision (806014). inline our map typedef to work around regression introduced in THRIFT-144. add slf4j dependencies (required since THRIFT-558). regenerate thrift structs with new version.
patch by jbellis for CASSANDRA-308, CASSANDRA-387

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@808559 13f79535-47bb-0310-9956-ffa450edef68
2009-08-27 18:11:58 +00:00
Jun Rao c4992f48ce Expose ring map to client for more direct access; patch by junrao; reviewed by jbellis for CASSANDRA-197
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@807431 13f79535-47bb-0310-9956-ffa450edef68
2009-08-24 23:39:27 +00:00
Jonathan Ellis 51401247c1 remove groovy jar, half-baked Callout code. patch by Michael Greene; reviewed by jbellis for CASSANDRA-380
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@806267 13f79535-47bb-0310-9956-ffa450edef68
2009-08-20 17:24:33 +00:00
Eric Evans 1cfd6e4111 add license information for google-collect
Patch by eevans; reviewed by jbellis for CASSANDRA-294

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@794040 13f79535-47bb-0310-9956-ffa450edef68
2009-07-14 20:00:12 +00:00
Jonathan Ellis 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
Jonathan Ellis 0e9d41aa6f r/m unused jars from lib/. patch by Ian Eure; reviewed by jbellis for CASSANDRA-290
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@793661 13f79535-47bb-0310-9956-ffa450edef68
2009-07-13 19:08:32 +00:00
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 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
Jonathan Ellis 9307f621bc we don't need these jars for junit
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773957 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 16:11:37 +00:00
Jonathan Ellis 97fc5cb8ef migrate to JUnit 4.6. patch by jbellis; reviewed by Sandeep Tata for CASSANDRA-162
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773940 13f79535-47bb-0310-9956-ffa450edef68
2009-05-12 15:26:38 +00:00
Jonathan Ellis 6d075b51b9 junit xml output for hudson's benefit. patch by johano; reviewed by jbellis for #32
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@768579 13f79535-47bb-0310-9956-ffa450edef68
2009-04-25 18:46:48 +00:00
Jonathan Ellis ef293c1a6a return empty lists instead of raising an error where applicable; otherwise, use
NotFoundError instead of CassandraException.  rely on THRIFT-378 to report internal errors.
also, add field numbers to work around thrift bug generating python code.
patch by jbellis; reviewed by Jun Rao for #66

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@768382 13f79535-47bb-0310-9956-ffa450edef68
2009-04-24 17:52:25 +00:00
Jonathan Ellis 4ed201b99f r/m libfb303 as a dependency. (this completes the process begun by Prashant earlier.) patch by Jun Rao; reviewed by jbellis for #86
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765703 13f79535-47bb-0310-9956-ffa450edef68
2009-04-16 17:47:25 +00:00
Jonathan Ellis 5e72feef0e upgrade to thrift svn r763981. for Java, this should be identical to thrift 0.1. patch by jbellis; reviewed by Eric Evans for #72
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@765262 13f79535-47bb-0310-9956-ffa450edef68
2009-04-15 16:28:03 +00:00
Jonathan Ellis b61cbd37e8 add antlr-3.1.3 (should have been in r761805
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761820 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 22:18:39 +00:00
Jonathan Ellis b9bc065e3d upgrade to latest antlr; expunge 2.x. patch by Per Mellqvist, reviewed by jbellis. see #46
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761805 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 21:27:40 +00:00
Jonathan Ellis 9017f33e7f upgrade NBHM to latest version (1.1.1) from sf.net
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761714 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 15:57:58 +00:00
Jonathan Ellis 8632f05518 r/m generated files from svn and modify build.xml to build them. added back required jars for generation (antlr 2.7.7 and stringtemplate). patch by Per Mellqvist for #40
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@761384 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 19:17:04 +00:00
Jonathan Ellis ce8f72e4af remove unused libraries; update log4j to 1.2.15; add commons-collections
and commons-lang; wildcard lib/ in build.xml

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@758963 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 02:18:04 +00:00
Prashant Malik 1f91e99223 git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@749218 13f79535-47bb-0310-9956-ffa450edef68 2009-03-02 07:57:22 +00:00