[virgil] r158 committed - Cleanup and trigger work.

[virgil.apach...@codespot.com]

Revision: 158
Author: boneill42
Date: Fri Jan 27 10:56:08 2012
Log: Cleanup and trigger work.

http://code.google.com/a/apache-extras.org/p/virgil/source/detail?r=158

Added:
/trunk/server/src/test/java/org/apache/virgil/triggers
/trunk/server/src/test/java/org/apache/virgil/triggers/TriggerTest.java
Modified:
/trunk/mapreduce/src/main/java/org/apache/virgil/mapreduce/JobSpawner.java

/trunk/mapreduce/src/test/java/org/apache/virgil/mapreduce/RubyInvokerTest.java
/trunk/server/src/main/java/org/apache/virgil/aop/CassandraDaemonAspect.aj
/trunk/server/src/main/java/org/apache/virgil/aop/CassandraServerAspect.aj
/trunk/server/src/main/java/org/apache/virgil/triggers/TriggerTask.java

=======================================
--- /dev/null
+++ /trunk/server/src/test/java/org/apache/virgil/triggers/TriggerTest.java
Fri Jan 27 10:56:08 2012
@@ -0,0 +1,5 @@
+package org.apache.virgil.triggers;
+
+public class TriggerTest {
+
+}
=======================================
---
/trunk/mapreduce/src/main/java/org/apache/virgil/mapreduce/JobSpawner.java
Mon Jan 16 18:38:55 2012
+++
/trunk/mapreduce/src/main/java/org/apache/virgil/mapreduce/JobSpawner.java
Fri Jan 27 10:56:08 2012
@@ -44,17 +44,12 @@
}

public static Configuration getConfiguration(String[] args) {
- for (int i = 0; i < args.length; i++) {
- System.out.println("[" + i + "] = [" + args[i] + "]");
- }
-
- System.out.println("Starting [" + args[JobSpawner.JOB_NAME] + "]
against Cassandra ["
+ LOG.debug("Starting [" + args[JobSpawner.JOB_NAME] + "] against
Cassandra ["
+ args[JobSpawner.CASSANDRA_HOST] + ":" +
args[JobSpawner.CASSANDRA_PORT] + "]");
- System.out.println("Input --> [" + args[JobSpawner.INPUT_KEYSPACE]
+ "]:["
+ LOG.debug("Input --> [" + args[JobSpawner.INPUT_KEYSPACE] + "]:["
+ args[JobSpawner.INPUT_COLUMN_FAMILY] + "]");
- System.out.println("Output <-- [" +
args[JobSpawner.OUTPUT_KEYSPACE] + "]:["
+ LOG.debug("Output <-- [" + args[JobSpawner.OUTPUT_KEYSPACE] + "]:["
+ args[JobSpawner.OUTPUT_COLUMN_FAMILY] + "]");
-
Configuration conf = new Configuration();
conf.set("jobName", args[JobSpawner.JOB_NAME]);
conf.set("cassandraHost", args[JobSpawner.CASSANDRA_HOST]);
=======================================
---
/trunk/mapreduce/src/test/java/org/apache/virgil/mapreduce/RubyInvokerTest.java
Thu Jan 26 14:01:22 2012
+++
/trunk/mapreduce/src/test/java/org/apache/virgil/mapreduce/RubyInvokerTest.java
Fri Jan 27 10:56:08 2012
@@ -33,7 +33,6 @@
@Test
public void testMapInvocation() throws Exception {
String source = getSource();
- // System.out.println(source);
ScriptingContainer rubyContainer = new
ScriptingContainer(LocalContextScope.CONCURRENT);
rubyContainer.setLoadPaths(getGemPaths());
Object rubyReceiver = rubyContainer.runScriptlet(source);
=======================================
---
/trunk/server/src/main/java/org/apache/virgil/aop/CassandraDaemonAspect.aj
Tue Jan 24 13:31:50 2012
+++
/trunk/server/src/main/java/org/apache/virgil/aop/CassandraDaemonAspect.aj
Fri Jan 27 10:56:08 2012
@@ -1,16 +1,20 @@
package org.apache.virgil.aop;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public aspect CassandraDaemonAspect {
+ private static Logger logger =
LoggerFactory.getLogger(CassandraDaemonAspect.class);

private pointcut mainMethod() :
execution(public static void main(String[]));

before() : mainMethod() {
//throw new RuntimeException("CRASH IT!");
- System.out.println("> " + thisJoinPoint);
+ logger.debug("> " + thisJoinPoint);
}

after() : mainMethod() {
- System.out.println("< " + thisJoinPoint);
+ logger.debug("< " + thisJoinPoint);
}
}
=======================================
---
/trunk/server/src/main/java/org/apache/virgil/aop/CassandraServerAspect.aj
Thu Jan 26 09:00:31 2012
+++
/trunk/server/src/main/java/org/apache/virgil/aop/CassandraServerAspect.aj
Fri Jan 27 10:56:08 2012
@@ -6,8 +6,11 @@
import org.apache.cassandra.db.RowMutation;
import org.apache.cassandra.thrift.ConsistencyLevel;
import org.apache.virgil.triggers.DistributedCommitLog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

public aspect CassandraServerAspect {
+ private static Logger logger =
LoggerFactory.getLogger(CassandraServerAspect.class);

private pointcut insertMethod() :
execution(private void doInsert(ConsistencyLevel, List<?
extends IMutation>));
@@ -20,33 +23,11 @@
for (IMutation mutation : mutations) {
if (mutation instanceof RowMutation) {
RowMutation rowMutation = (RowMutation) mutation;
- // String key =
ByteBufferUtil.string(rowMutation.key());
- // System.out.println("Mutation for [" + key + "] @ ["
+
- // rowMutation.getTable()
- // + "] with consistencyLevel [" + consistencyLevel
+ "]");
- System.out.println("Mutation for [" +
rowMutation.getTable() + "] with consistencyLevel ["
+ logger.debug("Mutation for [" + rowMutation.getTable()
+ "] with consistencyLevel ["
+ consistencyLevel + "]");
if
(!rowMutation.getTable().equals(DistributedCommitLog.KEYSPACE)) {

DistributedCommitLog.writeMutation(consistencyLevel, rowMutation);
}
- // for (Integer cfId :
rowMutation.getColumnFamilyIds()) {
- // ColumnFamily columnFamily =
- // rowMutation.getColumnFamily(cfId);
- // for (IColumn column :
columnFamily.getSortedColumns()) {
- // if (co)
- // String name = ByteBufferUtil.string(column.name());
- // String value =
ByteBufferUtil.string(column.value());
- // boolean delete = columnFamily.isMarkedForDelete();
- // if (delete) {
- // System.out.println(" -- DELETE -- [" + name + "] =>
[" +
- // value + "]");
- // } else {
- // System.out.println(" -- SET -- [" + name + "] => ["
+
- // value + "]");
- // }
- // }
- // }
-
}
}
} catch (Exception e) {
=======================================
--- /trunk/server/src/main/java/org/apache/virgil/triggers/TriggerTask.java
Thu Jan 26 09:00:31 2012
+++ /trunk/server/src/main/java/org/apache/virgil/triggers/TriggerTask.java
Fri Jan 27 10:56:08 2012
@@ -24,7 +24,7 @@
for (String path : triggerMap.keySet()){
String keyspace = path.substring(path.indexOf(':'));
String columnFamily = path.substring(path.indexOf(':'));
- System.out.println("[" + keyspace + "]:[" + columnFamily
+ "]");
+ logger.debug("[" + keyspace + "]:[" + columnFamily + "]");
}
}