Commit Graph

2122 Commits

Author SHA1 Message Date
Tyler Hobbs 6574de5342 Fix bound building for multi-column IN restrictions
Patch by Tyler Hobbs and Sylvain Lebresne as a follow up on
CASSANDRA-6875
2014-05-29 12:56:12 -05:00
Marcus Eriksson 367c741931 Add option to do more aggressive tombstone compaction.
Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-6563
2014-05-27 10:39:17 +02:00
Tyler Hobbs 43496384d4 Support multi-row selects within a partition using IN
Patch by Tyler Hobbs; review by Sylvain Lebresne for CASSANDRA-6875
2014-05-22 14:04:48 -05:00
Sylvain Lebresne 2635632270 Add missing iso8601 patterns for date strings
patch by chander; reviewed by slebresne for CASSANDRA-6973
2014-05-21 17:29:12 +02:00
Sylvain Lebresne 484d281694 Fix flapping RecoveryManagerTest
patch by benedict; reviewed by jbellis for CASSANDRA-7084
2014-05-21 11:48:21 +02:00
Sylvain Lebresne 9d06ea6f14 Fixup for CASSANDRA-6914: null handling, ...
patch by slebresne; reviewed by thobbs for CASSANDRA-7155
2014-05-19 10:51:31 +02:00
Brandon Williams b927f790af Fix pig tests.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6877
2014-05-14 14:32:45 -05:00
Brandon Williams 3047ab6387 Add Cloudstack snitch
Patch by Pierre-Yves Ritschard, reviewed by brandonwilliams for
CASSANDRA-7147
2014-05-03 13:47:48 -05:00
Jonathan Ellis af96d405b4 Make batchlog replica selection rack-aware
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6551
2014-05-02 22:47:27 -05:00
Brandon Williams 7426828332 fix GCS test for 2.0 2014-05-01 16:40:17 -05:00
Brandon Williams f2bbd6fcc6 Add Google Compute Engine snitch.
Patch by Brian Lynch, reviewed by brandonwilliams for CASSANDRA-7132
2014-05-01 15:12:55 -05:00
Sylvain Lebresne b4337228df Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
	src/java/org/apache/cassandra/thrift/CassandraServer.java
2014-04-30 11:24:21 +02:00
Aleksey Yeschenko c1eb74ce47 Merge groupable mutations in TriggerExecutor#execute()
patch by Aleksey Yeschenko and Sergio Bossa for CASSANDRA-7047
2014-04-23 21:30:36 +03:00
beobal 93edb123a1 Fix performance regression from CASSANDRA-5614
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6949
2014-04-22 18:37:09 +03:00
Aleksey Yeschenko 384de4b85d Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/HintedHandOffManager.java
	src/java/org/apache/cassandra/db/RowMutation.java
	src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
	src/java/org/apache/cassandra/service/StorageProxy.java
	test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
	test/unit/org/apache/cassandra/db/HintedHandOffTest.java
2014-04-18 02:40:19 +03:00
Aleksey Yeschenko 87097066e7 Fix batchlog to account for CF truncation records
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6999
2014-04-18 01:38:55 +03:00
Yuki Morishita 04fd84c3d5 Fix SSTable not released if stream session fails
patch by yukim; reviewed by Richard Low for CASSANDRA-6818
2014-04-03 16:17:44 -05:00
Brandon Williams 05b08822c0 Add forgotten test 2014-04-02 17:53:47 -05:00
Brandon Williams 43d35a651c Add forgotten test 2014-04-02 17:53:19 -05:00
Tyler Hobbs 0e98f5bd4c Handle short slice start/finishes of different lengths
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne as a follow-up for
CASSANDRA-6825
2014-04-02 15:17:48 -05:00
Brandon Williams 4f47a44d05 Revert "Don't shut ExpiringMap down."
This reverts commit d4ec31f21e.

Conflicts:
	CHANGES.txt
