Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 93605 invoked from network); 26 Jul 2010 21:02:17 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Jul 2010 21:02:17 -0000 Received: (qmail 62811 invoked by uid 500); 26 Jul 2010 21:02:17 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 62794 invoked by uid 500); 26 Jul 2010 21:02:16 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 62786 invoked by uid 99); 26 Jul 2010 21:02:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jul 2010 21:02:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jul 2010 21:02:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 38A0E2388A44; Mon, 26 Jul 2010 21:01:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r979437 - in /cassandra/trunk/contrib/word_count: bin/word_count_setup src/WordCountSetup.java Date: Mon, 26 Jul 2010 21:01:24 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100726210124.38A0E2388A44@eris.apache.org> Author: jbellis Date: Mon Jul 26 21:01:23 2010 New Revision: 979437 URL: http://svn.apache.org/viewvc?rev=979437&view=rev Log: fix formatting, default framed mode Modified: cassandra/trunk/contrib/word_count/bin/word_count_setup cassandra/trunk/contrib/word_count/src/WordCountSetup.java Modified: cassandra/trunk/contrib/word_count/bin/word_count_setup URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/word_count/bin/word_count_setup?rev=979437&r1=979436&r2=979437&view=diff ============================================================================== --- cassandra/trunk/contrib/word_count/bin/word_count_setup (original) +++ cassandra/trunk/contrib/word_count/bin/word_count_setup Mon Jul 26 21:01:23 2010 @@ -55,6 +55,6 @@ fi HOST=localhost PORT=9160 -FRAMED=false +FRAMED=true $JAVA -Xmx1G -ea -Dcassandra.host=$HOST -Dcassandra.port=$PORT -Dcassandra.framed=$FRAMED -cp $CLASSPATH WordCountSetup Modified: cassandra/trunk/contrib/word_count/src/WordCountSetup.java URL: http://svn.apache.org/viewvc/cassandra/trunk/contrib/word_count/src/WordCountSetup.java?rev=979437&r1=979436&r2=979437&view=diff ============================================================================== --- cassandra/trunk/contrib/word_count/src/WordCountSetup.java (original) +++ cassandra/trunk/contrib/word_count/src/WordCountSetup.java Mon Jul 26 21:01:23 2010 @@ -73,7 +73,8 @@ public class WordCountSetup System.exit(0); } - private static Map>> getMutationMap(byte[] key, String cf, Column c) { + private static Map>> getMutationMap(byte[] key, String cf, Column c) + { Map>> mutationMap = new HashMap>>(); addToMutationMap(mutationMap, key, cf, c); return mutationMap; @@ -104,25 +105,19 @@ public class WordCountSetup private static Cassandra.Iface createConnection() throws TTransportException { - if(System.getProperty("cassandra.host") == null || System.getProperty("cassandra.port") == null) + if (System.getProperty("cassandra.host") == null || System.getProperty("cassandra.port") == null) { logger.warn("cassandra.host or cassandra.port is not defined, using default"); } return createConnection( System.getProperty("cassandra.host","localhost"), Integer.valueOf(System.getProperty("cassandra.port","9160")), - Boolean.valueOf(System.getProperty("cassandra.framed", "false")) ); + Boolean.valueOf(System.getProperty("cassandra.framed", "true")) ); } private static Cassandra.Client createConnection(String host, Integer port, boolean framed) throws TTransportException { TSocket socket = new TSocket(host, port); - TTransport trans; - - if(framed) - trans = new TFramedTransport(socket); - else - trans = socket; - + TTransport trans = framed ? new TFramedTransport(socket) : socket; trans.open(); TProtocol protocol = new TBinaryProtocol(trans);