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

15096 Commits

Author SHA1 Message Date
Jason Brown 1891240911 Merge branch 'cassandra-2.1' into trunk 2014-10-14 06:59:14 -07:00
Jason Brown b76dc97274 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-10-14 06:58:46 -07:00
Jason Brown cc8eeefe88 ninja fix to add null check on CommitLogArchiver startup 2014-10-14 06:57:52 -07:00
Jason Brown 25821864f7 Merge branch 'cassandra-2.1' into trunk 2014-10-14 06:34:26 -07:00
Jason Brown 4b7161da4a Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-10-14 06:33:54 -07:00
Jason Brown d828643f55 Create backup directories for commitlog archiving during startup 
patch by Jan Karlsson, reviewed by jasobrown for CASSANDRA-8111
 2014-10-14 06:31:20 -07:00
T Jake Luciani cd601294d1 Merge branch 'cassandra-2.1' into trunk 2014-10-14 08:59:11 -04:00
T Jake Luciani c5cbd58a3b Fix high memory use due to tracking reads on incrementally opened sstable readers 
Patch by Jake Luciani; reviewed by Jason Brown for (CASSANDRA-8066)
 2014-10-14 08:55:50 -04:00
Robert Stupp b94c87a181 Update java driver to 2.1.2 
patch by snazy; reviewed by slebresne for CASSANDRA-7692
 2014-10-14 09:49:25 +02:00
Aleksey Yeschenko a19c912801 Merge branch 'cassandra-2.1' into trunk 2014-10-14 00:25:56 +03:00
Aleksey Yeschenko 63cb95e012 Fix handling of EXECUTE with skip_metadata=false 
patch by Aleksey Yeschenko and Jake Luciani; reviewed by Sylvain
Lebresne
 2014-10-14 00:24:04 +03:00
Yuki Morishita 27fdf4211a Merge branch 'cassandra-2.1' into trunk 2014-10-13 12:11:40 -05:00
graham sanderson dee15a85c8 Fix spin loop in AtomicSortedColumns 
patch by graham sanderson and benedict; reviewed by yukim for
CASSANDRA-7546
 2014-10-13 11:57:54 -05:00
Sylvain Lebresne 9333f86cf0 Remove UDF-as-class functionality 
patch by snazy; reviewed by slebresne for CASSANDRA-8063
 2014-10-13 15:57:01 +02:00
Marcus Eriksson 0de0b8c037 Keep sstable level when bootstrapping 
Patch by marcuse; reviewed by iamaleksey for CASSANDRA-7460
 2014-10-13 11:24:00 +02:00
Aleksey Yeschenko e473769fbf Merge branch 'cassandra-2.1' into trunk 2014-10-11 21:44:44 +03:00
Aleksey Yeschenko 11e8dc1c1c Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
 2014-10-11 21:44:02 +03:00
Nicolas Douillet 7497399d0b Reduce totalBlockFor() for LOCAL_* consistency levels 
patch by Nicolas Douillet; reviewed by Aleksey Yeschenko for
CASSANDRA-8058
 2014-10-11 21:37:01 +03:00
Aleksey Yeschenko fa592a46bd Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/DefsTables.java
 2014-10-10 20:27:52 +03:00
Aleksey Yeschenko 42582ecd4b Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/DefsTables.java
 2014-10-10 20:02:30 +03:00
Aleksey Yeschenko 0393c30633 Fix merging schemas with re-dropped keyspaces 
patch by Aleksey Yeschenko; reviewed by Pavel Yaskevich for
CASSANDRA-7256
 2014-10-10 17:32:58 +03:00
Aleksey Yeschenko 47863bc32d Merge branch 'cassandra-2.1' into trunk 2014-10-10 16:57:38 +03:00
Aleksey Yeschenko e711929e74 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/CounterUpdateColumn.java
 2014-10-10 16:57:08 +03:00
Aleksey Yeschenko b7adf9810a Fix counters in supercolumns during live upgrades from 1.2 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7188
 2014-10-10 16:34:23 +03:00
Yuki Morishita 810c2d5fe6 improve concurrency of repair process 
patch by yukim; reviewed by krummas for CASSANDRA-6455
 2014-10-09 18:12:36 -05:00
