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

3307 Commits

Author SHA1 Message Date
Aleksey Yeschenko c70740fbc4 Merge branch 'cassandra-1.2' into trunk 2013-05-15 16:07:46 +03:00
Aleksey Yeschenko 384c27c356 cqlsh: fix DESCRIBE after case insensitive USE 
patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5567
 2013-05-15 16:06:31 +03:00
Brandon Williams 42dc743d61 Merge branch 'cassandra-1.2' into trunk 2013-05-14 14:09:22 -05:00
Brandon Williams 14139455a5 sstablescrub respects MAX_HEAP_SIZE 
Patch by Mina Naguib, reviewed by brandonwilliams for CASSANDRA-5562
 2013-05-14 14:08:12 -05:00
Jonathan Ellis 0254774719 Merge branch 'cassandra-1.2' into trunk 2013-05-14 13:34:04 -05:00
Jonathan Ellis 3950de9e83 make BytesToken.toString only return hex bytes 
patch by Juraj Sustek; reviewed by jbellis for CASSANDRA-5566
 2013-05-14 13:33:57 -05:00
Yuki Morishita 174103386c Merge branch 'cassandra-1.2' into trunk 2013-05-13 21:00:21 -05:00
Yuki Morishita 11b0cfbe71 revert CASSANDRA-5523 2013-05-13 20:53:57 -05:00
Jonathan Ellis 3b41d21d9b Ensure that submitBackground enqueues at least one task 
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-5554
 2013-05-13 13:45:10 -05:00
Jonathan Ellis 740e344c7f Ensure that submitBackground enqueues at least one task 
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-5554
 2013-05-13 13:44:40 -05:00
Dave Brosius 31d991a255 don't create empty RowMutations in CommitLogReplayer 
patch by jbellis reviewed by dbrosius for (CASSANDRA-5541)
 2013-05-13 14:29:46 -04:00
Dave Brosius 3683d621b1 Merge branch 'cassandra-1.2' into trunk 2013-05-13 14:19:49 -04:00
Dave Brosius 56927973fe add nodetool enablebackup/disablebackup 
patch by pmargolin reviewed by dbrosius for CASSANDRA-5556
 2013-05-13 14:12:19 -04:00
Sylvain Lebresne 3e2b4b9612 Merge branch 'cassandra-1.2' into trunk 2013-05-13 16:35:12 +02:00
Sylvain Lebresne f91d320afd Fix changelog 2013-05-13 16:32:19 +02:00
Sylvain Lebresne f80d17da97 Merge branch 'cassandra-1.1' into cassandra-1.2 2013-05-13 16:31:46 +02:00
Sylvain Lebresne c5dc0292e0 Backport #5551 to 1.1 2013-05-13 16:31:22 +02:00
Sylvain Lebresne 49a7311f5f Merge branch 'cassandra-1.2' into trunk 2013-05-13 12:13:05 +02:00
Sylvain Lebresne 2e2dd48ff9 Fix intersection with Bound computation 
patch by wy96f; reviewed by slebresne for CASSANDRA-5551
 2013-05-13 12:11:08 +02:00
Jonathan Ellis 738b127b0f add 3997 to CHANGES 2013-05-10 12:16:26 -05:00
Jonathan Ellis 156fb112dc merge from 1.2 2013-05-09 17:41:41 -05:00
Jonathan Ellis 95cf9a5f0d fix 2i updates with indentical values and timestamps 
patch by Sam Tunnicliffe; reviewed by jbellis for CASSANDRA-5540
 2013-05-09 17:39:38 -05:00
Jonathan Ellis ce6429dc62 Merge branch 'cassandra-1.2' into trunk 2013-05-08 17:14:52 -05:00
Jonathan Ellis 6db71b29d7 whitespace 2013-05-08 16:37:14 -05:00
Jonathan Ellis a9bd531bc9 Single-pass compaction 
patch by jbellis; reviewed by marcuse for CASSANDRA-4180
 2013-05-07 14:21:23 -05:00
Aleksey Yeschenko 08df0b8604 Add alias support to SELECT statement 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5075
 2013-05-06 23:11:52 +03:00
