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

10872 Commits

Author SHA1 Message Date
Aleksey Yeschenko 5fa6055107 Allow specifying custom secondary index options in CQL3 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6480
 2014-01-07 18:03:37 +03:00
Marcus Eriksson ae0a1e0f5a Verify that the keyspace exists in describeRing and print nicer error message in BulkLoader. 
Patch by marcuse, reviewed by thobbs for CASSANDRA-6529
 2014-01-07 06:48:08 +01:00
Aleksey Yeschenko 95f1b5f298 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/db/BatchlogManager.java
 2014-01-05 03:18:49 +03:00
Aleksey Yeschenko 2a7c20ea91 Add ability to throttle batchlog replay 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6550
 2014-01-05 03:06:47 +03:00
Aleksey Yeschenko be9a70eb3b Move *PropDefs to o.a.c.cql3.statements 2014-01-04 03:08:20 +03:00
Eric Evans d278b7c2d5 do not ignore user configured JAVA_HOME 
Patch by eevans; reviewed by Michael Shuler for CASSANDRA-6131
 2014-01-02 17:05:43 -06:00
Sylvain Lebresne 5284e129f6 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/service/ClientState.java
 2014-01-02 14:18:29 +01:00
Sylvain Lebresne 7171b7a2c6 Validate CF existence on execution for prepared statement 
patch by aholmber; reviewed by slebresne for CASSANDRA-6535
 2014-01-02 14:15:06 +01:00
Yuki Morishita 4ed2234078 Delete unfinished compaction sstables incrementally 
patch by thobbs; reviewed by yukim for CASSANDRA-6086
 2013-12-30 13:48:09 -06:00
Brandon Williams c5ca8de4df Allow nodetool to optionally resolve hostnames. 
Patch by Daneel S. Yaitskov, reviewed by brandonwilliams for
CASSANDRA-2238
 2013-12-30 09:53:13 -06:00
Brandon Williams fc9709cdfe Merge branch 'cassandra-1.2' into cassandra-2.0 2013-12-30 09:52:31 -06:00
Brandon Williams 2f63bbadfa Allow nodetool to optionally resolve hostnames. 
Patch by Daneel S. Yaitskov, reviewed by brandonwilliams for
CASSANDRA-2238
 2013-12-30 09:51:36 -06:00
Brandon Williams 604e31b609 Allow truncating hints from nodetool. 
Patch by Sankalp Kohli, reviewed by brandonwilliams for CASSANDRA-6158
 2013-12-30 08:17:50 -06:00
Jonathan Ellis bbc089125a Merge branch 'cassandra-1.2' into cassandra-2.0 2013-12-28 20:49:02 -06:00
Jonathan Ellis 3eef54097b make CM.Writer.close idempotent 2013-12-28 20:48:49 -06:00
Aleksey Yeschenko 0e0884f503 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 2013-12-28 20:58:55 +03:00
Aleksey Yeschenko 8a51a72ff0 shutdown() the compaction strategy in CFS.invalidate() 2013-12-28 20:56:50 +03:00
Jonathan Ellis 6a211f485f merge from 1.2 2013-12-28 00:17:16 -06:00
Jonathan Ellis ecbf0fd6f9 fsync compression metadata 
patch by jbellis; reviewed by Pavel Yaskevich for CASSANDRA-6531
 2013-12-28 00:16:27 -06:00
Jonathan Ellis dc2412243b comment 2013-12-27 16:57:46 -06:00
Eric Evans d56f8f2930 Update versioning for 2.0.4 release 2013-12-27 12:42:15 -06:00
Yuki Morishita 2111a20b4b Fix streaming older SSTable yields row tombstones 
patch by yukim; reviewed by jbellis for CASSANDRA-6527
 2013-12-26 15:52:03 -06:00
Jonathan Ellis 1365749e45 Merge branch 'cassandra-1.2' into cassandra-2.0 2013-12-26 10:56:08 -06:00
Jonathan Ellis f219e83b6a add .gitignore 
patch by Michael Shuler; reviewed by jbellis for CASSANDRA-4899
 2013-12-26 10:56:00 -06:00
