natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
20,495 Commits 17 Branches 338 Tags 650 MiB
Commit Graph

20495 Commits

Author SHA1 Message Date
Robert Stupp db7d07cfa4 Merge branch 'cassandra-3.0' into trunk 2016-04-25 10:22:47 +02:00
Robert Stupp c9285d0e30 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-25 10:21:25 +02:00
Robert Stupp 5f99629a37 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-25 10:18:16 +02:00
Robert Stupp 07c9fa2cac cqlsh COPY FROM fails with []{} chars in UDT/tuple fields/values 
patch by Robert Stupp; reviewed by Stefania for CASSANDRA-11633
 2016-04-25 10:16:28 +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
Stefania Alborghetti a18402ca08 Merge branch 'cassandra-3.0' into trunk 2016-04-22 09:44:37 +08:00
Stefania Alborghetti f050133f20 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-22 09:44:19 +08:00
Stefania Alborghetti 7713c821ca Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-22 09:42:57 +08:00
Stefania Alborghetti 666bee6125 clqsh: COPY FROM throws TypeError with Cython extensions enabled 
patch by Stefania Alborghetti; reviewed by Tyler Hobbs for CASSANDRA-11574
 2016-04-22 09:42:06 +08: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
Sam Tunnicliffe bc8a56d24d Merge branch 'cassandra-3.0' into trunk 2016-04-21 18:44:39 +01:00
Sam Tunnicliffe caae9870dd Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-21 18:42:43 +01: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
Stefania Alborghetti 5062bb6eb0 Merge branch 'cassandra-3.0' into trunk 2016-04-21 10:18:26 +08:00
Stefania Alborghetti bb68078e7c Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-21 10:17:50 +08:00
Stefania Alborghetti b80ff541e2 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-21 10:12:24 +08:00
Stefania Alborghetti c8914c0725 cqlsh: COPY FROM ignores NULL values in conversion 
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11549
 2016-04-21 10:10:37 +08:00
Stefania Alborghetti 2b08690def Merge branch 'cassandra-3.0' into trunk 2016-04-21 09:48:22 +08:00
Stefania Alborghetti c568efee54 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-21 09:45:49 +08:00
Stefania Alborghetti eb072a0fa0 cqlsh: COPY FROM should use regular inserts for single statement batches 
and report errors correctly if workers processes crash on initialization

patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-11474
 2016-04-21 09:43:35 +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
Tyler Hobbs a0e8de99db Merge branch 'cassandra-3.0' into trunk 2016-04-20 13:57:42 -05:00
Tyler Hobbs dab1d578d7 Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2016-04-20 13:57:29 -05:00
Tyler Hobbs e865e396cd Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-20 13:55:28 -05:00
Stefania Alborghetti 4389c9cfd8 cqlsh: Fix potential COPY deadlock 
This deadlock could occur when the parent process is terminating child
processes (partial backport of CASSANDRA-11320).

Patch by Stefania Alborghetti; reviewed by Tyler Hobbs for
CASSANDRA-11505
 2016-04-20 13:52:08 -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
Marcus Eriksson 391cae615b Merge branch 'cassandra-3.0' into trunk 2016-04-19 15:49:08 +02:00
Marcus Eriksson f85a20f798 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-04-19 15:48:59 +02:00
Marcus Eriksson 97a43ffff2 Merge branch 'cassandra-2.1' into cassandra-2.2 2016-04-19 15:48:52 +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
Christopher Batey ba926ff6d8 (stress) Add datacenter option to -node options 
patch by Christopher Batey; reviewed by Aleksey Yeschenko for
CASSANDRA-11591
 2016-04-18 17:15:15 +01:00