You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2012/03/02 16:59:53 UTC
svn commit: r1296267 [1/7] - in /incubator/accumulo/branches/1.4/src:
core/src/main/java/org/apache/accumulo/core/client/impl/
core/src/main/java/org/apache/accumulo/core/client/impl/thrift/
core/src/main/java/org/apache/accumulo/core/gc/thrift/ core/s...
Author: billie
Date: Fri Mar 2 15:59:50 2012
New Revision: 1296267
URL: http://svn.apache.org/viewvc?rev=1296267&view=rev
Log:
ACCUMULO-438 renamed cloudtrace package
Added:
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/CountSampler.java
- copied, changed from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/CountSampler.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Sampler.java
- copied, changed from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/Sampler.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Span.java
- copied, changed from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/Span.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Trace.java
- copied, changed from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/Trace.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceCallable.java
- copied, changed from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/TraceCallable.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceExecutorService.java
- copied, changed from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/TraceExecutorService.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceProxy.java
- copied, changed from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/TraceProxy.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/TraceRunnable.java
- copied, changed from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/TraceRunnable.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/Tracer.java
- copied, changed from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/Tracer.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/
- copied from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/impl/
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/
- copied from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/receivers/
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/
- copied from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/thrift/
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/
- copied from r1296227, incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/thrift/
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/cloudtrace/
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/
- copied from r1296227, incubator/accumulo/branches/1.4/src/trace/src/test/java/cloudtrace/instrument/
Removed:
incubator/accumulo/branches/1.4/src/examples/simple/src/main/java/org/apache/accumulo/examples/mapreduce/
incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/main/java/org/apache/accumulo/wikisearch/
incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/src/test/java/org/apache/accumulo/wikisearch/
incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/wikisearch/
incubator/accumulo/branches/1.4/src/examples/wikisearch/query/src/test/java/org/apache/accumulo/wikisearch/
incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/instrument/
incubator/accumulo/branches/1.4/src/trace/src/main/java/cloudtrace/thrift/
incubator/accumulo/branches/1.4/src/trace/src/test/java/cloudtrace/
Modified:
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/MutationLogger.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/trace/DistributedTrace.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/trace/SpanTree.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/trace/SpanTreeVisitor.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/trace/TraceDump.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/trace/ZooTraceClient.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/TraceCommand.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/client/BulkImporter.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/gc/SimpleGarbageCollector.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/logger/LogService.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/logger/LogWriter.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/tableOps/TraceRepo.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ListType.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/ShowTrace.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/Summary.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Compactor.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/TestIngest.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/VerifyIngest.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousIngest.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousWalk.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceFSDataInputStream.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/trace/TraceServer.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/MilliSpan.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/NullSpan.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/impl/RootMilliSpan.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/AsyncSpanReceiver.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/LogSpans.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/SendSpansViaThrift.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/SpanReceiver.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/receivers/ZooSpanClient.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/RemoteSpan.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/SpanReceiver.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TInfo.java
incubator/accumulo/branches/1.4/src/trace/src/main/java/org/apache/accumulo/cloudtrace/thrift/TestService.java
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/CountSamplerTest.java
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/PerformanceTest.java
incubator/accumulo/branches/1.4/src/trace/src/test/java/org/apache/accumulo/cloudtrace/instrument/TracerTest.java
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java?rev=1296267&r1=1296266&r2=1296267&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReaderIterator.java Fri Mar 2 15:59:50 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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java?rev=1296267&r1=1296266&r2=1296267&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java Fri Mar 2 15:59:50 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;
@@ -65,8 +67,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/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java?rev=1296267&r1=1296266&r2=1296267&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java Fri Mar 2 15:59:50 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];