Aleksey Yeschenko 03f4c92d14 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/thrift/ThriftValidation.java
 2013-12-22 20:09:18 +03:00
Aleksey Yeschenko a58a95ddbb Validate SliceRange start and finish lengths 
patch by Ben Bromhead; reviewed by Aleksey Yeschenko for CASSANDRA-6521
 2013-12-22 20:03:05 +03:00
Jonathan Ellis b5c9b498fe Allow removing snapshots of no-longer-existing CFs 
patch by Lyuben Todorov and Mikhail Stepura for CASSANDRA-6418
 2013-12-21 00:36:30 -06:00
Jonathan Ellis 142e13f340 add StorageService.stopDaemon 
patch by Lyuben Todorov; reviewed by Tyler Hobbs for CASSANDRA-4268
 2013-12-20 15:23:36 -06:00
lyubent 7bf14648ee add IRE for invalid CF supplied to get_count 
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5701
 2013-12-20 14:39:36 -06:00
Aleksey Yeschenko 9c17189b78 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
 2013-12-20 20:16:08 +03:00
Aleksey Yeschenko 9244923451 OCD follow up 2013-12-20 20:15:07 +03:00
Aleksey Yeschenko b1435ffd1d Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
	src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
	src/java/org/apache/cassandra/cql3/statements/ParsedStatement.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
 2013-12-20 20:14:07 +03:00
Aleksey Yeschenko b97c5233e1 Fix typo 2013-12-20 19:52:00 +03:00
Sylvain Lebresne 4d36bbfbbb Fix tests 2013-12-20 09:44:38 +01:00
Sylvain Lebresne a462083fc4 Fix potential assertion error in AbstractQueryPager.discardFirst 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6447
 2013-12-20 08:40:36 +01:00
Jonathan Ellis d8062cd823 merge from 1.2 2013-12-19 17:44:21 -06:00
Jonathan Ellis a4895c551f Don't allow null max_hint_window_in_ms 
patch by Nate McCall; reviewed by jbellis for CASSANDRA-6419
 2013-12-19 17:41:17 -06:00
Aleksey Yeschenko d9dac014ec Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2013-12-19 16:57:14 +03:00
Aleksey Yeschenko 38642c5b2c Don't drop local mutations without a trace 
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6510
 2013-12-19 16:48:10 +03:00
Jonathan Ellis 4a6f8a6610 add SSLTransportFactory.java 2013-12-18 18:01:28 -06:00
Jonathan Ellis 1b2a190379 add client encryption support to sstableloader 
patch by Sam Tunnicliffe; reviewed by Mikhail Stepura for CASSANDRA-6378
 2013-12-18 16:17:13 -06:00
Aleksey Yeschenko 21bb531460 Update docs, bump CQL3 version, correct CHANGES.txt for CASSANDRA-6395 2013-12-18 22:07:13 +03:00
Sylvain Lebresne 1727ea7733 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/ReadCallback.java
	src/java/org/apache/cassandra/service/StorageProxy.java
 2013-12-18 13:51:23 +01:00
Sylvain Lebresne b73178d862 Don't send confusing info on timeouts 
patch by slebresne; reviewed by jbellis for CASSANDRA-6491
 2013-12-18 13:48:26 +01:00
Sylvain Lebresne 7c32ffbbfa Fix infinite loop when paging queries with IN 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6464
 2013-12-18 11:18:30 +01:00
Sylvain Lebresne f7255b5ffa Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	CHANGES.txt
 2013-12-18 11:15:30 +01:00
Sylvain Lebresne 079f1e8116 Allow executing CREATE statement multiple times 
patch by slebresne; reviewed by jbellis for CASSANDRA-6471
 2013-12-18 11:13:54 +01:00
Jonathan Ellis 53af91e650 loop based on isClosed to accomodate SSL sockets 
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6349
 2013-12-17 16:38:32 -06:00
Jonathan Ellis 1d6052810d cleanup + debug logging 2013-12-17 16:37:05 -06:00
Jonathan Ellis ecec863d1f Fix size-tiered compaction in LCS L0 
patch by jbellis; reviewed by Marcus Eriksson and tested by Nikolai Grigoriev for CASSANDRA-9496
 2013-12-17 14:31:14 -06:00