Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 64783 invoked from network); 24 Aug 2009 23:41:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Aug 2009 23:41:36 -0000 Received: (qmail 49936 invoked by uid 500); 24 Aug 2009 23:42:01 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 49908 invoked by uid 500); 24 Aug 2009 23:42:01 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Delivered-To: moderator for cassandra-commits@incubator.apache.org Received: (qmail 49209 invoked by uid 99); 24 Aug 2009 23:39:51 -0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r807431 - in /incubator/cassandra/trunk: lib/ lib/licenses/ src/java/org/apache/cassandra/client/ src/java/org/apache/cassandra/dht/ src/java/org/apache/cassandra/locator/ src/java/org/apache/cassandra/service/ test/unit/org/apache/cassandr... Date: Mon, 24 Aug 2009 23:39:28 -0000 To: cassandra-commits@incubator.apache.org From: junrao@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090824233928.E2511238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: junrao Date: Mon Aug 24 23:39:27 2009 New Revision: 807431 URL: http://svn.apache.org/viewvc?rev=807431&view=rev Log: Expose ring map to client for more direct access; patch by junrao; reviewed by jbellis for CASSANDRA-197 Added: incubator/cassandra/trunk/lib/flexjson.jar (with props) incubator/cassandra/trunk/lib/licenses/flexjson.jar.LICENSE incubator/cassandra/trunk/src/java/org/apache/cassandra/client/ incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/ incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/Token.java incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/TokenMetadata.java incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Added: incubator/cassandra/trunk/lib/flexjson.jar URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/lib/flexjson.jar?rev=807431&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/cassandra/trunk/lib/flexjson.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: incubator/cassandra/trunk/lib/licenses/flexjson.jar.LICENSE URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/lib/licenses/flexjson.jar.LICENSE?rev=807431&view=auto ============================================================================== --- incubator/cassandra/trunk/lib/licenses/flexjson.jar.LICENSE (added) +++ incubator/cassandra/trunk/lib/licenses/flexjson.jar.LICENSE Mon Aug 24 23:39:27 2009 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. Added: incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java?rev=807431&view=auto ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java (added) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java Mon Aug 24 23:39:27 2009 @@ -0,0 +1,107 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.client; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.dht.IPartitioner; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.locator.IReplicaPlacementStrategy; +import org.apache.cassandra.locator.TokenMetadata; +import org.apache.cassandra.net.EndPoint; +import org.apache.cassandra.service.Cassandra; +import org.apache.cassandra.service.CassandraServer; +import org.apache.cassandra.service.StorageService; +import org.apache.log4j.Logger; +import org.apache.thrift.TException; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.transport.TSocket; + +import flexjson.JSONTokener; + +/** + * A class for caching the ring map at the client. For usage example, see + * test/unit/org.apache.cassandra.client.TestRingCache.java. + */ +public class RingCache +{ + final private static Logger logger_ = Logger.getLogger(RingCache.class); + + private Set seeds_ = new HashSet(); + final private int port_=DatabaseDescriptor.getThriftPort(); + private volatile IReplicaPlacementStrategy nodePicker_; + final private static IPartitioner partitioner_ = DatabaseDescriptor.getPartitioner(); + + public RingCache() + { + seeds_ = DatabaseDescriptor.getSeeds(); + refreshEndPointMap(); + } + + public void refreshEndPointMap() + { + for (String seed : seeds_) + { + try + { + TSocket socket = new TSocket(seed, port_); + TBinaryProtocol binaryProtocol = new TBinaryProtocol(socket, false, false); + Cassandra.Client client = new Cassandra.Client(binaryProtocol); + socket.open(); + + Map tokenToHostMap = (Map) new JSONTokener(client.get_string_property(CassandraServer.TOKEN_MAP)).nextValue(); + + HashMap tokenEndpointMap = new HashMap(); + Map endpointTokenMap = new HashMap(); + for (Map.Entry entry : tokenToHostMap.entrySet()) + { + Token token = StorageService.getPartitioner().getTokenFactory().fromString(entry.getKey()); + String host = entry.getValue(); + tokenEndpointMap.put(token, new EndPoint(host, port_)); + endpointTokenMap.put(new EndPoint(host, port_), token); + } + + TokenMetadata tokenMetadata = new TokenMetadata(tokenEndpointMap, endpointTokenMap, null); + Class cls = DatabaseDescriptor.getReplicaPlacementStrategyClass(); + Class [] parameterTypes = new Class[] { TokenMetadata.class, IPartitioner.class, int.class, int.class}; + try + { + nodePicker_ = (IReplicaPlacementStrategy) cls.getConstructor(parameterTypes).newInstance(tokenMetadata, partitioner_, DatabaseDescriptor.getReplicationFactor(), port_); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + break; + } + catch (TException e) + { + /* let the Exception go and try another seed. log this though */ + logger_.debug("Error contacting seed " + seed + " " + e.getMessage()); + } + } + } + + public EndPoint[] getEndPoint(String key) + { + return nodePicker_.getStorageEndPoints(partitioner_.getToken(key)); + } +} Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/Token.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/Token.java?rev=807431&r1=807430&r2=807431&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/Token.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/Token.java Mon Aug 24 23:39:27 2009 @@ -51,7 +51,7 @@ public String toString() { - return "Token(" + token + ")"; + return token.toString(); } public boolean equals(Object obj) Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/TokenMetadata.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/TokenMetadata.java?rev=807431&r1=807430&r2=807431&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/TokenMetadata.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/TokenMetadata.java Mon Aug 24 23:39:27 2009 @@ -41,10 +41,11 @@ { } - private TokenMetadata(Map tokenToEndPointMap, Map endPointToTokenMap, Map bootstrapNodes) + public TokenMetadata(Map tokenToEndPointMap, Map endPointToTokenMap, Map bootstrapNodes) { tokenToEndPointMap_ = tokenToEndPointMap; endPointToTokenMap_ = endPointToTokenMap; + this.bootstrapNodes = bootstrapNodes; } public TokenMetadata cloneMe() Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java?rev=807431&r1=807430&r2=807431&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/CassandraServer.java Mon Aug 24 23:39:27 2009 @@ -33,13 +33,18 @@ import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.MarshalException; import org.apache.cassandra.db.filter.QueryPath; +import org.apache.cassandra.net.EndPoint; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.LogUtil; import org.apache.cassandra.dht.OrderPreservingPartitioner; +import org.apache.cassandra.dht.Token; import org.apache.thrift.TException; +import flexjson.JSONSerializer; + public class CassandraServer implements Cassandra.Iface { + public static String TOKEN_MAP = "token map"; private static Logger logger = Logger.getLogger(CassandraServer.class); private final static List EMPTY_COLUMNS = Collections.emptyList(); @@ -404,6 +409,14 @@ return "file not found!"; } } + else if (propertyName.equals(TOKEN_MAP)) + { + HashMap tokenToHostMap = new HashMap(); + Map endpointMap = storageService.getLiveEndPointMap(); + for (Map.Entry e : endpointMap.entrySet()) + tokenToHostMap.put(e.getKey().toString(), e.getValue().getHost()); + return new JSONSerializer().serialize(tokenToHostMap); + } else if (propertyName.equals("version")) { return "0.3.0"; Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=807431&r1=807430&r2=807431&view=diff ============================================================================== --- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original) +++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Mon Aug 24 23:39:27 2009 @@ -1100,4 +1100,9 @@ } return suitableEndPoints; } + + Map getLiveEndPointMap() + { + return tokenMetadata_.cloneTokenEndPointMap(); + } } Added: incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java?rev=807431&view=auto ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java (added) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/client/TestRingCache.java Mon Aug 24 23:39:27 2009 @@ -0,0 +1,81 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.client; + +import org.apache.cassandra.net.EndPoint; +import org.apache.cassandra.service.Cassandra; +import org.apache.cassandra.service.Column; +import org.apache.cassandra.service.ColumnPath; +import org.apache.thrift.protocol.TBinaryProtocol; +import org.apache.thrift.transport.TSocket; +import org.apache.thrift.transport.TTransport; + +/** + * Sample code that uses RingCache in the client. + */ +public class TestRingCache +{ + private static RingCache ringCache; + private static Cassandra.Client thriftClient; + + static + { + ringCache = new RingCache(); + } + + private static void setup(String server, int port) throws Exception + { + /* Establish a thrift connection to the cassandra instance */ + TSocket socket = new TSocket(server, port); + TTransport transport; + System.out.println(" connected to " + server + ":" + port + "."); + transport = socket; + TBinaryProtocol binaryProtocol = new TBinaryProtocol(transport, false, false); + Cassandra.Client cassandraClient = new Cassandra.Client(binaryProtocol); + transport.open(); + thriftClient = cassandraClient; + } + + /** + * usage: java -Dstorage-config="confpath" org.apache.cassandra.client.TestRingCache + * @param args + * @throws Exception + */ + public static void main(String[] args) throws Throwable + { + String table = "Keyspace1"; + for (int nRows=1; nRows<10; nRows++) + { + String row = "row" + nRows; + ColumnPath col = new ColumnPath("Standard1", null, "col1".getBytes()); + + EndPoint endPoints[] = ringCache.getEndPoint(row); + String hosts=""; + for (int i=0; i0) ? "," : "") + endPoints[i].getHost(); + System.out.println("hosts with key " + row + " : " + hosts + "; choose " + endPoints[0].getHost()); + + // now, read the row back directly from the host owning the row locally + setup(endPoints[0].getHost(), endPoints[0].getPort()); + thriftClient.insert(table, row, col, "val1".getBytes(), 1, 1); + Column column=thriftClient.get(table, row, col, 1).column; + System.out.println("read row " + row + " " + new String(column.name) + ":" + new String(column.value) + ":" + column.timestamp); + } + System.exit(1); + } +}