[Amdatu-commits] SVN r654 - in sandbox/ivol/standalone-cassandra: . src/org/amdatu/cassandra

[subvers...@amdatu.org]

Author: ivol37 at gmail.com
Date: Fri Jan 14 15:51:34 2011
New Revision: 654

Log:


Modified:
   sandbox/ivol/standalone-cassandra/compile
   sandbox/ivol/standalone-cassandra/src/org/amdatu/cassandra/Main.java

Modified: sandbox/ivol/standalone-cassandra/compile
==============================================================================
--- sandbox/ivol/standalone-cassandra/compile   (original)
+++ sandbox/ivol/standalone-cassandra/compile   Fri Jan 14 15:51:34 2011
@@ -3,4 +3,7 @@
 rm -rf target
 mkdir target
 
+rm -rf work
+mkdir work
+
 javac -cp $CLASSPATH src/org/amdatu/cassandra/Main.java -d target
\ No newline at end of file

Modified: sandbox/ivol/standalone-cassandra/src/org/amdatu/cassandra/Main.java
==============================================================================
--- sandbox/ivol/standalone-cassandra/src/org/amdatu/cassandra/Main.java        
(original)
+++ sandbox/ivol/standalone-cassandra/src/org/amdatu/cassandra/Main.java        
Fri Jan 14 15:51:34 2011
@@ -31,12 +31,8 @@
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
 import org.apache.thrift.transport.TTransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class Main {
-    private static Logger logger = 
LoggerFactory.getLogger(CassandraDaemon.class);
-
     // The default placement strategy
     private final String DEFAULT_PLACEMENT_STRATEGY = 
"org.apache.cassandra.locator.SimpleStrategy";
 
@@ -53,33 +49,11 @@
 
         try {
             Main main = new Main();
-            main.run();
-        }
-        catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        catch (InvalidRequestException e) {
-            e.printStackTrace();
-        }
-        catch (TException e) {
-            e.printStackTrace();
-        }
-        catch (NotFoundException e) {
-            e.printStackTrace();
-        }
-        catch (UnavailableException e) {
-            e.printStackTrace();
-        }
-        catch (TimedOutException e) {
-            e.printStackTrace();
-        }
-        catch (IOException e) {
-            e.printStackTrace();
+            main.createTestData();
         }
-        catch (URISyntaxException e) {
+        catch (Exception e) {
             e.printStackTrace();
         }
-
     }
 
     public Main() throws TTransportException, IOException, URISyntaxException {
@@ -125,10 +99,9 @@
         }
     }
 
-
-    private void run() throws InvalidRequestException, TException, 
NotFoundException, UnsupportedEncodingException, UnavailableException, 
TimedOutException {
+    private void createTestData() throws InvalidRequestException, TException, 
NotFoundException, UnsupportedEncodingException, UnavailableException, 
TimedOutException {
         m_cassandraServer = new CassandraServer();
-        System.out.println("Initializing data...");
+
         if (!keyspaceExists(DEFAULT_KEYSPACE)) {
             addKeyspace(DEFAULT_KEYSPACE, 1);
         }
@@ -161,10 +134,10 @@
         }
     }
 
-
     public synchronized boolean keyspaceExists(String keyspaceName) throws 
TException, InvalidRequestException {
         try {
             m_cassandraServer.describe_keyspace(keyspaceName);
+            System.out.println("Keyspace '" + keyspaceName + "' already 
exists");
             return true;
         }
         catch (NotFoundException e) {
@@ -202,6 +175,7 @@
         List<CfDef> cfDefs = ksDef.getCf_defs();
         for (CfDef cfDef : cfDefs) {
             if (cfDef.getName().equals(columnFamilyName)) {
+                System.out.println("ColumnFamily '" + columnFamilyName + "' 
already exists");
                 return true;
             }
         }
@@ -239,7 +213,6 @@
         }
     }
 
-
     public void setValue(String keyspace, String columnFamilyName, String 
rowKey, String superColumnName, String columnName, ByteBuffer value) throws 
UnsupportedEncodingException, InvalidRequestException, UnavailableException, 
TimedOutException, TException {
         long timestamp = System.currentTimeMillis();
         ColumnParent column_parent = new ColumnParent(columnFamilyName);
@@ -253,16 +226,4 @@
     private ByteBuffer toBytes(String value) throws 
UnsupportedEncodingException {
         return ByteBuffer.wrap(value.getBytes(DEFAULT_CHARSET));
     }
-
-    private String toString(byte[] bytes) throws UnsupportedEncodingException {
-        return new String(bytes, DEFAULT_CHARSET);
-    }
-
-    private List<ByteBuffer> toBytesList(List<byte[]> values) {
-        List<ByteBuffer> result = new ArrayList<ByteBuffer>();
-        for (byte[] value : values) {
-            result.add(ByteBuffer.wrap(value));
-        }
-        return result;
-    }
 }