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

1971 Commits

Author SHA1 Message Date
Jonathan Ellis 40d3fe48d6 merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@951243 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-04 02:41:03 +00:00
Gary Dusbabek 0f2c4777b8 merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@951080 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-03 17:26:44 +00:00
Gary Dusbabek f4d36dbede merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@951008 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-03 14:19:59 +00:00
Gary Dusbabek 24372e1de1 fix non-compiling CBL 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@950632 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-02 16:40:30 +00:00
Jonathan Ellis dfd211d463 set auto_bootstrap back to false, with comment on reasoning. patch by jbellis 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@950328 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-02 01:21:06 +00:00
Johan Oskarsson 7860b138e3 Add support for reconciler classes that decide how to resolve conflicting columns. Patch by Kelvin Kakugawa and johan, review by jbellis. CASSANDRA-1144 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@950099 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-01 15:03:48 +00:00
Jonathan Ellis d8342a7736 pass IFilter to getRangeRows instead of column names / slicerange. patch by jbellis 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@950074 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-01 13:43:36 +00:00
Jonathan Ellis 242b717f3d make AbstractType subclasses singletons. patch by jbellis 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@950073 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-01 13:43:25 +00:00
Jonathan Ellis 7b845a0cd2 add license headers to generated Thrift files. patch by jbellis 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@950072 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-01 13:43:05 +00:00
Johan Oskarsson 4d9a43c77a Adapt stress.py to the thrift clock api changes. Patch by johan, review by jbellis. CASSANDRA-1148 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@950070 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-01 13:27:58 +00:00
Jonathan Ellis 95a03671ba make CFS.flushWriter_ size configurable. patch by Brandon Williams; reviewed by jbellis for CASSANDRA-1099 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949904 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-31 23:52:12 +00:00
Eric Evans fb052422cd update launch args in debian init script post-971 
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949754 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-31 14:31:15 +00:00
Jonathan Ellis 342f628a0a make CFS.getRangeSlice return List<Row>. patch by jbellis 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949421 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-29 16:58:24 +00:00
Eric Evans 3dd229c167 CASSANDRA-798 match genavro to json schema 
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949301 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-28 21:27:51 +00:00
Gary Dusbabek 7cd412bba1 merges from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949268 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-28 19:26:53 +00:00
Gary Dusbabek 0c1986e53e additional test to check if a CF can be added to an empty KS after creation. patch by Erik Onnen, reviewed by Gary Dusbabek. CASSANDRA-1082 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949210 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-28 15:54:28 +00:00
Gary Dusbabek dd02495654 have sstable import/export load schema from local storage. Patch by Matthew Dennis, reviewed by Gary Dusbabek. CASSANDRA-1128 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949167 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-28 13:05:24 +00:00
Jonathan Ellis 101b210280 undo setting log4j root to INFO 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949095 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-28 03:59:20 +00:00
Jonathan Ellis e9d32d80ed update contrib/CassandraBulkLoader to work with Clocks. patch by jbellis 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@949031 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-27 22:44:21 +00:00
Eric Evans 3f92ee2f0d update contrib/ code for new Column clock 
Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948964 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-27 19:55:10 +00:00
Jonathan Ellis 7c9191f66a merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948950 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-27 18:58:46 +00:00
Jonathan Ellis 676f1cd967 update wordcount to use Clocks. patch by jhanna 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948949 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-27 18:58:10 +00:00
Eric Evans 8c323b80e8 apply CASSANDRA-987 to thrift.CassandraDaemon too... 
...and expect that lastMigration might be null