2014-04-02 14:53:25 -05:00
Brandon Williams d4ec31f21e Don't shut ExpiringMap down.
Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-6948
2014-04-02 14:14:30 -05:00
Tyler Hobbs b218536dbc Fix bad skip of sstables on slice query with composite start/finish
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-6825
2014-04-02 12:02:47 -05:00
Sylvain Lebresne b42feea643 Fix Cassandra 2.0.x validates Thrift columns incorrectly
patch by thobbs and slebresne; reviewed by thobbs and slebresne for CASSANDRA-6892
2014-04-02 11:58:00 +02:00
Aleksey Yeschenko 0fce7ace02 Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog
	src/java/org/apache/cassandra/db/BatchlogManager.java
	src/java/org/apache/cassandra/db/DeletionInfo.java
2014-04-01 04:22:39 +03:00
Aleksey Yeschenko dc3f22b61d Fix batchlogManager#deleteBatch() use of millisecond timsestamps
patch by Aleksey Yeschenko; reviewed by Pavel Yaskevich for
CASSANDRA-6822
2014-04-01 04:16:48 +03:00
Sylvain Lebresne c843b6b85c Fix paging with SELECT DISTINCT
patch by slebresne; reviewed by thobbs for CASSANDRA-6857
2014-03-21 19:03:12 +01: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
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
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
Sylvain Lebresne ba95ca0db5 Fix CQLSSTableWriter.addRow(Map<String, Object>)
patch by slebresne; reviewed by thobbs for CASSANDRA-6526
2014-03-06 10:07:51 +01:00
Sylvain Lebresne 773fade9ae FBUtilities.singleton() should use the CF comparator
patch by slebresne; reviewed by thobbs for CASSANDRA-6778
2014-03-06 08:56:08 +01:00
Marcus Eriksson 64098f7d6f Fix resetAndTruncate:ing CompressionMetadata
Patch by kvaster, reviewed by marcuse for CASSANDRA-6791
2014-03-03 15:03:34 +01:00
Marcus Eriksson 41d8a5f486 Fix resetAndTruncate:ing CompressionMetadata
Patch by kvaster, reviewed by marcuse for CASSANDRA-6791
2014-03-03 14:21:00 +01:00
Brandon Williams d21c0c932c Compare scores of full replica ordering in DES.
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6883
2014-02-25 10:42:02 -06:00
Sylvain Lebresne cd2c43884d Fix paging bug with deleted columns
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6748
2014-02-25 10:37:18 +01:00
Jonathan Ellis f30b772006 Allow repairing between specific replicas
patch by Sankalp Kohli; reviewed by Lyuben Todorov for CASSANDRA-6440
2014-02-18 11:35:53 -06:00
Marcus Eriksson 9381b8d569 Add commit_failure_policy.
Patch by belliottsmith, reviewed by marcuse for CASSANDRA-6364

CASSANDRA-6364
2014-02-11 13:13:37 +01:00
Marcus Eriksson 1b8b7b5408 Fix CleanupTest
patch by marcuse, reviewed by jbellis for CASSANDRA-6679
2014-02-10 18:36:28 +01:00
Marcus Eriksson 9a6ae96af7 Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
	test/unit/org/apache/cassandra/db/CleanupTest.java
2014-02-10 18:34:43 +01:00
Marcus Eriksson 4b83a6f9d9 Fix CleanupTest
patch by marcuse, reviewed by jbellis for CASSANDRA-6679
2014-02-10 18:32:06 +01:00
Brandon Williams 7407cf981b Merge branch 'cassandra-1.2' into cassandra-2.0 2014-02-07 10:38:00 -06:00
Brandon Williams 2dd55c7d31 fix race in LeaveAndBootstrapTest 2014-02-07 10:37:53 -06:00
Jonathan Ellis cd26f48ce8 Expose bulk loading progress over JMX
patch by Tyler Hobbs; reviewed by Nick Bailey for CASSANDRA-4757
2014-02-06 10:08:36 -06:00
Aleksey Yeschenko 728c4fa9bf Let scrub optionally skip broken counter partitions
patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-5930
2014-02-03 23:01:31 +03:00
Sylvain Lebresne 0191b359fc Fix potential loss of 2ndary index entry during compaction
patch by slebresne; reviewed by beobal for CASSANDRA-6517
2014-01-31 16:47:01 +01:00
Brandon Williams d76ad2e244 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-01-31 09:40:17 -06:00