Commit Graph

20 Commits

Author SHA1 Message Date
Jonathan Ellis 73d2ad1447 fix CBL build
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1061836 13f79535-47bb-0310-9956-ffa450edef68
2011-01-21 15:03:54 +00:00
Jonathan Ellis 37ec7d326d encapsulate MessagingService.instance to avoid circular initializtion dependencies
git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1054135 13f79535-47bb-0310-9956-ffa450edef68
2010-12-31 16:52:56 +00:00
Jonathan Ellis cdb07b193f update CassandraBulkLoader for Thrift 0.5; replace UnsupportedEncodingException catches w/ Charsets.UTF_8. patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1026380 13f79535-47bb-0310-9956-ffa450edef68
2010-10-22 15:46:49 +00:00
Jonathan Ellis 187761a322 upgrade to Thrift 0.5
patch by Jake Luciani; reviewed by jbellis for CASSANDRA-1367

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1026201 13f79535-47bb-0310-9956-ffa450edef68
2010-10-22 03:23:51 +00:00
Jonathan Ellis 77efbe1e4f remove Clocks from contrib/bmt_example and client_only. patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1026112 13f79535-47bb-0310-9956-ffa450edef68
2010-10-21 19:31:15 +00:00
Jonathan Ellis d41656b14a update bmt_example for TimestampReconciler singleton-ification. patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@987390 13f79535-47bb-0310-9956-ffa450edef68
2010-08-20 06:56:59 +00:00
Jonathan Ellis 6d9de2454f merge from 0.6
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@979160 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 04:45:16 +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 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
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
Gary Dusbabek bbf49dd6d6 make CassandraBulkLoader compile. patch by gdusbabek, reviewed by jbellis. CASSANDRA-1062
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@946158 13f79535-47bb-0310-9956-ffa450edef68
2010-05-19 12:46:00 +00:00
Jonathan Ellis 656bc4d777 replace String columnfamily type with enum. patch by Sylvain Lebresne; reviewed by jbellis for CASSANDRA-1058
git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@942113 13f79535-47bb-0310-9956-ffa450edef68
2010-05-07 15:13:44 +00:00
Jonathan Ellis 1de68638ec merge from 0.6
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@916964 13f79535-47bb-0310-9956-ffa450edef68
2010-02-27 15:21:39 +00:00
Jonathan Ellis d0c1a84319 fix import in contrib. patch by jbellis
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@894969 13f79535-47bb-0310-9956-ffa450edef68
2010-01-01 03:54:04 +00:00
Jonathan Ellis 0a7e6d1087 update bmt_example to use new client mode.
patch by jbellis; reviewed by gdusbabek for CASSANDRA-535

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@886256 13f79535-47bb-0310-9956-ffa450edef68
2009-12-02 18:55:51 +00:00
Jonathan Ellis 1794fbed23 add updateForeignTokenUnsafe for bulk loader. patch by goffinet; reviewed by jbellis for CASSANDRA-523
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@831433 13f79535-47bb-0310-9956-ffa450edef68
2009-10-30 19:45:38 +00:00
Jonathan Ellis 924c7e5fcb rename "readstorage" endpoints to "natural," "writestorage" to "write" and "hintedstorage" to "hinted"
make ReplicationStrategy deal with List<InetAddress> instead of InetAddress[] -- we use the former both in RS and externally, so forcing RS to convert to [] and external users to convert back to List is silly
patch by jbellis

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828148 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 19:18:43 +00:00
Jonathan Ellis b767bf7e7d convert EndPoint to InetAddress (removes MembershipCleaner, the code to drop a node from the cluster entirely. we're probably going to want to resurrect that at some point)
patch by jbellis; reviewed by Brandon Williams for CASSANDRA-498

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@828130 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 18:26:02 +00:00
Jonathan Ellis 6b142021d8 update contrib/CassandraBulkLoader to use getReadStorageEndPoints. patch by Chris Goffinet; reviewed by jbellis for CASSANDRA-449
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@817267 13f79535-47bb-0310-9956-ffa450edef68
2009-09-21 14:22:24 +00:00
Jonathan Ellis 53895adf95 merge from 0.4 branch
git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@810997 13f79535-47bb-0310-9956-ffa450edef68
2009-09-03 15:33:46 +00:00