Commit Graph

11175 Commits

Author SHA1 Message Date
Jonathan Ellis dd276ebb5d Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-19 12:11:02 -05:00
Jonathan Ellis 73a3eeb6f6 comment CqlRow for #6807 2014-03-19 12:10:52 -05:00
Tyler Hobbs c80f61b682 Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
	CHANGES.txt
2014-03-19 11:40:40 -05:00
Carl Yeksigian 32c15c2fb0 Add uuid() function
patch by Carl Yeksigian; reviewed by jbellis for CASSANDRA-6473
2014-03-19 11:38:26 -05:00
Tyler Hobbs 7e870018dc Add UNLOGGED, COUNTER options to BATCH docs
patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-6816
2014-03-19 11:37:09 -05:00
Brandon Williams 91e4d22880 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-19 09:00:51 -05:00
Brandon Williams 3008532322 Extend limits.conf in debian packaging.
Patch by brandonwilliams for CASSANDRA-6104
2014-03-19 08:59:33 -05:00
Sylvain Lebresne f1f8384a0c Static columns with IF NOT EXISTS don't always work as expected
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6783
2014-03-19 10:55:19 +01:00
Jonathan Ellis 4ce44df4d3 Omit tombstones from schema digests
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6862
2014-03-19 01:04:47 -05:00
Jonathan Ellis f5e1cbca87 Include correct consistencyLevel in LWT timeout
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6884
2014-03-19 00:15:19 -05:00
Tyler Hobbs 9269cb83ce Pick unused generations when loading new sstables
patch by Tyler Hobbs; reviewed by Jonathan Ellis for CASSANDRA-6514
2014-03-18 18:03:06 -05:00
Sam Tunnicliffe 75ff51e124 Extend triggers to support CAS updates
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6882
2014-03-18 23:44:53 +03:00
Tyler Hobbs 5b3b52f596 Add support for DELETE ... IF EXISTS to CQL3
Patch by Tyler Hobbs, reviewed by Sylvain Lebresne for CASSANDRA-5708
2014-03-18 14:24:15 -05:00
Aleksey Yeschenko 1f13efefd3 Improve PerRowSecondaryIndex performance
patch by Sergio Bossa; reviewed by Aleksey Yeschenko for CASSANDRA-6876
2014-03-18 14:31:31 +03:00
Marcus Eriksson 850cd59ca4 Add paranoid disk failure option.
Patch by marcuse, reviewed by kohlisankalp and jbellis for CASSANDRA-6646
2014-03-18 07:52:30 +01:00
Jonathan Ellis b4f2ff17ad Update hadoop_cql3_word_count example
patch by Chandar Pechetty; reviewed by Alex Liu for CASSANDRA-6703
2014-03-17 16:34:23 -05:00
Brandon Williams 98ed6a4be0 Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
	CHANGES.txt