Patch by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948929 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-27 17:46:08 +00:00
Jonathan Ellis c924ce55eb Add ResourceWatcher to generalize reloading Strategy configurations. patch by Jon Hermes and jbellis for CASSANDRA-1105 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948829 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-27 13:28:42 +00:00
Jonathan Ellis 8c0c3ebaae rename GMFD to GOSSIP_STAGE. patch by Rob Coli; reviewed by jbellis for CASSANDRA-1135 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948609 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-26 21:56:57 +00:00
Gary Dusbabek 1631beed8c CFMeta.subcolumncomparator should default to BytesType if cftype==Super. patch by gdusbabek, reviewed by jbellis. CASSANDRA-1122 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948541 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-26 19:03:55 +00:00
Gary Dusbabek 040d0e71cc rename StreamCompletionAction to Action. patch by stuhood, reviwed by gdusbabek. CASSANDRA-1019 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948537 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-26 18:56:45 +00:00
Gary Dusbabek 15543601dc rename StreamCompletionHandler to FileStatusHandler. patch by stuhood, reviwed by gdusbabek. CASSANDRA-1019 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948536 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-26 18:56:37 +00:00
Gary Dusbabek cdf154de57 rename CompletedFileStatus to FileStatus. patch by stuhood, reviwed by gdusbabek. CASSANDRA-1019 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948535 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-26 18:56:27 +00:00
Gary Dusbabek bec8845a46 merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948533 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-26 18:46:56 +00:00
Jonathan Ellis cba59a81e6 add Clock structure as a prelude to full vector clock support. patch by Sylvain Lebresne and Kelvin Kakugawa for CASSANDRA-1070; reviewed by johano and jbellis 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948316 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-26 04:45:44 +00:00
Eric Evans 3d11cbbf8f update debian packaging to trunk 
Patch by Peter Schüller; reviewed by eevans

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948100 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-25 16:55:43 +00:00
Jonathan Ellis b91c4d406b Expose setting of phi in the FailureDetector, for trunk. patch by Brandon Williams; reviewed by jbellis for CASSANDRA-1053 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948052 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-25 14:12:27 +00:00
Gary Dusbabek b87681eeb7 use cfid instead of name in CBL. patch by gdusbabek, reviewed by jbellis. CASSANDRA-1121 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@948032 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-25 13:12:57 +00:00
Johan Oskarsson 0658589892 Hadoop input format now uses the specified column family to figure out the number of splits instead of the whole keyspace. Patch by johan, review by jbellis. CASSANDRA-1050 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947953 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-25 07:40:47 +00:00
Jonathan Ellis 00cf048905 document DatacenterShardStrategy. patch by jbellis 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947889 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-25 01:17:27 +00:00
Jonathan Ellis 00bc8da0f3 merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947887 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-25 01:10:24 +00:00
Eric Evans 29fe9bc443 merge w/ 0.6 branch 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947841 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 22:37:22 +00:00
Jonathan Ellis e44ca3ecfe merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947804 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 20:46:27 +00:00
Jonathan Ellis 82840b687c merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947773 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 20:00:22 +00:00
Gary Dusbabek c4eb922513 git a better message when no schema is defined. patch by gdusbabek, reviewed by jbellis. CASSANDRA-1087 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947766 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 19:05:42 +00:00
Eric Evans 734b6bdf92 merge w/ 0.6 branch 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947755 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 18:32:20 +00:00
Jonathan Ellis a46b3bf548 merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947753 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 18:27:52 +00:00
Jonathan Ellis 4ed5281bf5 Add repair and move requests into AntiEntropyService. patch by Stu Hood; reviewed by jbellis for CASSANDRA-1090 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947737 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 18:10:07 +00:00
Jonathan Ellis 87cebcd776 merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947735 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 18:02:07 +00:00
Jonathan Ellis 1bb9e74a90 convert byte tokens to strings correctly. patch by Erick Tryzelaar; reviewed by Stu Hood for CASSANDRA-1008 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947731 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 17:51:19 +00:00
Jonathan Ellis 2fa9381823 move StreamingService from o.a.c.streaming to o.a.c.service. patch by jbellis 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947730 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 17:51:16 +00:00
Gary Dusbabek c71d1818c5 merges from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947702 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-24 16:22:20 +00:00
Gary Dusbabek 44e6a2843b recover when a migration crashes before system table is flushed. patch by gdusbabek, reviewed by stuhood. CASSANDRA-987 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947163 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-21 20:29:54 +00:00
Gary Dusbabek 98dfd97eab merge from 0.6 
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@947143 13f79535-47bb-0310-9956-ffa450edef68
 2010-05-21 19:46:37 +00:00