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

17975 Commits

Author SHA1 Message Date
Sam Tunnicliffe 3818d30bd1 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-08 10:27:35 +01:00
Sam Tunnicliffe 0c0f1ff1b1 Defer initialization of default RoleManager until IAuthenticator is set 
Patch by Sam Tunnicliffe and Carl Yeksigian; reviewed by Jonathan Ellis
for CASSANDRA-10209
 2015-09-08 10:17:53 +01:00
Sylvain Lebresne 60e45c0ae8 Small optimizations of sstable index serialization 
patch by slebresne; reviewed by aweisberg for CASSANDRA-10232
 2015-09-08 10:39:34 +02:00
Marcus Eriksson f6695884e2 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-07 08:06:55 +02:00
Marcus Eriksson dae2045f0b Properly deserialize PrepareMessage for global repairs 
Patch by marcuse; reviewed by yukim for CASSANDRA-10265
 2015-09-07 08:04:52 +02:00
Marcus Eriksson 5335960764 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-07 08:01:29 +02:00
Marcus Eriksson 99c6ad659e Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-07 07:58:49 +02:00
Marcus Eriksson c2eb7bd7dd Merge branch 'cassandra-2.0' into cassandra-2.1 2015-09-07 07:56:58 +02:00
Marcus Eriksson 0bb32f0b63 Dont propagate exception in sstableexpiredblockers 
Patch by marcuse; reviewed by brandonwilliams for CASSANDRA-10240
 2015-09-07 07:53:11 +02:00
Stefan Podkowinski a7895cfb2c Support for both encrypted and unencrypted native transport connections 
patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-9590
 2015-09-05 18:23:10 +02:00
T Jake Luciani 17528910b8 bump versions 2015-09-04 19:11:39 -04:00
blerer 6dd2413f89 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-04 21:37:41 +02:00
blerer 464ca14aa8 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-04 21:35:19 +02:00
Paulo Motta acdbdc28c4 Make cqlsh handle CREATE KEYSPACE timeouts properly 
patch by Paulo Motta; reviewed by Benjamin Lerer for CASSANDRA-9689
 2015-09-04 21:28:25 +02:00
blerer 2e3727e3ff Allow range deletions in CQL 
patch by Benjamin Lerer; reviewed by Joshua McKenzie for CASSANDRA-6237
 2015-09-04 21:10:29 +02:00
Sylvain Lebresne 8f249a67d9 Fix test build 2015-09-04 17:30:41 +02:00
Blake Eggleston 9658ee9fac Fix some tests failure for CASSANDRA-9704 upgrade tests 
patch by bdeggleston; reviewed by slebresne for CASSANDRA-9893
 2015-09-04 17:05:21 +02:00
Benedict Elliott Smith c3bc85641b Fix return of 'columns()' for AbstractBTreeColumns 
patch by benedict & slebresne; reviewed by benedict & slebresne for CASSANDRA-10220
 2015-09-04 16:18:50 +02:00
Jonathan Ellis ab962202ae Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-04 09:18:04 -05:00
Stefania Alborghetti 25373e9945 refuse to decomission if not in state NORMAL 
patch by Jan Karlsson and Stefania for CASSANDRA-8741
 2015-09-04 09:17:50 -05:00
Jonathan Ellis 3f50519141 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-04 09:17:26 -05:00
Jonathan Ellis 5ec020490f Merge branch 'cassandra-2.0' into cassandra-2.1 2015-09-04 09:17:16 -05:00
Stefania Alborghetti 27754c0a41 refuse to decomission if not in state NORMAL 
patch by Jan Karlsson and Stefania for CASSANDRA-8741
 2015-09-04 09:15:56 -05:00
Stefania Alborghetti 5bc56c3e40 refuse to decomission if not in state NORMAL 
patch by Jan Karlsson and Stefania for CASSANDRA-8741
 2015-09-04 09:13:53 -05:00
T Jake Luciani c7557bdecd fix 2015-09-04 09:10:49 -04:00
Benedict Elliott Smith a22db5be2d ninja fix comments and remove unused method 2015-09-04 13:56:07 +01:00
Benedict Elliott Smith aa5762633a Improve efficiency of Row 
Removes need to store a Columns instance within a Row,
avoiding both the cost of merging and storing these.

Improves algorithmic efficiency of Rows.merge by performing
a straight forward linear merge on the present ColumnData.

