Commit Graph

14112 Commits

Author SHA1 Message Date
Branimir Lambov 2cc26eba7a Clarify ClusteringPrefix hierarchy
Patch by Branimir Lambov; reviewed by Sylvain Lebresne for CASSANDRA-11213
2016-04-28 14:32:36 +02:00
Aleksey Yeschenko 5c5cc540fa Merge branch 'cassandra-3.0' into trunk 2016-04-27 17:58:12 +01:00
Aleksey Yeschenko 3079ae60d2 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-27 17:57:59 +01:00
Aleksey Yeschenko e5c4027800 Fix is_dense recalculation for Thrift-updated tables
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-11502
2016-04-27 17:47:29 +01:00
Sam Tunnicliffe 2bc5f0c61d Always check for collisions before joining ring
Patch by Sam Tunnicliffe; reviewed by Joel Knighton for CASSANDRA-10134

The collision check and shadow round can be skipped completely (for testing
etc) by setting cassandra.allow_unsafe_join=true.

This commit also enables explicit unsafe replace without bootstrap by using
both auto_bootstrap=false and cassandra.replace_address. Doing so requires
cassandra.allow_unsafe_replace=true.
2016-04-27 09:25:33 +01:00
Marcus Eriksson 0e5266664e Merge branch 'cassandra-3.0' into trunk 2016-04-27 10:11:08 +02:00
Marcus Eriksson 8bfe09f466 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-27 10:10:42 +02:00
Marcus Eriksson 3db30aab98 Remove unnecessary file existence check during anticompaction.
Patch by marcuse; reviewed by Paulo Motta for CASSANDRA-11660
2016-04-27 10:03:42 +02:00
Stefania Alborghetti 29d4a82979 SSTableWriter output discrepancy
patch by Stefania Alborghetti; reviewed by Alex Petrov for CASSANDRA-11646
2016-04-27 09:20:28 +08:00
T Jake Luciani 487c8f79de Fix typo 2016-04-26 12:49:23 -04:00
T Jake Luciani fb20023fb5 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-26 12:11:15 -04:00
T Jake Luciani 26e0a33faf deb package migration to dh_python2
Patch by Michael Shuler; reviewed by tjake for CASSANDRA-10853
2016-04-26 12:06:46 -04:00
Yuki Morishita 300730790b Merge branch 'cassandra-3.0' into trunk 2016-04-26 08:07:39 -05:00
Yuki Morishita 049d70c2e6 Fix sstabledump not showing cells after tombstone marker
patch by yukim; reviewed by clohfink for CASSANDRA-11654
2016-04-26 08:06:56 -05:00
Marcus Eriksson 16ea55b0ef Merge branch 'cassandra-3.0' into trunk 2016-04-26 09:32:12 +02:00
Marcus Eriksson bf7d4334ed Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-26 08:28:33 +02:00
Marcus Eriksson 3128802a5f Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-26 08:25:45 +02:00
Paulo Motta cc75de6912 Validate levels when building LeveledScanner to avoid overlaps with orphaned sstables
Patch by Paulo Motta; reviewed by marcuse for CASSANDRA-9935
2016-04-26 08:21:05 +02:00
Alex Petrov f07a406e57 Fix possible race condition in NativeTransportService.testConcurrentDestroys
patch by ifesdjeen; reviewed by jkni for CASSANDRA-10756
2016-04-25 10:00:20 +02:00
Christopher Batey 7afc1571bb NullPointerException if metrics reporter config file doesn't exist
patch by Christopher Batey; reviewed by Robert Stupp for CASSANDRA-11544
2016-04-22 14:21:23 +02:00
Tyler Hobbs de1a96c8d4 Merge branch 'cassandra-3.0' into trunk
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/service/StorageServiceMBean.java
2016-04-21 16:18:06 -05:00
Tyler Hobbs a4e1182816 Filter out all LocalStrat keyspaces for streaming
Patch by Tyler Hobbs; reviewed by Blake Eggleston for CASSANDRA-11627
2016-04-21 16:15:50 -05:00
Tyler Hobbs 848352fae3 Merge branch 'cassandra-3.0' into trunk 2016-04-21 15:33:33 -05:00
Tyler Hobbs d8d920dce9 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-21 15:32:51 -05:00
Tyler Hobbs c42f5f6853 Ninja: use logger.trace() when we only intend to log at trace 2016-04-21 15:31:40 -05:00
Alex Petrov 3244774572 Avoid possible stack overflow in ModificationStatement::getFunctions
Patch by Alex Petrov; reviewed by Sam Tunnicliffe for CASSANDRA-11621
2016-04-21 18:41:43 +01:00
Robert Stupp ef5bbedd68 Support large partitions on the 3.0 sstable format
patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-11206
2016-04-21 16:48:26 +02:00
Alex Petrov ae063e8061 JSON datetime formatting needs timezone
patch by Alex Petrov; reviewed by Stefania Alborghetti for CASSANDRA-11137
2016-04-21 12:02:47 +08:00
Dikang Gu 95d927d38f Add support to rebuild from specific range
patch by Dikang Gu; reviewed by yukim for CASSANDRA-10409
2016-04-20 14:09:51 -05:00
Sam Tunnicliffe a5e501f094 Merge branch 'cassandra-3.0' into trunk 2016-04-20 16:06:51 +01:00
Sam Tunnicliffe 14f08e6f66 Add indexed column to column filter in KeysSearcher
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-11523
2016-04-20 16:02:34 +01:00
Yuki Morishita 7cd14d0894 Merge branch 'cassandra-3.0' into trunk 2016-04-20 09:52:51 -05:00
Jon Haddad 5a77bd1f11 fixed help text in sstabledump 2016-04-20 09:52:29 -05:00
Marcus Eriksson 0541597e79 Merge branch 'cassandra-3.0' into trunk 2016-04-20 06:58:40 +02:00
Marcus Eriksson 9b48a0bf43 Only open one sstable scanner per sstable
Patch by marcuse; reviewed by Paulo Motta for CASSANDRA-11412
2016-04-20 06:28:55 +02:00
Alex Petrov c83729f41d Make sure that indexing/filtering restrictions are picked up correctly even if the columns are given in order
Patch by Alex Petrov; reviewed by Sam Tunnicliffe and Benjamin Lerer for CASSANDRA-11310
2016-04-19 18:05:29 +01:00
Benjamin Lerer 30bfa07a48 Merge branch cassandra-3.0 into trunk 2016-04-19 17:54:12 +02:00
Benjamin Lerer 0e96d3e524 Merge branch asf/cassandra-2.2 into cassandra-3.0 2016-04-19 17:51:41 +02:00
Benjamin Lerer 60997c2ded Fix javadoc in AggregateFcts 2016-04-19 17:46:21 +02:00
Paulo Motta 209ebd380b Add unit test for CASSANDRA-11548
Patch by Paulo Motta; reviewed by Marcus Eriksson for CASSANDRA-11548
2016-04-19 15:42:36 +02:00
Dikang Gu a17120adff Optimize the overlapping lookup by calculating all the bounds in advance.
Patch by Dikang Gu; reviewed by marcuse for CASSANDRA-11571
2016-04-19 13:25:58 +02:00
Ruoran Wang d200d13782 Replace sstables on DataTracker before marking them as non-compacting during anti-compaction
Patch by Ruoran Wang; reviewed by Paulo Motta for CASSANDRA-11548
2016-04-19 08:00:09 -03:00
Shogo Hoshii 5805a76ca0 Support json/yaml output in noetool tablestats
patch by Shogo Hoshii; reviewed by yukim for CASSANDRA-5977
2016-04-18 14:00:20 -05:00
Aleksey Yeschenko 85c518cb36 Merge branch 'cassandra-3.0' into trunk 2016-04-18 15:26:37 +01:00
Aleksey Yeschenko 7f4b5e3051 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-18 15:26:26 +01:00
Artem Aliev 77ab77328e Always close cluster with connection in CqlRecordWriter
patch by Artem Aliev; reviewed by Aleksey Yeschenko for CASSANDRA-11553
2016-04-18 15:25:14 +01:00
Joel Knighton 28cd76cd84 Handle Slices.NONE in sstable iterators
patch by jkni; reviewed by slebresne for CASSANDRA-11513
2016-04-18 15:21:06 +02:00
Alex Petrov a600920cb5 Allow filtering on clustering columns for queries without secondary indexes
patch by Alex Petrov; reviewed by Benjamin Lerer for CASSANDRA-11310
2016-04-15 22:26:02 +02:00
Benjamin Lerer 831bebdba8 Refactor Restriction hierarchy
patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-11354
2016-04-15 21:13:52 +02:00
Robert Stupp dc569c9e05 Merge branch 'cassandra-3.0' into trunk 2016-04-15 20:33:55 +02:00