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

12800 Commits

Author SHA1 Message Date
Marcus Eriksson e3a88b9f80 Increase compaction visibility 
Patch by cnlwsu; reviewed by marcuse for CASSANDRA-7242.
 2014-05-19 14:30:35 +02:00
Sylvain Lebresne 66a3da0e2f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-19 12:33:06 +02:00
Sylvain Lebresne 86632a1339 Changelog fix 2014-05-19 12:32:15 +02:00
Sylvain Lebresne 590b3b23ac Validate method for CollectionType 
patch by slebresne; reviewed by thobbs for CASSANDRA-7208
 2014-05-19 12:28:49 +02:00
Sylvain Lebresne 33bd8c207a Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/ColumnCondition.java
	src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/Selection.java
	src/java/org/apache/cassandra/db/marshal/CollectionType.java
	src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
	src/java/org/apache/cassandra/db/marshal/ListType.java
	src/java/org/apache/cassandra/db/marshal/MapType.java
	src/java/org/apache/cassandra/db/marshal/SetType.java
	src/java/org/apache/cassandra/serializers/CollectionSerializer.java
	src/java/org/apache/cassandra/serializers/ListSerializer.java
	src/java/org/apache/cassandra/serializers/MapSerializer.java
	src/java/org/apache/cassandra/serializers/SetSerializer.java
	test/unit/org/apache/cassandra/db/marshal/CollectionTypeTest.java
 2014-05-19 12:26:32 +02:00
Sylvain Lebresne 9d06ea6f14 Fixup for CASSANDRA-6914: null handling, ... 
patch by slebresne; reviewed by thobbs for CASSANDRA-7155
 2014-05-19 10:51:31 +02:00
Dave Brosius 07dc6b5cc9 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-17 20:43:50 -04:00
Dave Brosius 58dc488895 allow num_tokens to be unspecified, as described in the yaml 2014-05-17 20:43:06 -04:00
Dave Brosius 4ad6db380a Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-17 17:03:05 -04:00
Peter Lin eaa78e0857 Improve javadoc for KeysIndex 
patch by plin reviewed by dbrosius for cassandra-7253
 2014-05-17 17:00:11 -04:00
Dave Brosius 3b8482a016 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-17 12:48:58 -04:00
Benedict 7eefbf8b9d reduce garbage on codec flag deserialization 
patch by belliottsmith reviewed by dbrosius for cassandra-7244
 2014-05-17 12:44:03 -04:00
Sylvain Lebresne c045690b12 Limit user types to the keyspace they are defined in 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6643
 2014-05-16 15:56:05 +02:00
Mikhail Stepura ada8f12575 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-15 20:27:24 -07:00
Lyuben Todorov 5d187fb82a Backported CASSANDRA-5818 to cassandra-2.0 
patch by Lyuben Todorov; reviewed by Mikhail Stepura
 2014-05-15 20:22:58 -07:00
Mikhail Stepura b9c9039a19 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-15 19:28:47 -07:00
Yasuharu Goto a01eb5a945 Add --resolve-ip option to 'nodetool ring' 
patch by Yasuharu Goto; revised by Mikhail Stepura for CASSANDRA-7210
 2014-05-15 19:27:01 -07:00
Marcus Eriksson 33bc1e8f8e Followup to 6916, don't try to snapshot readers that are opened early. 
Patch by benedict; reviewed by marcuse for CASSANDRA-6916.
 2014-05-15 08:13:19 +02:00
Dave Brosius 2a77695f3f fix CHANGES 2014-05-14 20:45:22 -04:00
Daniel Shelepov c549613165 remove unused classes 
patch by dshelepov reviewed by dbrosius for cassandra-7197
 2014-05-14 20:39:06 -04:00
Brandon Williams 6be62c2c46 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-14 17:36:48 -05:00
Brandon Williams 569177fb9e Support authentication in CqlRecordReader 
Patch by Jacek Lewandowski, reviewed by Alex Liu for CASSANDRA-7221
 2014-05-14 17:35:38 -05:00
Aleksey Yeschenko 92c38c0e6a Make batchlog replay asynchronous 
patch by Oleg Anastasyev; reviewed by Aleksey Yeschenko for
CASSANDRA-6134
 2014-05-15 01:13:09 +03:00
