accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [5/5] git commit: ACCUMULO-1542 merge 1.5.1-SNAPSHOT to master
Date Thu, 12 Sep 2013 19:39:38 GMT
ACCUMULO-1542 merge 1.5.1-SNAPSHOT to master


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46b49658
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46b49658
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46b49658

Branch: refs/heads/master
Commit: 46b49658bce215fb8c74952a28491d7dddb929a7
Parents: e39f576 ad8cbcb
Author: Eric Newton <eric.newton@gmail.com>
Authored: Thu Sep 12 15:39:29 2013 -0400
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Thu Sep 12 15:39:29 2013 -0400

----------------------------------------------------------------------
 .../apache/accumulo/examples/simple/client/TracingExample.java | 3 ++-
 .../java/org/apache/accumulo/server/tabletserver/Tablet.java   | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/46b49658/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
----------------------------------------------------------------------
diff --cc examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
index da511a1,46752c8..5eb2597
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/TracingExample.java
@@@ -93,13 -99,7 +93,13 @@@ public class TracingExample 
  		// the write operation as it is occurs asynchronously. You can optionally create additional
Spans
  		// within a given Trace as seen below around the flush
  		Trace.on("Client Write");
++
 +		System.out.println("TraceID: " + Long.toHexString(Trace.currentTrace().traceId()));
 +		BatchWriter batchWriter = opts.getConnector().createBatchWriter(opts.getTableName(), new
BatchWriterConfig());
 +	    
 +		Mutation m = new Mutation("row");
 +		m.put("cf", "cq", "value");
  		
- 		
  	    batchWriter.addMutation(m);
  	    Span flushSpan = Trace.start("Client Flush");
  	    batchWriter.flush();
@@@ -116,7 -117,7 +116,8 @@@
  		
  		// Trace the read operation.  
  		Span readSpan = Trace.on("Client Read");
 -		
 +		System.out.println("TraceID: " + Long.toHexString(Trace.currentTrace().traceId()));
++
  		int numberOfEntriesRead = 0;
  		for (Entry<Key,Value> entry : scanner) {
  			System.out.println(entry.getKey().toString() + " -> " + entry.getValue().toString());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/46b49658/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
----------------------------------------------------------------------


Mime
View raw message