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

21110 Commits

Author SHA1 Message Date
Josh McKenzie 76188e9520 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-11 16:29:58 -04:00
Josh McKenzie e99ee19950 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-11 16:28:22 -04:00
Jeff Jirsa f0d1d75ebf Make GCInspector min log duration configurable 
Patch by jjirsa; reviewed by jmckenzie for CASSANDRA-11715
 2016-07-11 16:27:04 -04:00
Aleksey Yeschenko 56abaca046 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-11 15:01:04 +01:00
Aleksey Yeschenko 5861cd8fe2 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-11 15:00:03 +01:00
Brian Wawok 9a8406f2f7 Synchronize ThriftServer::stop() 
patch by Brian Wawok; reviewed by Aleksey Yeschenko for CASSANDRA-12105
 2016-07-11 14:53:24 +01:00
Aleksey Yeschenko 371a147945 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-11 14:37:10 +01:00
Aleksey Yeschenko 4d7141f758 Fix migration of static thrift column names with non-text comparators 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-12147
 2016-07-11 14:36:24 +01:00
Aleksey Yeschenko 314f60a44e Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-11 14:32:30 +01:00
Aleksey Yeschenko f37b6f145d Fix upgrading sparse tables that are incorrectly marked as dense 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-11315
 2016-07-11 14:29:55 +01:00
Stefania Alborghetti d20c765a7d Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC 
patch by Stefania Alborghetti; reviewed by Jake Luciani for CASSANDRA-11950
 2016-07-11 10:57:27 +08:00
Yuki Morishita 1417a516cf Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-08 19:12:34 -05:00
Yuki Morishita 2fa44cd881 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-08 19:05:46 -05:00
Yuki Morishita e983590d30 ninja fix condition to ensure close in ConnectionHandler 2016-07-08 19:05:06 -05:00
nitsanw c1dcc9ce46 Fix hdr logging for single operation workloads 
Patch by Nitsan Wakart; reviewed by tjake for CASSANDRA-12145
 2016-07-08 10:38:40 -04:00
Yuki Morishita 8475f891c7 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-07 11:00:37 -05:00
Yuki Morishita a227cc61c5 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-07 11:00:31 -05:00
Stefan Podkowinski f28409bb97 Use dedicated thread for sending JMX notifications 
patch by Stefan Podkowinski; reviewed by yukim for CASSANDRA-12146
 2016-07-07 10:59:44 -05:00
Sylvain Lebresne a006f577bd Merge branch 'cassandra-3.0' into cassandra-3.9 
* cassandra-3.0:
  Don't ignore deletion info in sstable on reverse queries
 2016-07-07 12:59:34 +02:00
Sylvain Lebresne 76e68e9b49 Don't ignore deletion info in sstable on reverse queries 
patch by Sylvain Lebresne; reviewed by Aleksey Yeschenko for CASSANDRA-11733
 2016-07-07 12:54:52 +02:00
Sylvain Lebresne 376dae2683 Merge branch 'cassandra-3.0' into cassandra-3.9 
* cassandra-3.0:
  NPE when trying to remove purgable tombstones from result
 2016-07-07 12:50:26 +02:00
Sylvain Lebresne 30f5d44d8c Merge commit 'ef18a17' into cassandra-3.0 
* commit 'ef18a17':
  NPE when trying to remove purgable tombstones from result
 2016-07-07 12:50:03 +02:00
mck ef18a1768a NPE when trying to remove purgable tombstones from result 
patch by mck; reviewed by Sylvain Lebresne for CASSANDRA-12143
 2016-07-07 12:49:12 +02:00
Yuki Morishita 59ee46e55a Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-06 12:34:22 -05:00
Yuki Morishita 778f2a46e2 Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-06 12:33:54 -05:00
Paulo Motta 00e7ecf139 Improve streaming synchronization and fault tolerance 
Patch by Paulo Motta; Reviewed by yukim for CASSANDRA-11414
 2016-07-06 12:32:39 -05:00
Sylvain Lebresne 9ed3b42d3b Merge commit '43c741e251102bf5651ff8aa1b5ca078eb0ddc0b' into cassandra-3.0 
* commit '43c741e251102bf5651ff8aa1b5ca078eb0ddc0b':
  Range tombstones that are masked by row tombstones should not be written out
 2016-07-06 14:39:52 +02:00
Sylvain Lebresne 43c741e251 Merge branch 'cassandra-2.1' into cassandra-2.2 
* cassandra-2.1:
  Range tombstones that are masked by row tombstones should not be written out
 2016-07-06 14:39:13 +02:00