Brandon Williams e7b3deee64 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-14 14:33:29 -05:00
Brandon Williams b927f790af Fix pig tests. 
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6877
 2014-05-14 14:32:45 -05:00
Brandon Williams a680f721b0 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-14 13:27:34 -05:00
Brandon Williams 2092da0974 Exclude xerces to fix hadoop build issue. 
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6877
 2014-05-14 13:26:18 -05:00
Jake Luciani c6efd35cf2 Add server side batching to native transport 
Patch by bes; reviewed by tjake for CASSANDRA-5663
 2014-05-14 13:10:32 -04:00
Jonathan Ellis 8a5365ebd5 merge from 2.0 2014-05-14 10:01:31 -07:00
Jonathan Ellis 541a20dbb2 Close java driver Cluster in CQLRR.close 
patch by Mariusz Kryński; reviewed by jbellis for CASSANDRA-7228
 2014-05-14 09:55:55 -07:00
Jonathan Ellis 1927d5ec72 Add PowerShell Windows launch scripts 
patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7001
 2014-05-14 09:09:51 -07:00
Jake Luciani 4ee372106f Followup commit to fix maven deps on boundary's NBHM for CASSANDRA-7128 2014-05-14 09:02:45 -04:00
Jake Luciani 0f977c597a Fix CellName comparison bugs 
Patch by tjake; reviewed by bes for CASSANDRA-7227
 2014-05-14 08:37:34 -04:00
Jake Luciani 50c18fd403 Fix ColumnFamilyStoreTest, NativeCellTest, SSTableMetadataTest unit tests on 2.1 
Patch by Benedict Elliott Smith; reviewed by Michael Shuler for CASSANDRA-7201
 2014-05-13 22:15:25 -04:00
Brandon Williams fc59801a0c I love CHANGES.txt 2014-05-13 10:59:52 -05:00
Aleksey Yeschenko c6bed82702 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	examples/triggers/src/org/apache/cassandra/triggers/InvertedIndex.java
 2014-05-13 17:51:34 +03:00
Anthony Cozzie 820f0eb60b Fix the InvertedIndex trigger example 
patch by Anthony Cozzie; reviewed by Aleksey Yeschenko for CASSANDRA-7211
 2014-05-13 17:46:21 +03:00
Sylvain Lebresne 09feef30bc Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-13 14:06:10 +02:00
Sylvain Lebresne 256109c34f Quiet the unsafe use warning during build 2014-05-13 14:05:54 +02:00
Sylvain Lebresne 2e456f56a6 Remove (buggy) duplicate call to Frame.release 2014-05-13 10:18:59 +02:00
Marcus Eriksson 5a79f56316 Followup to CASSANDRA-6916 - only close bf if we have not opened early. 
Patch by benedict; reviewed by marcuse for CASSANDRA-6916.
 2014-05-13 10:08:54 +02:00
Dave Brosius 81bf2b0889 Allow c* to be shutdown in an embedded mode - make SlabPoolCleaner a daemon 
patch by dbrosius reviewed by jbellis for cassandra-5635
 2014-05-12 20:10:28 -04:00
Yuki Morishita 3fab711ee7 Follow up on CASSANDRA-7189 
fix hang when no CF name is given
 2014-05-12 16:47:23 -05:00
Yuki Morishita 359de196f1 Fix repair hang when given CF does not exist 
patch by yukim; reviewed by krummas for CASSANDRA-7189
 2014-05-12 12:36:35 -05:00
Dave Brosius 7b398c52d5 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-09 19:51:25 -04:00
Brent Theisen 453a07430c Fix IllegalStateException in CqlPagingRecordReader for inputPageRowSize 
patch by btheisen reviewed by dbrosius for cassandra-7198
 2014-05-09 19:45:53 -04:00
Jake Luciani e3dd88a8cd Work around netty offheap capacity check bug 
patch by tjake; reviewed by Mikhail Stepura for CASSANDRA-7196
 2014-05-09 16:39:48 -04:00
Brandon Williams 65a46265df Fix long where int needed in commitlog segment. 
Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-7199
 2014-05-09 13:28:27 -05:00
Yuki Morishita 7f3d07ac02 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-05-09 10:41:36 -05:00
Yuki Morishita 7484bd4191 Make StreamSession more thread safe 
patch by sankalp kohli; reviewed by yukim for CASSANDRA-7092
 2014-05-09 10:40:50 -05:00