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

2534 Commits

Author SHA1 Message Date
Nate McCall 5ba1f80a25 Provide visibility into prepared statements churn 
patch by Nate McCall; reviewed by Aleksey Yeschenko for CASSANDRA-7921
 2014-09-17 22:57:44 -07:00
Pavel Yaskevich 8026163dec Merge branch cassandra-2.0 into cassandra-2.1 2014-09-17 22:34:19 -07:00
Pavel Yaskevich 85aa794e1f Fix RowIndexEntry to report correct serializedSize 
patch by Pavel Yaskevich; reviewed by Aleksey Yeschenko for CASSANDRA-7948
 2014-09-17 22:19:21 -07:00
Aleksey Yeschenko ad89d4437b Follow up to CASSANDRA-7719 
patch by Aleksey Yeschenko; reviewed by Jake Luciani for CASSANDRA-7719
 2014-09-17 21:02:15 -07:00
Paulo Motta 125b4642db Make repair -pr work with -local 
patch by Paulo Motta; reviewed by yukim for CASSANDRA-7450
 2014-09-17 09:46:52 -05:00
Viju Kothuvatiparambil 90a2114551 Invalidate prepared stmts when ks or table is dropped 
Patch by Viju Kothuvatiparambil; review by Tyler Hobbs for
CASSANDRA-7566
 2014-09-16 17:46:53 -05:00
Tyler Hobbs 5fb32ba0c9 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-09-10 17:21:06 -05:00
Tyler Hobbs 72b25c7b98 Update Xss in test/cassandra.in.sh 
Done for CASSANDRA-7856
 2014-09-10 17:17:41 -05:00
Jake Luciani 12ac7eaf6f ninja fix test 2014-09-10 17:14:57 -04:00
Jake Luciani 42b91d4453 Add metrics to track usage of PreparedStatments 
patch by tjake; reviewed by carl for (CASSANDRA-7719)
 2014-09-10 16:18:32 -04:00
Sylvain Lebresne 9b9bf45b67 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/TreeMapBackedSortedColumns.java
	src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java
	src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
	src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java
 2014-09-09 18:39:29 -07:00
Sylvain Lebresne 2170ac4d39 Make CQLSSTableWriter sync within partitions 
patch by slebresne; reviewed by blerer for CASSANDRA-7360
 2014-09-09 18:18:12 -07:00
Mikhail Stepura 4f3a9c0bd7 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-09-06 17:09:03 -07:00
Mikhail Stepura 838151caba Fixed handling of non-intersecting ranges in anticompaction 
patch by Mikhail Stepura; reviewed by Yuki Morishita for CASSANDRA-7892
 2014-09-06 17:05:27 -07:00
Brandon Williams c6b509d751 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-09-05 08:14:17 -05:00
Brandon Williams cf76ba3d7e use correct native port in pig-test 2014-09-05 08:13:49 -05:00
Sylvain Lebresne d304b7cabd Fix test compilation 2014-09-05 10:59:05 +02:00
Sylvain Lebresne 350a94c3e3 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-09-05 10:50:46 +02:00
Sylvain Lebresne c81dc4bb23 Attempt to fix intermittent failure of DeleteTest 2014-09-05 10:50:24 +02:00
Tyler Hobbs aca77ec878 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	test/unit/org/apache/cassandra/cql3/MultiColumnRelationTest.java
 2014-09-03 13:05:03 -05:00
Sylvain Lebresne cf76ac66af Fix NPE when using collections in frozen tuple 
patch by omichallat; reviewed by slebresne for CASSANDRA-7869
 2014-09-03 19:01:20 +02:00
blerer aae9b9101c Don't allow mixed multi/single column relations 
Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-7711
 2014-09-03 10:38:58 -05:00
Brandon Williams e75fe5c4f5 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-09-02 12:48:30 -05:00
Sylvain Lebresne 02be0dedd9 Ability to freeze UDT 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-7857
 2014-09-02 10:41:48 +02:00