Nachiket Patil 98f5f77bb3 Range tombstones that are masked by row tombstones should not be written out 
patch by Nachiket Patil; reviewed by Sylvain Lebresne for CASSANDRA-12030
 2016-07-06 14:35:10 +02:00
Sam Tunnicliffe 5ad17634a1 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-06 12:10:41 +01:00
Sam Tunnicliffe dd05e46f0c Avoid potential race when rebuilding CFMetaData.columnMetadata 
Patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-12098
 2016-07-06 12:08:22 +01:00
Marcus Eriksson 262cd38b01 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-06 10:11:29 +02:00
Marcus Eriksson 73c71672bd Merge branch 'cassandra-2.2' into cassandra-3.0 2016-07-06 10:11:21 +02:00
Marcus Eriksson d5a15e45b0 fix flapping DTCS test 2016-07-06 10:11:13 +02:00
Marcus Eriksson 574e8df207 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-06 08:08:42 +02:00
Marcus Eriksson bc23632f20 Avoid missing sstables when getting the canonical sstables 
Patch by marcuse; reviewed by Stefania Alborghetti for CASSANDRA-11996
 2016-07-06 07:57:24 +02:00
Marcus Eriksson 5b0566a70f Always select the live sstables when getting sstables in bounds 
Patch by marcuse; reviewed by benedict for CASSANDRA-11944
 2016-07-06 07:52:28 +02:00
Stefania Alborghetti 78f077de07 Revert "Update to Netty 4.0.37" 
This reverts commit e8d7fe8a28.
 2016-07-06 12:58:06 +08:00
Tyler Hobbs 32825a9b4d Merge branch 'cassandra-3.0' into cassandra-3.9 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ReadResponse.java
 2016-07-05 11:47:34 -05:00
Tyler Hobbs 2217695166 Apply Thrift ordering to legacy remote response where needed 
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-12123
 2016-07-05 11:45:45 -05:00
Carl Yeksigian 237330ad20 Merge branch 'cassandra-3.0' into cassandra-3.9 2016-07-05 12:25:09 -04:00
Carl Yeksigian a9a6e5fb16 Add test for multiple non primary-keys in MV 
Patch by Carl Yeksigian; reviewed by Sylvain Lebresne for CASSANDRA-12044
 2016-07-05 11:44:18 -04:00
Sylvain Lebresne 3c84361765 Merge commit '3c1653f479faddf000fd818b7c578810c644ae02' into cassandra-2.2 
* commit '3c1653f479faddf000fd818b7c578810c644ae02':
  Improve digest calculation in the presence of overlapping tombstones.
 2016-07-05 11:25:48 +02:00
Branimir Lambov 3c1653f479 Improve digest calculation in the presence of overlapping tombstones. 
Patch by Branimir Lambov; reviewed by Sylvain Lebresne for
CASSANDRA-11349
 2016-07-05 11:24:36 +02:00
Sylvain Lebresne f8cf5b5b6f Merge branch 'cassandra-3.0' into cassandra-3.9 
* cassandra-3.0:
  Improve digest calculation in the presence of overlapping tombstones.
 2016-07-05 11:23:32 +02:00
Sylvain Lebresne d95d8a915b Merge commit '9199a29f6f3394abb75840234474fe858fb644b7' into cassandra-3.0 
* commit '9199a29f6f3394abb75840234474fe858fb644b7':
  Improve digest calculation in the presence of overlapping tombstones.
 2016-07-05 11:23:13 +02:00
Sylvain Lebresne 9199a29f6f Merge commit '408066c57a66e0d5a6691af1695742ef49786bf2' into cassandra-2.2 
* commit '408066c57a66e0d5a6691af1695742ef49786bf2':
  Improve digest calculation in the presence of overlapping tombstones.
 2016-07-05 11:22:36 +02:00
Branimir Lambov 408066c57a Improve digest calculation in the presence of overlapping tombstones. 
Patch by Branimir Lambov; reviewed by Sylvain Lebresne for
CASSANDRA-11349
 2016-07-05 11:17:37 +02:00
Sam Tunnicliffe cb0d1ca451 Various fixes to SASI tests 
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-12130
 2016-07-05 10:12:41 +01:00
Pavel Yaskevich 7107646ace Fix SASI PREFIX search in CONTAINS mode with partial terms 
patch by doanduyhai; reviewed by xedin for CASSANDRA-12073
 2016-07-04 21:24:20 -07:00