Sylvain Lebresne 32c3b6e526 Merge branch 'cassandra-1.2' into trunk 2013-05-06 09:16:07 +02:00
Sylvain Lebresne 59bd0e7169 Fix Ec2Snitch regression introduced by CASSANDRA-5171 
patch by vijay2win; reviewed by driftx and arya for CASSANDRA-5432
 2013-05-06 09:14:34 +02:00
Sylvain Lebresne 45e6d912cc Fix repair hanging silently on an unexpected error 
patch by yukim; reviewed by slebresne for CASSANDRA-5229
 2013-05-06 09:07:31 +02:00
Marcus Eriksson ec5f416a46 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	build.xml
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
	test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
 2013-05-04 20:42:25 +02:00
Marcus Eriksson ac1d7ee1c7 Merge branch 'cassandra-1.1' into cassandra-1.2 
Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
 2013-05-04 20:31:50 +02:00
Marcus Eriksson fe910e6c90 fsync leveled manifest to avoid it getting corrupt 
Patch by marcuse, reviewed by jbellis and carlyeks for CASSANDRA-5535
 2013-05-04 20:28:03 +02:00
Aleksey Yeschenko b505b90a88 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	NEWS.txt
	doc/cql3/CQL.textile
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
 2013-05-03 19:38:41 +03:00
Sylvain Lebresne de98541708 Update version for 1.2.5 release 2013-05-03 17:54:04 +02:00
Aleksey Yeschenko 64c0d1e7d5 Add custom secondary index support to CQL3 
patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5484
 2013-05-03 17:59:33 +03:00
Jonathan Ellis bb32936b64 update NEWS 2013-05-02 13:22:34 -05:00
Jonathan Ellis e26b726ccb Removed token range bisection 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5518
 2013-05-01 14:44:33 -05:00
Aleksey Yeschenko 5917281000 Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	bin/cqlsh
	src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
 2013-05-01 20:03:26 +03:00
Aleksey Yeschenko 24f6387bcd cqlsh: add CLUSTERING ORDER BY support to DESCRIBE 
patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-5528
 2013-05-01 19:42:55 +03:00
Sylvain Lebresne 199cd0b785 Disallow renaming columns one at a time when when the table don't have CQL3 metadata yet 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5531
 2013-05-01 16:23:40 +02:00
Jake Luciani 5dad16045e Swap THshaServer for TThreadedSelectorServer 
Patch by tjake; reviewed by jbellis for CASSANDRA-5530
 2013-05-01 09:58:58 -04:00
Jonathan Ellis 74f37b5a39 ghetto merge from 1.2 2013-04-30 15:51:34 -05:00
Jonathan Ellis 2b0797b24e fix compaction throttling bursty-ness 
patch by yukim and jbellis for CASSANDRA-4316
 2013-04-30 15:36:57 -05:00
Yuki Morishita a9d97e381e Merge branch 'cassandra-1.2' into trunk 
Conflicts:
	src/java/org/apache/cassandra/service/ActiveRepairService.java
 2013-04-30 14:29:43 -05:00
Yuki Morishita fbc4bbcecf Prevent repair when protocol version does not match patch by yukim; reviewed by jbellis for CASSANDRA-5523 2013-04-30 14:27:34 -05:00
Jonathan Ellis 1227751661 add read support for CL.SERIAL 
patch by jbellis; reviewed by slebresne for CASSANDRA-5441
 2013-04-30 12:42:26 -05:00
Jonathan Ellis 011e8a0602 Merge branch 'cassandra-1.2' into trunk 2013-04-29 16:55:43 -05:00
Jonathan Ellis a44a3d4b86 unbork changelog entries for merges from 1.1.9 and 1.1.10 2013-04-29 16:55:29 -05:00
Sylvain Lebresne 6a5495afe4 Merge branch 'cassandra-1.2' into trunk 2013-04-29 09:32:13 +02:00
Sylvain Lebresne 7eae57aeac Fix use of CQL3 functions with descending clustering order 
patch by slebresne; reviewed by iamaleksey for CASSANDRA-5472
 2013-04-29 09:29:22 +02:00