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

4828 Commits

Author SHA1 Message Date
Aleksey Yeschenko a4bea74aeb Support more concurrent requests in native protocol 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7231
 2014-05-29 18:08:37 +03:00
Sylvain Lebresne ef41567fa0 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2014-05-29 12:54:33 +02:00
Sylvain Lebresne 975145c277 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-05-29 12:49:19 +02:00
Sylvain Lebresne 7bbeb5aa2d Fix bug with some IN queries missing results 
patch by slebresne; reviewed by thobbs for CASSANDRA-7105
 2014-05-29 12:48:42 +02:00
Sylvain Lebresne 0932ed670c Tuple types 
patch by slebresne; reviewed by thobbs for CASSANDRA-7248
 2014-05-29 11:33:11 +02:00
Mikhail Stepura 3391b99a0b cqlsh: Handle collections embedded into UDTs correctly. 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7267
 2014-05-28 15:14:25 -07:00
Tyler Hobbs 5767757abc Fix DataOutputTest on Windows 
Patch by Ala' Alkhaldi; review by Joshua McKenzie for CASSANDRA-7265
 2014-05-28 16:43:26 -05:00
Aleksey Yeschenko 929eaa75e8 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-28 23:26:17 +03:00
Aleksey Yeschenko a37482144f CHANGES.txt whitespace 2014-05-28 23:22:55 +03:00
Aleksey Yeschenko 35efdc1e39 Add authentication support to shuffle 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-6484
 2014-05-28 23:19:54 +03:00
Brandon Williams 999bee7951 remove duplicate changes entry 2014-05-28 14:39:03 -05:00
Jake Luciani e9e91d7b50 Handle overlapping multislices in thrift and cql 
Patch by pcmanus and tjake; reviewed by tjake for CASSANDRA-7279
 2014-05-28 13:14:43 -04:00
Jake Luciani 7f63b1f958 Backport MultiSliceRequest 
Patch by Ed Capriolo; Reviewed by tjake for CASSANDRA-7027
 2014-05-28 12:50:35 -04:00
Marcus Eriksson 5b3144905f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-28 07:45:24 +02:00
Marcus Eriksson 54618a1b3e Make sure we don't try to compact already compacting sstables in HHOM 
Patch by marcuse; reviewed by jbellis for CASSANDRA-7288
 2014-05-28 07:43:47 +02:00
Marcus Eriksson 86b6ec5299 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
 2014-05-27 10:43:50 +02:00
Marcus Eriksson 367c741931 Add option to do more aggressive tombstone compaction. 
Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-6563
 2014-05-27 10:39:17 +02:00
Marcus Eriksson 8602fe8ce8 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-05-27 10:29:03 +02:00
Marcus Eriksson 9376fddccf Copy compaction options to make sure they are reloaded. 
Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-7290
 2014-05-27 10:24:48 +02:00
Patrick McFadin 6faf80c9d2 cqlsh: always emphasize the partition key in DESC output 
patch by Patrick McFadin; reviewed by Aleksey Yeschenko for
CASSANDRA-7274
 2014-05-25 18:14:39 +03:00
Sylvain Lebresne ca7e9d5c49 Support nul/non-existant fields in UDT 
patch by slebresne; reviewed by iamaleskey for CASSANDRA-7206
 2014-05-23 18:56:29 +02:00
Sylvain Lebresne dfcb73426c Fix IllegalArgumentException in CqlStorage 
patch by slebresne; reviewed by driftx for CASSANDRA-7287
 2014-05-23 18:01:58 +02:00
Sylvain Lebresne 028f539eaa Fix broken paging state with prepared statement 
patch by slebresne; reviewed by thobbs for CASSANDRA-7120
 2014-05-23 09:33:25 +02:00
Tyler Hobbs bf5219000b Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/Lists.java
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/Relation.java
	src/java/org/apache/cassandra/cql3/ResultSet.java
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/Restriction.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2014-05-22 14:19:42 -05:00
Tyler Hobbs 43496384d4 Support multi-row selects within a partition using IN 
Patch by Tyler Hobbs; review by Sylvain Lebresne for CASSANDRA-6875
 2014-05-22 14:04:48 -05:00
Sylvain Lebresne 1147ee3a81 Use prepared statement internally 
patch by slebresne; reviewed by mishail for CASSANDRA-6975
 2014-05-22 14:46:01 +02:00
Sylvain Lebresne 6127f85670 Fix potential ClassCastException in HintedHandoffManager 
patch by slebresne; reviewed by benedict for CASSANDRA-7284
 2014-05-22 12:33:44 +02:00
Jonathan Ellis 0fdf2ddbf0 Add tab-completion to debian nodetool packaging 
patch by Cyril Scetbon; reviewed by mshuler for CASSANDRA-6421
 2014-05-21 17:23:33 -05:00
Mikhail Stepura a3effe6698 Support new UDT serialization format for CQLSH 
patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7261
 2014-05-21 13:27:55 -07:00
Jonathan Ellis e00878d955 Change concurrent_compactors defaults 
patch by jbellis; reviewed by bes for CASSANDRA-7139
 2014-05-21 13:11:16 -05:00
Sylvain Lebresne e024a1cc2b Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
 2014-05-21 17:49:40 +02:00
Sylvain Lebresne 2635632270 Add missing iso8601 patterns for date strings 
patch by chander; reviewed by slebresne for CASSANDRA-6973
 2014-05-21 17:29:12 +02:00
Sylvain Lebresne 484d281694 Fix flapping RecoveryManagerTest 
patch by benedict; reviewed by jbellis for CASSANDRA-7084
 2014-05-21 11:48:21 +02:00
Sylvain Lebresne ca213ccdc0 Invalidate key cache on table drop 
patch by thobbs; reviewed by slebresne for CASSANDRA-6525
 2014-05-21 11:44:50 +02:00
Sylvain Lebresne 94f25ce159 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2014-05-21 11:36:18 +02:00
Sylvain Lebresne 20e058b2bd Fix 2ndary index queries with DESC clustering order 
patch by slebresne; reviewed by thobbs for CASSANDRA-6950
 2014-05-21 11:29:42 +02:00
Marcus Eriksson 7abd76e456 Fix nodetool netstats 
Patch by marcuse; reviewed by JoshuaMcKenzie for CASSANDRA-7270
 2014-05-21 08:11:58 +02:00
Sylvain Lebresne db9ef0b6db Change serialization format for UDT 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-7209
 2014-05-20 18:29:52 +02:00
Brandon Williams b9802ffbc4 Always reallocate buffers with HSHA. 
Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285
 2014-05-19 14:01:14 -05:00
Brandon Williams e141694e2b Always reallocate buffers with HSHA. 
Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285
 2014-05-19 13:58:16 -05:00
Marcus Eriksson 518c3cf616 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
 2014-05-19 14:32:54 +02:00
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
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
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