Jake Luciani 5c35f9203f Merge branch 'cassandra-2.1' into trunk 2014-10-09 17:16:56 -04:00
Jake Luciani 1bae25ace7 Set SO_LINGER to 0 for netty 2014-10-09 17:16:17 -04:00
Sylvain Lebresne 985c510c4b Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/cql3/ResultSet.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2014-10-09 20:56:47 +02:00
Sylvain Lebresne 0249363e89 Fix requests with skipMetadata=false returning no metadata 
patch by slebresne; reviewed by thobbs for CASSANDRA-8054
 2014-10-09 20:41:32 +02:00
Joshua McKenzie 861c4cf2de Integrate Sigar library and add basic OS performance checks on startup 
Patch by Amit Kumar and Josh McKenzie; reviewed by tjake for (CASSANDRA-7838)
 2014-10-09 12:32:57 -04:00
Jonathan Ellis 7892b8355c Merge branch 'cassandra-2.1' into trunk 2014-10-09 11:10:29 -05:00
Jonathan Ellis 708adca7d7 Allow concurrent use of CQLBulkOutputFormat 
patch by Paul Pak; reviewed by Piotr Kolaczkowski for CASSANDRA-7776
 2014-10-09 11:10:20 -05:00
Joshua McKenzie 50734f2073 Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
 2014-10-09 10:44:35 -05:00
Joshua McKenzie 1452134707 Shutdown JVM on OOM 
patch by Josh McKenzie; reviewed by Aleksey Yeschenko for CASSANDRA-7507
 2014-10-09 10:40:57 -05:00
Aleksey Yeschenko a9bad890fe Merge branch 'cassandra-2.1' into trunk 2014-10-09 15:35:37 +03:00
Aleksey Yeschenko 5a33a9ad23 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-10-09 15:35:17 +03:00
Sam Tunnicliffe cced4ba15b Notify DT subscribers when a column family is truncated 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-8088
 2014-10-09 15:33:05 +03:00
Jonathan Ellis 2fe5b9a82d Merge branch 'cassandra-2.1' into trunk 2014-10-09 07:26:03 -05:00
Jonathan Ellis f92a457a30 merge from 2.0 2014-10-09 07:25:51 -05:00
Jonathan Ellis fc0bb1520f Add sanity check of $JAVA on startup 
patch by Robert Stupp; reviewed by Michael Shuler for CASSANDRA-7676
 2014-10-09 07:24:19 -05:00
Jake Luciani a848b08ceb Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/transport/Server.java
 2014-10-08 16:34:35 -04:00
Jake Luciani dacddd2668 Upgrade netty to 4.0.23 enable epoll 
Patch by tjake; reviewed by Jason Brown for CASSANDRA-7761
 2014-10-08 16:12:30 -04:00
Robert Stupp 816c905ae2 Support scripting languages for UDFs 
Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7526
 2014-10-08 15:06:55 -05:00
Tyler Hobbs 194a72f64d Merge branch 'cassandra-2.1' into trunk 2014-10-08 10:58:03 -05:00
Changsu Jiang 186e994e28 Don't duplicate sstables smaller than split size 
Patch by Changsu Jiang; reviewed by Tyler Hobbs for CASSANDRA-7616
 2014-10-08 10:56:59 -05:00
Dave Brosius 2d33cbff3c Merge branch 'cassandra-2.1' into trunk 2014-10-07 22:00:10 -04:00
Dave Brosius 38fe0cae51 custom exceptions should derive from Exception, not Throwable 
ninja reviewed by yukim
 2014-10-07 21:57:55 -04:00
Tyler Hobbs 5a249f26cc Merge branch 'cassandra-2.1' into trunk 
Conflicts:
	src/java/org/apache/cassandra/thrift/CassandraServer.java
 2014-10-07 18:07:36 -05:00
Tyler Hobbs 24c181ff75 Don't re-parse already prepared statements 
Patch by Benedict Elliot Smith and Tyler Hobbs; reviewed by Aleksey
Yeschenko for CASSANDRA-7923
 2014-10-07 17:59:43 -05:00
Aleksey Yeschenko 2e8ba0364d Merge branch 'cassandra-2.1' into trunk 2014-10-08 01:22:56 +03:00