2014-03-17 12:07:00 -05:00
Brandon Williams 3876eefd11 Add extra SSL cipher suites.
Patch by brandonwilliams, reviewed by Ray Sinnema for CASSANDRA-6613
2014-03-17 12:05:35 -05:00
Jonathan Ellis 56e2b4ac02 Fix handling of RejectedExecution in sync Thrift server
patch by Christian Rolf and jbellis for CASSANDRA-6788
2014-03-17 10:50:19 -05:00
Sylvain Lebresne 1e64972be5 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-17 11:03:47 +01:00
Sylvain Lebresne 8526347cad Update copyright date in NOTICE file 2014-03-17 11:03:32 +01:00
Sylvain Lebresne 9527b17f1f Properly use the paxos consistency for (non-protocol) batches
patch by slebresne; reviewed by jbellis for CASSANDRA-6837
2014-03-17 11:01:28 +01:00
Mikhail Stepura 245038fd25 Fix "codecoverage" task 2014-03-14 13:49:49 -07:00
Jonathan Ellis 57c5969e1d Log more information when exceeding tombstone_warn_threshold
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6865
2014-03-14 15:39:19 -05:00
Jonathan Ellis 7ce3950a97 Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0 2014-03-14 15:28:10 -05:00
Jonathan Ellis 3050134c26 Fix truncate to not abort due to unreachable fat clients
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6864
2014-03-14 14:59:16 -05:00
Brandon Williams f122f9994e Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-14 14:47:31 -05:00
Brandon Williams 8c52cc0e7f Fix failing pig test
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6376
2014-03-14 14:46:53 -05:00
Jonathan Ellis 22b94537e0 Fix schema concurrency exceptions
patch by Benedict Elliott Smith; reviewed by Carl Yeksigian for CASSANDRA-6841
2014-03-14 13:17:12 -05:00
Marcus Eriksson c3aac45605 Read message id as string from older nodes.
Patch by marcuse, reviewed by jbellis for CASSANDRA-6840
2014-03-14 18:52:59 +01:00
Dave Brosius c49d33633a fix duplicate classes between cassandra-all and cassandra-thrift
patch by dbrosius reviewed by jbellis for CASSANDRA-5833
2014-03-14 00:43:10 -04:00
Mikhail Stepura bed60fb6e5 Ninja-commit for "Add LZ4Compressor in CQL document" CASSANDRA-6331 2014-03-13 15:41:48 -07:00
Mikhail Stepura 3dcc8c25e5 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-13 14:07:04 -07:00
Shiti Saxena 972d3da2e8 Delimiter not working for special characters in COPY command from CQLSH
patch by Shiti Saxena; reviewed by Mikhail Stepura for CASSANDRA-6773
2014-03-13 14:06:51 -07:00
Mikhail Stepura dce5599953 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-13 13:05:52 -07:00
Mikhail Stepura 173df48bb3 Load a truststore if client certificate authentication is enabled
patch by Mikhail Stepura; reviewed by Jason Brown for CASSANDRA-6847
2014-03-13 13:05:31 -07:00
Jonathan Ellis da2d97142b Fix leaking validator FH in StreamWriter
patch by Joshua McKenzie; reviewed by jbellis for CASSANDRA-6832
2014-03-13 13:13:48 -05:00
Jonathan Ellis a3b314908b merge from 1.2 2014-03-13 13:05:11 -05:00
Jonathan Ellis 52cf09dbac fix nodetool getsstables for blob PK
patch by Nate McCall; reviewed by jbellis for CASSANDRA-6803
2014-03-13 13:04:14 -05:00
Jonathan Ellis 92b6d7a390 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-13 12:00:56 -05:00
Jonathan Ellis 5030d4215d add #2635 to CHANGES 2014-03-13 12:00:47 -05:00
Sylvain Lebresne faffbf2fa3 Correctly compare BooleanType values other than 0 and 1
Patch by Sylvain Lebresne, reviewed by Tyler Hobbs for CASSANDRA-6779
2014-03-12 16:37:09 -05:00
Dmitrij Koniajev 05da045bbf fixed bug in CompactionManager.needsCleanup
Patch by Dmitrij Koniajev, reviewed by marcuse for CASSANDRA-6845.
2014-03-12 18:14:59 +01:00
Aleksey Yeschenko 19444ea165 Restore expiring->deleted (cell) compaction optimization
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6844
2014-03-12 19:37:40 +03:00
Aleksey Yeschenko ed93ad4d8c Fix static counter columns
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6827
2014-03-12 14:56:29 +03:00
Jonathan Ellis 31cbdfd7ba Fix accounting in FileCacheService to allow re-using RAR
Patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6838
2014-03-11 23:18:54 -05:00
Vijay fc9cad90d5 Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java
2014-03-11 20:32:07 -07:00
Vijay 91d220b350 nodetool no longer shows node joining (Also fix nodetool status)
patch by Vijay; reviewed by driftx for CASSANDRA-6811
2014-03-11 20:13:03 -07:00
Sam Tunnicliffe f7eca98a74 Fix trigger mutations when base mutation list is immutable
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6790
2014-03-11 14:55:16 +03:00
Sam Tunnicliffe 553401d2fe Fix saving triggers to schema
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6789
2014-03-11 14:48:53 +03:00