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

3962 Commits

Author SHA1 Message Date
Jonathan Ellis f491265fc5 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1137777 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-20 20:54:24 +00:00
Sylvain Lebresne 3353a57d84 Move column creation logic into factory methods 
patch by stuhood; reviewed by slebresne for CASSANDRA-2679


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1137553 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-20 09:05:02 +00:00
Sylvain Lebresne 28610e4286 Merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1137552 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-20 09:03:06 +00:00
Sylvain Lebresne 33983738fa Fix compaction of the same sstable by multiple thread 
patch by slebresne; reviewed by jbellis for CASSANDRA-2769


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136904 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-17 15:00:21 +00:00
Jonathan Ellis dc76b2764a r/m last references to commons-collections 
patch by stuhood; reviewed by jbellis for CASSANDRA-2784

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136679 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-16 21:03:15 +00:00
Chris Goffinet 5040b21ef8 Updated CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136663 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-16 20:45:16 +00:00
Chris Goffinet 63fa8711a3 Fixed the ability to set compaction strategy in cli using create column family command 
patch by alanliang; reviewed by goffinet for CASSANDRA-2778


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136662 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-16 20:44:50 +00:00
Jonathan Ellis 7c3777c668 s/1.1/1.2/ for clhm pom 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136547 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-16 17:10:34 +00:00
Jonathan Ellis 35d9347bcc add missing src/java/org/apache/cassandra/utils/MergeIterator.java 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136514 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-16 16:10:09 +00:00
Jonathan Ellis 2b72987596 fix tests 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136472 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-16 15:00:04 +00:00
Jonathan Ellis d8b1fc3952 replace CollatingIterator, ReducingIterator with MergeIterator 
patch by stuhood; reviewed by jbellis for CASSANDRA-2062

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136287 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-16 04:24:33 +00:00
Sylvain Lebresne 2782e0beb4 Make AbstractBounds.normalize de-overlapp overlapping ranges 
patch by slebresne; reviewed by stuhood for CASSANDRA-2641


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136008 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-15 12:01:21 +00:00
Sylvain Lebresne 21bc3c217e Merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1136007 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-15 11:57:44 +00:00
Sylvain Lebresne 0cbc78e4b6 Merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135981 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-15 09:46:10 +00:00
Jonathan Ellis 45d1dc7d2a removed commitlog_rotation_threshold_in_mb configuration 
patch by Patricio Echague; reviewed by jbellis for CASSANDRA-2771

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135869 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-15 00:22:02 +00:00
Jonathan Ellis 5d0d5ddb21 edit cl space comments 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135811 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-14 21:43:42 +00:00
Jonathan Ellis 3de6720822 fix doubly-created file 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135810 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-14 21:40:44 +00:00
Jonathan Ellis 102546162a add commitlog_total_space_in_mb 
patch by Patricio Echague; reviewed by jbellis for CASSANDRA-2427

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135809 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-14 21:39:47 +00:00
Jonathan Ellis bc15e80453 backport #2766 from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1135638 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-14 15:16:04 +00:00
Sylvain Lebresne b602f6e2a5 Merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135443 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-14 09:47:30 +00:00
Sylvain Lebresne 11dfd28771 Merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135427 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-14 09:18:31 +00:00
Sylvain Lebresne 5dda04f238 Merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135402 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-14 08:16:43 +00:00
Jonathan Ellis a3e2926485 r/m binarymemtable 
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-2692

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135249 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-13 19:46:18 +00:00
Jonathan Ellis 56997214b6 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135244 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-13 19:40:21 +00:00
Jonathan Ellis aacdf52185 r/m drivers/ from generate-eclipse-files target 
patch by Kirk True for CASSANDRA-2764

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1135104 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-13 11:58:12 +00:00
Jonathan Ellis 2fa8f2fb7b r/m memtable flush setting from thrift as well 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1134577 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-11 12:13:12 +00:00
Jonathan Ellis e1a1ec5dbe r/m memtable_flush_after_mins 
patch by Patricio Echague; reviewed by jbellis for CASSANDRA-2427

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1134504 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-11 02:05:46 +00:00
Jonathan Ellis 9ae39872f2 excise mockito 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1134464 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-10 22:22:44 +00:00
Jonathan Ellis e70e73352d rename minor -> background, major -> maximal 
patch by Alan Liang for CASSANDRA-1610

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1134461 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-10 22:14:59 +00:00
Jonathan Ellis 129d80a474 extract AbstractCompactionStrategy, AbstractCompactionTask 
patch by Alan Liang and Ben Coverston; reviewed by jbellis for CASSANDRA-1610

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1134460 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-10 22:13:54 +00:00
Jonathan Ellis 00fd00db5d merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1134431 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-10 20:19:23 +00:00
Eric Evans 21afd783fd merge w/ 0.8 branch 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1133951 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-09 15:46:19 +00:00
Jonathan Ellis 410134e67e fix removing columns and subcolumns that are supressed by a row orsupercolumn tombstone during replica resolution 
patch by Aaron Morton and jbellis; reviewed by slebresne for CASSANDRA-2590

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1133873 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-09 13:50:27 +00:00
Jonathan Ellis e6499d8dd1 merge #2733 from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1133391 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-08 13:23:09 +00:00
Jonathan Ellis b7a173ab07 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1132429 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-05 14:46:18 +00:00
Jonathan Ellis 3c4687c6d8 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1132427 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-05 14:44:07 +00:00
Jonathan Ellis 9ca7de9276 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1132412 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-05 14:08:01 +00:00
Jonathan Ellis f5f96c178d merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1132406 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-05 13:43:22 +00:00
Jonathan Ellis e1941e2128 merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1131514 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-05 02:31:16 +00:00
Jonathan Ellis a7bc6ee07c merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1131292 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-03 23:44:31 +00:00
Chris Goffinet 583ac45752 Merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1130867 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-02 22:54:42 +00:00
Chris Goffinet 1d0d6d45ba Merge 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1130866 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-02 22:54:21 +00:00
Jonathan Ellis cd60613ae0 fix truncate/compaction race 
patch by jbellis; reviewed by slebresne for CASSANDRA-2673

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1130191 13f79535-47bb-0310-9956-ffa450edef68
 2011-06-01 15:34:57 +00:00
Chris Goffinet 7f9d14178a Merged from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1129464 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-31 02:10:33 +00:00
Sylvain Lebresne a7e632771b merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1129157 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-30 13:10:43 +00:00
Sylvain Lebresne 3d9305b505 Reset SSTII in EchoedRow iterator (see CASSANDRA-2653) 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1129151 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-30 13:02:40 +00:00
Chris Goffinet 546c89fe59 Merge from 0.8 CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1129097 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-30 09:52:39 +00:00
Chris Goffinet 280a5c74a1 Merge from 0.8 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1129096 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-30 09:52:09 +00:00
Chris Goffinet e86ccb3a41 Updated CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1129093 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-30 09:45:15 +00:00
Chris Goffinet 2b9bb10965 Updated CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1129066 13f79535-47bb-0310-9956-ffa450edef68
 2011-05-30 08:52:28 +00:00