Mikhail Stepura e0d7c77f32 Allow triggers' names to be quoted identifiers 
patch by Mikhail Stepura; reviewed by Sylvain Lebresne for CASSANDRA-7847
 2014-09-01 12:19:17 -07:00
Aleksey Yeschenko 44a9d8cc68 Ninja s/substract/subtract 2014-08-27 18:16:36 +03:00
Jake Luciani ec0975304c Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-27 11:07:24 -04:00
Jake Luciani ce3fcbe5f8 Avoid recycling CL segments until all writes have been flushed for all keyspaces in segment 
Patch by belliottsmith; reviewed by tjake for CASSANDRA-7437
 2014-08-27 10:59:14 -04:00
Marcus Eriksson 5abd129fd9 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-27 13:07:16 +02:00
Marcus Eriksson 049762b3e4 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-08-27 13:06:54 +02:00
Marcus Eriksson 29befa180b Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnIndex.java
 2014-08-27 13:00:55 +02:00
Marcus Eriksson 7f9e9a8718 Track expired tombstones 
Patch by marcuse; reviewed by slebresne for CASSANDRA-7810
 2014-08-27 12:55:17 +02:00
Sylvain Lebresne 1be0bbf713 Add syntax to remove multiple elements from a map 
patch by blerer & slebresne; reviewed by iamaleksey for CASSANDRA-6599
 2014-08-27 11:00:09 +02:00
Tyler Hobbs 3d5f3a6596 Support non-equals conditions for LWT 
Patch by Tyler Hobbs; review by Sylvain Lebresne for CASSANDRA-6839
 2014-08-26 12:53:13 -05:00
Aleksey Yeschenko 6ce0456422 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-26 19:17:11 +03:00
Aleksey Yeschenko cb4bc2764c Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-08-26 19:13:17 +03:00
Marcus Eriksson fdf293dc15 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-26 15:37:10 +02:00
Marcus Eriksson d1f38cd27f Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
 2014-08-26 15:36:42 +02:00
Marcus Eriksson 61543b4c00 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
 2014-08-26 15:30:34 +02:00
Marcus Eriksson 1cf986301b Don't clear out range tombstones during compaction. 
Patch by rlow; reviewed by marcuse for CASSANDRA-7808
 2014-08-26 15:23:43 +02:00
Sylvain Lebresne e5bd1c38ea Remove unecessary imports 2014-08-25 10:55:42 +02:00
Sylvain Lebresne 591a2779a7 Add IF [NOT] EXISTS to create/drop trigger 
patch by blerer; reviewed by snazy for CASSANDRA-7606
 2014-08-25 10:10:28 +02:00
Tyler Hobbs 8d494c782d Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-20 11:14:13 -05:00
Tyler Hobbs d3450570ca Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/cql3/TypeTest.java
 2014-08-20 11:13:44 -05:00
Tyler Hobbs a4e108c40b Fix ReversedType.isCompatibleWith() 
Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7797
 2014-08-20 11:01:28 -05:00
Marcus Eriksson bd692ba744 Merge branch 'cassandra-2.1.0' into cassandra-2.1 2014-08-20 08:25:28 +02:00
Marcus Eriksson 39b81967f1 Merge branch 'cassandra-2.0' into cassandra-2.1.0 
Conflicts:
	CHANGES.txt
 2014-08-20 08:25:16 +02:00
Marcus Eriksson 76adf0e12e Throw EOFException if we run out of chunks in compressed file 
Patch by marcuse; reviewed by yukim for CASSANDRA-7664.
 2014-08-20 08:21:43 +02:00
Tyler Hobbs 7d7d529f6d Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-08-19 11:20:24 -05:00
Mikhail Stepura 141b9399d3 Merge branch 'cassandra-2.1.0' into cassandra-2.1 
Conflicts:
	test/unit/org/apache/cassandra/tools/SSTableImportTest.java
 2014-08-15 13:20:10 -07:00