Improves algorithmic efficiency of Rows.diff by utilising MergeIterator

patch by benedict; reviewed by marcus for CASSANDRA-10193
 2015-09-04 13:47:07 +01:00
Stefania Alborghetti ce63ccc842 Faster sequential IO (CASSANDRA-8630) 
Merge RandomAccessReader and NIODataInputStream class hierarchies
to share performance optimisation work across all readers.

patch by stefania; reviewed by ariel and benedict for CASSANDRA-8630
 2015-09-04 12:42:35 +01:00
Sylvain Lebresne 7c0bfe9922 Slightly better ColumnFilter.toString() 2015-09-04 11:33:43 +02:00
Sylvain Lebresne 24682d21d2 Fix backward compatibility issue due to AbstractBounds serialization bug 
patch by slebresne; reviewed by bdeggleston for CASSANDRA-9857
 2015-09-04 11:14:42 +02:00
Sylvain Lebresne f009272ba6 Fix startup error when upgrading nodes to 3.0 
patch by slebresne; reviewed by blambov for CASSANDRA-10136
 2015-09-04 11:11:42 +02:00
Carl Yeksigian dc5b268d08 Allow "IS NOT NULL" to be excluded for non-composite partition keys 
Patch by carlyeks; reviewed by tjake for (CASSANDRA-10147)
 2015-09-03 16:31:55 -04:00
Tyler Hobbs eb01654b95 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-03 15:05:29 -05:00
Tyler Hobbs 1f13528213 Merge branch 'cassandra-2.1' into cassandra-2.2 2015-09-03 15:04:48 -05:00
Tyler Hobbs fe80052571 Merge branch 'cassandra-2.0' into cassandra-2.1 2015-09-03 15:03:37 -05:00
Carl Yeksigian 517058febb Backport CASSANDRA-8013 to 2.0 
Fix AssertionError in RangeTombstone.diff()

Patch by Carl Yeksigian; reviewed by Tyler Hobbs for CASSANDRA-10144
 2015-09-03 14:59:07 -05:00
blerer cd5d03d2b7 Make naming for secondary indexes consistent 
patch by Benjamin Lerer; reviewed by Jake Luciani for CASSANDRA-10127
 2015-09-03 21:34:45 +02:00
Joshua McKenzie 8ebd590473 3.0 patch for CASSANDRA-10222 2015-09-03 13:52:29 -04:00
Joshua McKenzie f2923d4c83 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-03 13:50:17 -04:00
Joshua McKenzie 9b8e187029 Retry snapshot deletion after compaction and gc on Windows 
Patch by jmckenzie; reviewed by stefania for CASSANDRA-10222
 2015-09-03 13:49:43 -04:00
Joshua McKenzie e9c0e1787e Merge branch 'cassandra-2.2' into cassandra-3.0 
Conflicts:
	CHANGES.txt
 2015-09-03 12:42:04 -04:00
Joshua McKenzie e1fc0e0671 Fix failure to start with space in directory name on Windows 
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
 2015-09-03 12:39:43 -04:00
Paulo Motta 66b0e1d788 Fix SSTableLoaderTest on Windows 
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10210
 2015-09-02 14:20:00 -04:00
Sylvain Lebresne 6a86d221a5 Remove dead code 2015-09-02 17:22:53 +02:00
Jonathan Ellis 796b0f26a9 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-02 09:36:02 -05:00
Jonathan Ellis f7644f265a Revert "Defer initialization of default RoleManager until IAuthenticator is set" 
This reverts commit 0d2f4038fc.
 2015-09-02 09:35:45 -05:00
Stefania Alborghetti 53a177a915 Improve batchlog write path 
patch by Stefania Alborghetti; reviewed by Aleksey Yeschenko for
CASSANDRA-9673
 2015-09-02 08:43:42 +01:00
Jason Brown 5f02f202f8 Merge branch 'cassandra-2.2' into cassandra-3.0 2015-09-01 22:23:34 -07:00
Jason Brown 45dd5d178f Merge branch 'cassandra-2.1' into cassandra-2.2 
Conflicts:
	src/java/org/apache/cassandra/net/MessageDeliveryTask.java
 2015-09-01 22:23:04 -07:00
Jason Brown c457dce647 ninja-fix to make an EnumSet a static and final field, not an instance field. 2015-09-01 22:19:25 -07:00