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

12105 Commits

Author SHA1 Message Date
Jonathan Ellis c342965810 Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1 2014-03-13 13:06:28 -05:00
Jonathan Ellis 105dcdbf32 merge from 2.0 2014-03-13 13:06:07 -05:00
Jonathan Ellis a3b314908b merge from 1.2 2014-03-13 13:05:11 -05:00
Jonathan Ellis 52cf09dbac fix nodetool getsstables for blob PK 
patch by Nate McCall; reviewed by jbellis for CASSANDRA-6803
 2014-03-13 13:04:14 -05:00
Mikhail Stepura fab5509898 Minor tweaks for 'caching' option 2014-03-13 10:06:56 -07:00
Jonathan Ellis e3443145c7 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-13 12:01:13 -05:00
Jonathan Ellis 92b6d7a390 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-13 12:00:56 -05:00
Jonathan Ellis 5030d4215d add #2635 to CHANGES 2014-03-13 12:00:47 -05:00
Sylvain Lebresne 8a52f5af4f Move ByteBuffer functions to ByteBufferUtil and avoid duplication 2014-03-13 09:12:13 +01:00
Pavel Yaskevich 3e2c610577 Fix stress to do proper counter reads 
Patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6835
 2014-03-12 16:57:47 -07:00
Jonathan Ellis 948964b52f clean up Path and Cursor now that we know stack allocation doesn't work as expected 
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6692
 2014-03-12 18:40:06 -05:00
Jonathan Ellis 0cb1e3d248 apply BTree update function correctly 
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6692
 2014-03-12 18:30:04 -05:00
Jonathan Ellis 6041433108 prefer Iterators to CollectionUtils 2014-03-12 18:30:04 -05:00
Mikhail Stepura caf609cf6f Switch cqlsh from cassandra-dbapi2 to python-driver 
patch by Mikhail Stepura for CASSANDRA-6307; reviewed by Aleksey Yeschenko and Tyler Hobbs
 2014-03-12 15:02:14 -07:00
Jonathan Ellis 773dda7d54 Apply DONTNEED fadvise to commitlog segments 
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6759
 2014-03-12 16:48:48 -05:00
Tyler Hobbs 2e227eb8b5 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-03-12 16:42:29 -05:00
Sylvain Lebresne faffbf2fa3 Correctly compare BooleanType values other than 0 and 1 
Patch by Sylvain Lebresne, reviewed by Tyler Hobbs for CASSANDRA-6779
 2014-03-12 16:37:09 -05:00
Marcus Eriksson 019e338670 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-03-12 18:17:22 +01:00
Dmitrij Koniajev 05da045bbf fixed bug in CompactionManager.needsCleanup 
Patch by Dmitrij Koniajev, reviewed by marcuse for CASSANDRA-6845.
 2014-03-12 18:14:59 +01:00
Aleksey Yeschenko cf9ae5f9cd Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
 2014-03-12 19:58:35 +03:00
Aleksey Yeschenko 19444ea165 Restore expiring->deleted (cell) compaction optimization 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6844
 2014-03-12 19:37:40 +03:00
Jonathan Ellis 2e00ba8bfe add ChecksummedSequentialWriter 2014-03-12 10:29:42 -05:00
Jonathan Ellis 9405ce0e2d Switch CRC component to Adler and include it for compressed sstables 
patch by Marcus Eriksson, Radovan Zvoncek, and jbellis for CASSANDRA-4165
 2014-03-12 10:04:29 -05:00
Marcus Eriksson da444a6903 Update syntax for changing caching options. 
Patch by marcuse, reviewed by slebresne for CASSANDRA-6745.
 2014-03-12 14:06:05 +01:00
Aleksey Yeschenko ad5169d2f8 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
 2014-03-12 15:07:16 +03:00
Aleksey Yeschenko ed93ad4d8c Fix static counter columns 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6827
 2014-03-12 14:56:29 +03:00
Jonathan Ellis 6e0378249a merge from 2.0 2014-03-11 23:19:39 -05:00
Jonathan Ellis 31cbdfd7ba Fix accounting in FileCacheService to allow re-using RAR 
Patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6838
 2014-03-11 23:18:54 -05:00
Vijay e22d0b1b0f Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java
 2014-03-11 21:13:30 -07:00
Vijay fc9cad90d5 Merge branch 'cassandra-1.2' into cassandra-2.0 
Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java
 2014-03-11 20:32:07 -07:00
Vijay 91d220b350 nodetool no longer shows node joining (Also fix nodetool status) 
patch by Vijay; reviewed by driftx for CASSANDRA-6811
 2014-03-11 20:13:03 -07:00
Jonathan Ellis 8e360f80f4 Allow cassandra-stress to set compaction strategy options 
patch by Benedict Elliott Smith; reviewed by Russell Spitzer for CASSANDRA-6451
 2014-03-11 13:01:10 -05:00
Aleksey Yeschenko b4f262e1b0 Fix TriggersTest 2014-03-11 15:32:25 +03:00
Aleksey Yeschenko 362148dd23 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/service/StorageProxy.java
 2014-03-11 15:20:45 +03:00
Sam Tunnicliffe f7eca98a74 Fix trigger mutations when base mutation list is immutable 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6790
 2014-03-11 14:55:16 +03:00
Sam Tunnicliffe 553401d2fe Fix saving triggers to schema 
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6789
 2014-03-11 14:48:53 +03:00
Sylvain Lebresne 3f38361271 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-10 18:02:46 +01:00
Sylvain Lebresne dfd28d226a Fix CQL doc 2014-03-10 18:02:30 +01:00
Yuki Morishita 639ddace4d Move misplaced try catch block 
ActiveRepairService#getNeighbors can throw IllegalArgumentException,
not forceKeyspaceRepair.
 2014-03-10 10:29:10 -05:00
Vijay 7bc4f5dc32 nodetool no longer shows node joining 
patch by driftx; reviewed by Vijay for CASSANDRA-6811
 2014-03-09 19:15:57 -07:00
Vijay eb6a7b4285 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java
 2014-03-09 19:15:45 -07:00
Vijay 8d2c3fe673 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-09 14:00:17 -07:00
Vijay 57f6f9291d nodetool no longer shows node joining 
patch by driftx; reviewed by Vijay for CASSANDRA-6811
 2014-03-09 13:55:32 -07:00
Dave Brosius 5310f26d44 Merge branch 'cassandra-2.0' into cassandra-2.1 2014-03-08 22:22:31 -05:00
Dave Brosius 8f0952eb53 Merge branch 'cassandra-1.2' into cassandra-2.0 2014-03-08 21:50:22 -05:00
Dave Brosius 1e1129c61d fix typo in cfmbean comparator 2014-03-08 21:48:57 -05:00
Dave Brosius 89bccb6f7b avoid reinitiating gossip when nothings changed 2014-03-08 21:20:35 -05:00
Tyler Hobbs 893c11f545 Add broadcast_rpc_address option to cassandra.yaml 
Patch by Tyler Hobbs, reviewed by Jason Brown for CASSANDRA-5899
 2014-03-07 13:09:05 -06:00
Sylvain Lebresne 656edc529d Update version, news and license for 2.0.6 2014-03-07 13:20:03 +01:00
Sylvain Lebresne 7e0f7a0ff5 Merge branch 'cassandra-2.0' into cassandra-2.1 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/ColumnCondition.java
	src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
 2014-03-07 12:23:51 +01:00