Author: billie
Date: Fri Mar 2 18:56:01 2012
New Revision: 1296383
URL: http://svn.apache.org/viewvc?rev=1296383&view=rev
Log:
ACCUMULO-438 renamed cloudtrace package - merged to trunk
Added:
incubator/accumulo/trunk/src/trace/src/main/java/org/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/CountSampler.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/CountSampler.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Sampler.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Sampler.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Span.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Span.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Trace.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Trace.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceCallable.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceCallable.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceExecutorService.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceExecutorService.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceProxy.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceProxy.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceRunnable.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceRunnable.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Tracer.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Tracer.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/NullSpan.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/NullSpan.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/RootMilliSpan.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/RootMilliSpan.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/AsyncSpanReceiver.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/AsyncSpanReceiver.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/LogSpans.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/LogSpans.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/SendSpansViaThrift.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/SendSpansViaThrift.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/SpanReceiver.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/SpanReceiver.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/ZooSpanClient.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/ZooSpanClient.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java
incubator/accumulo/trunk/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java
incubator/accumulo/trunk/src/trace/src/test/java/org/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/
incubator/accumulo/trunk/src/trace/src/test/java/org/apache/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/
incubator/accumulo/trunk/src/trace/src/test/java/org/apache/accumulo/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/
incubator/accumulo/trunk/src/trace/src/test/java/org/apache/accumulo/cloudtrace/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/cloudtrace/
incubator/accumulo/trunk/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/
- copied from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/
incubator/accumulo/trunk/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java
incubator/accumulo/trunk/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/PerformanceTest.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/PerformanceTest.java
incubator/accumulo/trunk/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/TracerTest.java
- copied unchanged from r1296358,
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/TracerTest.java
Removed:
incubator/accumulo/trunk/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/
incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/
incubator/accumulo/trunk/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/
incubator/accumulo/trunk/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/
incubator/accumulo/trunk/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/wikisearch/
incubator/accumulo/trunk/src/trace/src/main/java/cloudtrace/instrument/
incubator/accumulo/trunk/src/trace/src/main/java/cloudtrace/thrift/
incubator/accumulo/trunk/src/trace/src/test/java/cloudtrace/
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/src/core/ (props changed)
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/trace/SpanTree.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/trace/SpanTreeVisitor.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TraceCommand.java
incubator/accumulo/trunk/src/server/ (props changed)
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ListType.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Summary.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/trace/TraceFSDataInputStream.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 2 18:56:01 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043,1236873,1245632
/incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1296260
+/incubator/accumulo/branches/1.4:1201902-1296358
Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 2 18:56:01 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
/incubator/accumulo/branches/1.3.5rc/src/core:1209938
-/incubator/accumulo/branches/1.4/src/core:1201902-1296260
+/incubator/accumulo/branches/1.4/src/core:1201902-1296358
Modified:
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1296383&r1=1296382&r2=1296383&view=diff
==============================================================================
---
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
(original)
+++
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
Fri Mar 2 18:56:01 2012
@@ -32,6 +32,7 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import org.apache.accumulo.cloudtrace.instrument.TraceRunnable;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -68,7 +69,6 @@ import org.apache.thrift.TException;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
-import cloudtrace.instrument.TraceRunnable;
public class TabletServerBatchReaderIterator implements
Iterator<Entry<Key,Value>> {
Modified:
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java?rev=1296383&r1=1296382&r2=1296383&view=diff
==============================================================================
---
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
(original)
+++
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
Fri Mar 2 18:56:01 2012
@@ -36,6 +36,8 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.accumulo.cloudtrace.instrument.Span;
+import org.apache.accumulo.cloudtrace.instrument.Trace;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -67,8 +69,6 @@ import org.apache.thrift.TServiceClient;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportException;
-import cloudtrace.instrument.Span;
-import cloudtrace.instrument.Trace;
/*
* Differences from previous TabletServerBatchWriter
Modified:
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
URL:
http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java?rev=1296383&r1=1296382&r2=1296383&view=diff
==============================================================================
---
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
(original)
+++
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
Fri Mar 2 18:56:01 2012
@@ -27,6 +27,8 @@ import java.util.Set;
import java.util.SortedMap;
import java.util.SortedSet;
+import org.apache.accumulo.cloudtrace.instrument.Span;
+import org.apache.accumulo.cloudtrace.instrument.Trace;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.Instance;
@@ -65,8 +67,6 @@ import org.apache.thrift.TApplicationExc
import org.apache.thrift.TException;
import org.apache.thrift.TServiceClient;
-import cloudtrace.instrument.Span;
-import cloudtrace.instrument.Trace;
public class ThriftScanner {
private static final byte[] EMPTY_BYTES = new byte[0];
