Commit Graph

4045 Commits

Author SHA1 Message Date
Tyler Hobbs 2f6a9f0bed Merge branch 'cassandra-3.1' into trunk 2015-12-04 15:38:40 -06:00
Tyler Hobbs 587fd9f77a Fix failing unit tests post-10796
Patch by Tyler Hobbs as a follow-up to CASSANDRA-10796
2015-12-04 15:37:39 -06:00
T Jake Luciani 9fb436f936 Merge branch 'cassandra-3.1' into trunk 2015-12-04 15:54:15 -05:00
Paulo Motta c184e8c14b Avoid MV race during node decommission
Patch by Paulo Motta; reviewed by Joel Knighton for CASSANDRA-10674
2015-12-04 15:50:48 -05:00
Joshua McKenzie 084590c413 Merge branch 'cassandra-3.1' into trunk 2015-12-04 13:19:33 -05:00
Joshua McKenzie 5aa19cb68a 10585-3.0 patch 2015-12-04 13:19:07 -05:00
Tyler Hobbs 4a566139d1 Merge branch 'cassandra-3.1' into trunk 2015-12-04 11:43:44 -06:00
Tyler Hobbs 83f8ccc668 Handle single-col deletions in MVs correctly
Patch by Tyler Hobbs; reviewed by Carl Yeksigian for CASSANDRA-10796
2015-12-04 11:42:13 -06:00
Ariel Weisberg 1c41a9ac2c bound maximum in-flight commit log replay mutation bytes to 64 megabytes (tunable via cassandra.commitlog_max_outstanding_replay_bytes)
Patch by Ariel Weisberg; reviewed by tjake for CASSANDRA-8639
2015-12-04 11:49:41 -05:00
Marcus Eriksson 52d5eb04f6 Merge branch 'cassandra-3.1' into trunk 2015-12-04 14:27:26 +01:00
Stefania Alborghetti d0da9e7612 Fix issue with data dir migration on upgrade
Patch by Stefania; reviewed by marcuse for CASSANDRA-10788
2015-12-04 14:22:26 +01:00
Sylvain Lebresne 220f253fb3 Merge branch 'cassandra-3.1' into trunk 2015-12-04 10:10:42 +01:00
Branimir Lambov 1e978df3a8 Fix bug with range tombstone in reverse queries and Partition test coverage
patch by blambov; reviewed by slebresne for CASSANDRA-10059
2015-12-04 10:08:51 +01:00
Benjamin Lerer c19aa154ae Merge branch 'cassandra-3.1' into trunk 2015-12-03 22:57:22 +01:00
Benjamin Lerer bc9a61fc85 Remove 64k limit on collection elements
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10374
2015-12-03 22:51:03 +01:00
Sylvain Lebresne 4f5845eb5a Merge branch 'cassandra-3.1' into trunk 2015-12-03 15:02:25 +01:00
Sylvain Lebresne fffa6d8e66 Remove Index.indexes() method from 2ndary index API
patch by slebresne; reviewed by beobal for CASSANDRA-10690
2015-12-03 15:00:07 +01:00
Marcus Eriksson ca70561f2e Merge branch 'cassandra-3.1' into trunk 2015-12-02 09:02:28 +01:00
Marcus Eriksson ad84add726 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-12-02 08:55:36 +01:00
Marcus Eriksson 9f19dd4e4e Merge branch 'cassandra-2.1' into cassandra-2.2 2015-12-02 08:53:33 +01:00
Marcus Eriksson dbfeeac177 Optimize the way we check if a token is repaired in anticompaction
Patch by marcuse; reviewed by Ariel Weisberg for CASSANDRA-10768
2015-12-02 08:37:08 +01:00
T Jake Luciani 6bf1f75f53 Merge branch 'cassandra-3.1' into trunk 2015-12-01 22:46:45 -05:00
Ariel Weisberg f7aaea013e Fix integer overflow in DataOutputBuffer doubling and test as best as possible given that allocating 2 gigs in a unit test is problematic.
Patch by Ariel Weisberg; reviewed by tjake for CASSANDRA-10592
2015-12-01 22:43:03 -05:00
Ariel Weisberg a320737b18 Fix integer overflow in DataOutputBuffer doubling and test as best as possible given that allocating 2 gigs in a unit test is problematic.
Patch by Ariel Weisberg; reviewed by tjake for CASSANDRA-10592
2015-12-01 22:34:28 -05:00
Benjamin Lerer 7c3e0b191f Merge branch 'cassandra-3.1' into trunk 2015-12-01 18:16:08 +01:00
Benjamin Lerer 3864b2114a Rejects partition range deletions when columns are specified
patch by Benjamin Lerer; reviewed by Carl Yeksigian for CASSANDRA-10739
2015-12-01 18:12:46 +01:00
Sylvain Lebresne 2cc34dfef2 Merge branch 'cassandra-3.1' into trunk 2015-12-01 10:28:25 +01:00
Ariel Weisberg 4378b58bba Don't throw assertion error on old key cache keys just skip serializing them.
patch by aweisberg; reviewed by slebresne for CASSANDRA-10778
2015-12-01 10:27:10 +01:00
Sam Tunnicliffe 4a4afa79c4 Merge branch 'cassandra-3.1' into trunk 2015-11-30 12:28:38 +00:00
Sam Tunnicliffe 4c56c89a1e Invalidate prepared statements when indexes are modified
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-10758a
2015-11-30 12:14:17 +00:00
Robert Stupp 33e7bba126 Merge branch 'cassandra-3.1' into trunk 2015-11-27 13:57:12 +01:00
Robert Stupp 56965fd6ff Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 13:53:20 +01:00
Robert Stupp 432a8a4843 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-27 13:50:52 +01:00
Stefania 7650fc1963 Warn or fail when changing cluster topology live
patch by Stefania; reviewed by Paulo Motta for CASSANDRA-10243
2015-11-27 13:49:15 +01:00
Benjamin Lerer 10054f3087 Merge remote-tracking branch 'asf/cassandra-3.1' into trunk 2015-11-27 11:18:46 +01:00
Benjamin Lerer 7b430eee69 Merge branch cassandra-2.2 into cassandra-3.0 2015-11-27 11:16:02 +01:00
Benjamin Lerer 61e0251a1d Reject index queries while the index is building
patch by Benjamin Lerer; reviewed by Sam Tunnicliffe for CASSANDRA-8505
2015-11-27 11:10:28 +01:00
Robert Stupp dbc8dd6a97 Merge branch 'cassandra-3.1' into trunk 2015-11-27 10:55:32 +01:00
Robert Stupp d300a1850b Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-27 10:55:02 +01:00
Robert Stupp b3e6a433ea Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-27 10:44:14 +01:00
Robert Stupp 4ecbbc0820 Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing KS
patch by Robert Stupp; reviewed by Marcus Eriksson for CASSANDRA-10658
2015-11-27 10:42:38 +01:00
Benjamin Lerer f8153a1d6b Merge branch cassandra-3.1 into trunk 2015-11-26 17:52:52 +01:00
Benjamin Lerer 7e6c1d5483 Fix SELECT statement with IN restrictions on partition key, ORDER BY and LIMIT
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10729
2015-11-26 17:40:33 +01:00
Sylvain Lebresne 24f842a07b Merge branch 'cassandra-3.1' into trunk 2015-11-26 10:25:26 +01:00
Sylvain Lebresne 2cbd776250 Fix JSON update with prepared statements (patch for 3.0)
patch by slebresne; reviewed by thobbs for CASSANDRA-10631
2015-11-26 10:22:53 +01:00
Sylvain Lebresne 31be903a74 Fix JSON update with prepared statements
patch by slebresne; reviewed by thobbs for CASSANDRA-10631
2015-11-26 10:11:55 +01:00
Marcus Eriksson 10eda8b57d Merge branch 'cassandra-3.1' into trunk 2015-11-26 08:46:46 +01:00
Marcus Eriksson 71bca78006 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-11-26 08:36:33 +01:00
Marcus Eriksson 96b7603d9e Merge branch 'cassandra-2.1' into cassandra-2.2 2015-11-26 08:31:42 +01:00
Jakub Janecek 3d99418cfd Fix the sstable-needs-cleanup check
Patch by Jakub Janecek; reviewed by marcuse for CASSANDRA-10740
2015-11-26 08:25:31 +01:00