From d4965e50ec4073db8655090a0e4c1a64e92b7b25 Mon Sep 17 00:00:00 2001 From: Timur Date: Wed, 8 Mar 2017 08:28:52 -0800 Subject: [PATCH] Remove unused imports (#718) --- .../batch/store/HDFSMetadata.scala | 1 - .../twitter/summingbird/batch/Batcher.scala | 5 +--- .../twitter/summingbird/batch/BatchLaws.scala | 2 -- .../summingbird/batch/BatcherLaws.scala | 4 +-- .../builder/CompletedBuilder.scala | 6 +--- .../summingbird/builder/SourceBuilder.scala | 6 ++-- .../summingbird/scalding/ScaldingEnv.scala | 2 +- .../scalding/source/RangedSource.scala | 4 +-- .../com/twitter/summingbird/sink/Sink.scala | 1 - .../summingbird/source/OfflineSource.scala | 7 ----- .../summingbird/store/CompoundStore.scala | 1 - .../summingbird/builder/BuilderJobTest.scala | 1 - .../summingbird/builder/OptionsTest.scala | 3 -- .../summingbird/chill/SerializerLaws.scala | 1 - .../summingbird/store/ClientMergeable.scala | 5 ++-- .../summingbird/store/MergeOperations.scala | 2 +- .../summingbird/store/PresentingStore.scala | 1 - .../twitter/summingbird/ExecutionConfig.scala | 3 -- .../scala/com/twitter/summingbird/Stats.scala | 2 -- .../summingbird/memory/ConcurrentMemory.scala | 3 +- .../summingbird/example/ExampleJob.scala | 4 --- .../twitter/summingbird/example/Storage.scala | 1 - .../summingbird/online/FlatMapOperation.scala | 1 - .../summingbird/online/FutureQueue.scala | 4 +-- .../online/MergeableStoreFactory.scala | 2 +- .../twitter/summingbird/online/Queue.scala | 4 +-- .../online/WrappedTSInMergeable.scala | 2 +- .../summingbird/online/PlannerSpec.scala | 7 ----- .../summingbird/scalding/LoopState.scala | 1 - .../summingbird/scalding/MockMappable.scala | 2 +- .../summingbird/scalding/TestService.scala | 2 +- .../summingbird/scalding/TestSink.scala | 4 --- .../summingbird/scalding/TestSource.scala | 6 +--- .../summingbird/scalding/TestStore.scala | 5 +--- .../summingbird/scalding/TestUtil.scala | 7 +---- .../summingbird/scalding/ScaldingLaws.scala | 23 ++------------ .../scalding/ScaldingSerializationSpec.scala | 28 ++--------------- .../scalding/TimePathedSourceTest.scala | 2 -- .../scalding/VersionBatchLaws.scala | 28 ----------------- .../scalding/VersionBatchedStoreTest.scala | 30 ++----------------- .../scalding/batch/LTuple2Test.scala | 9 ------ .../summingbird/scalding/Service.scala | 3 +- .../twitter/summingbird/scalding/Store.scala | 6 ---- .../scalding/batch/BatchedOperations.scala | 5 +--- .../scalding/batch/BatchedSink.scala | 2 +- .../summingbird/scalding/package.scala | 2 -- .../service/BatchedDeltaService.scala | 4 +-- .../service/BatchedWindowService.scala | 6 ++-- .../scalding/service/SimpleService.scala | 2 +- .../service/SimpleWindowService.scala | 4 +-- .../scalding/store/InitialBatchedStore.scala | 2 -- .../scalding/store/VersionedBatchStore.scala | 6 ++-- .../scalding/store/VersionedStore.scala | 6 +--- .../summingbird/storm/StormTestRun.scala | 5 +--- .../twitter/summingbird/storm/TestStore.scala | 1 - .../summingbird/storm/InjectionLaws.scala | 1 - .../twitter/summingbird/storm/StormLaws.scala | 24 ++++----------- .../summingbird/storm/StormPlanTopology.scala | 3 -- .../summingbird/storm/TopologyTests.scala | 18 ++--------- .../summingbird/storm/BuildSummer.scala | 2 +- .../twitter/summingbird/storm/Executor.scala | 1 - .../summingbird/storm/SpoutProvider.scala | 1 - .../summingbird/storm/StoreStatReporter.scala | 3 +- .../summingbird/storm/StormMetric.scala | 2 -- .../summingbird/storm/StormStatProvider.scala | 1 - .../summingbird/storm/TupleInjections.scala | 3 +- .../storm/option/SummerOptions.scala | 2 -- .../twitter/summingbird/storm/package.scala | 2 -- .../storm/spout/TraversableSpout.scala | 6 +--- .../storm/TestAggregateOutpoutCollector.scala | 1 - .../summingbird/storm/TestKeyValueSpout.scala | 3 -- 71 files changed, 54 insertions(+), 305 deletions(-) diff --git a/summingbird-batch-hadoop/src/main/scala/com/twitter/summingbird/batch/store/HDFSMetadata.scala b/summingbird-batch-hadoop/src/main/scala/com/twitter/summingbird/batch/store/HDFSMetadata.scala index ac11ee398..9a7beae3c 100644 --- a/summingbird-batch-hadoop/src/main/scala/com/twitter/summingbird/batch/store/HDFSMetadata.scala +++ b/summingbird-batch-hadoop/src/main/scala/com/twitter/summingbird/batch/store/HDFSMetadata.scala @@ -25,7 +25,6 @@ import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{ FileSystem, Path } import scala.collection.JavaConverters._ import scala.util.Try -import scala.util.control.Exception.allCatch /** * @author Oscar Boykin diff --git a/summingbird-batch/src/main/scala/com/twitter/summingbird/batch/Batcher.scala b/summingbird-batch/src/main/scala/com/twitter/summingbird/batch/Batcher.scala index 6be737c6d..ca890e4b0 100644 --- a/summingbird-batch/src/main/scala/com/twitter/summingbird/batch/Batcher.scala +++ b/summingbird-batch/src/main/scala/com/twitter/summingbird/batch/Batcher.scala @@ -24,14 +24,11 @@ import com.twitter.algebird.{ InclusiveUpper, Intersection, Interval, - Lower, Successible, - Universe, - Upper + Universe } import scala.collection.immutable.SortedSet -import java.util.{ Comparator, Date } import java.util.concurrent.TimeUnit import java.io.Serializable diff --git a/summingbird-batch/src/test/scala/com/twitter/summingbird/batch/BatchLaws.scala b/summingbird-batch/src/test/scala/com/twitter/summingbird/batch/BatchLaws.scala index f7e1416bc..b32247a98 100644 --- a/summingbird-batch/src/test/scala/com/twitter/summingbird/batch/BatchLaws.scala +++ b/summingbird-batch/src/test/scala/com/twitter/summingbird/batch/BatchLaws.scala @@ -19,8 +19,6 @@ package com.twitter.summingbird.batch import org.scalacheck.{ Arbitrary, Gen, Properties } import org.scalacheck.Prop._ -import java.util.concurrent.TimeUnit - import com.twitter.algebird.{ Interval, Successible, Predecessible } object BatchLaws extends Properties("BatchID") { diff --git a/summingbird-batch/src/test/scala/com/twitter/summingbird/batch/BatcherLaws.scala b/summingbird-batch/src/test/scala/com/twitter/summingbird/batch/BatcherLaws.scala index 36f1d5cc9..010c3d7be 100644 --- a/summingbird-batch/src/test/scala/com/twitter/summingbird/batch/BatcherLaws.scala +++ b/summingbird-batch/src/test/scala/com/twitter/summingbird/batch/BatcherLaws.scala @@ -16,11 +16,9 @@ limitations under the License. package com.twitter.summingbird.batch -import org.scalacheck.{ Arbitrary, Properties } +import org.scalacheck.Properties import org.scalacheck.Prop._ -import org.scalatest.WordSpec -import com.twitter.summingbird.batch._ import com.twitter.algebird.{ Interval, ExclusiveUpper, Empty } import java.util.concurrent.TimeUnit diff --git a/summingbird-builder/src/main/scala/com/twitter/summingbird/builder/CompletedBuilder.scala b/summingbird-builder/src/main/scala/com/twitter/summingbird/builder/CompletedBuilder.scala index 5b44169a8..16e9e65fd 100644 --- a/summingbird-builder/src/main/scala/com/twitter/summingbird/builder/CompletedBuilder.scala +++ b/summingbird-builder/src/main/scala/com/twitter/summingbird/builder/CompletedBuilder.scala @@ -19,12 +19,8 @@ package com.twitter.summingbird.builder import com.twitter.bijection.Injection import com.twitter.chill.{ InjectionDefaultRegistrar, InjectionRegistrar, IKryoRegistrar } import com.twitter.chill.java.IterableRegistrar -import com.twitter.storehaus.algebra.MergeableStore.enrich -import com.twitter.summingbird.{ Env, KeyedProducer, Options, Platform, Summer } +import com.twitter.summingbird.{ Env, Options, Platform, Summer } import com.twitter.summingbird.batch.Batcher -import com.twitter.summingbird.option.CacheSize -import com.twitter.summingbird.scalding.Scalding -import com.twitter.summingbird.storm.Storm import java.io.Serializable diff --git a/summingbird-builder/src/main/scala/com/twitter/summingbird/builder/SourceBuilder.scala b/summingbird-builder/src/main/scala/com/twitter/summingbird/builder/SourceBuilder.scala index bd8218267..a57380a3b 100644 --- a/summingbird-builder/src/main/scala/com/twitter/summingbird/builder/SourceBuilder.scala +++ b/summingbird-builder/src/main/scala/com/twitter/summingbird/builder/SourceBuilder.scala @@ -17,15 +17,14 @@ limitations under the License. package com.twitter.summingbird.builder import com.twitter.algebird.{ Monoid, Semigroup } -import com.twitter.bijection.{ Codec, Injection } +import com.twitter.bijection.Codec import com.twitter.chill.IKryoRegistrar import com.twitter.chill.java.IterableRegistrar import com.twitter.storehaus.algebra.MergeableStore import com.twitter.storehaus.ReadableStore import com.twitter.summingbird._ import com.twitter.summingbird.batch.{ BatchID, Batcher } -import com.twitter.summingbird.option.CacheSize -import com.twitter.summingbird.scalding.{ Scalding, Service, ScaldingEnv, Sink } +import com.twitter.summingbird.scalding.{ Scalding, ScaldingEnv } import com.twitter.summingbird.scalding.batch.BatchedStore import com.twitter.summingbird.service.CompoundService import com.twitter.summingbird.sink.{ CompoundSink, BatchedSinkFromOffline } @@ -35,7 +34,6 @@ import com.twitter.summingbird.online._ import com.twitter.summingbird.storm.{ Storm, StormEnv, - StormSource, StormSink } import java.io.Serializable diff --git a/summingbird-builder/src/main/scala/com/twitter/summingbird/scalding/ScaldingEnv.scala b/summingbird-builder/src/main/scala/com/twitter/summingbird/scalding/ScaldingEnv.scala index 6a5b7a3e3..6bdf87001 100644 --- a/summingbird-builder/src/main/scala/com/twitter/summingbird/scalding/ScaldingEnv.scala +++ b/summingbird-builder/src/main/scala/com/twitter/summingbird/scalding/ScaldingEnv.scala @@ -18,7 +18,7 @@ package com.twitter.summingbird.scalding import com.twitter.scalding.{ Args, Config, Hdfs, RichDate, DateParser } import com.twitter.summingbird.batch.store.HDFSMetadata -import com.twitter.summingbird.{ Env, Summer, TailProducer, AbstractJob } +import com.twitter.summingbird.{ Env, Summer, TailProducer } import com.twitter.summingbird.batch.{ BatchID, Batcher, Timestamp } import com.twitter.summingbird.builder.{ SourceBuilder, CompletedBuilder } import com.twitter.summingbird.batch.option.Reducers diff --git a/summingbird-builder/src/main/scala/com/twitter/summingbird/scalding/source/RangedSource.scala b/summingbird-builder/src/main/scala/com/twitter/summingbird/scalding/source/RangedSource.scala index 1a19a5c0e..c1145a124 100644 --- a/summingbird-builder/src/main/scala/com/twitter/summingbird/scalding/source/RangedSource.scala +++ b/summingbird-builder/src/main/scala/com/twitter/summingbird/scalding/source/RangedSource.scala @@ -16,10 +16,8 @@ limitations under the License. package com.twitter.summingbird.scalding.source -import cascading.flow.FlowDef -import com.twitter.scalding.{ Mode, Mappable, DateRange, RichDate, Hours } +import com.twitter.scalding.{ Mappable, DateRange, Hours } import com.twitter.summingbird.source.OfflineSource -import java.util.Date /** * @author Oscar Boykin diff --git a/summingbird-builder/src/main/scala/com/twitter/summingbird/sink/Sink.scala b/summingbird-builder/src/main/scala/com/twitter/summingbird/sink/Sink.scala index 4e2f71d11..70c02895b 100644 --- a/summingbird-builder/src/main/scala/com/twitter/summingbird/sink/Sink.scala +++ b/summingbird-builder/src/main/scala/com/twitter/summingbird/sink/Sink.scala @@ -20,7 +20,6 @@ import cascading.flow.FlowDef import com.twitter.summingbird.batch.{ BatchID, Batcher, Timestamp } import com.twitter.scalding.{ Mode, TypedPipe } -import com.twitter.summingbird.scalding.ScaldingEnv import com.twitter.summingbird.scalding.batch.BatchedSink /** diff --git a/summingbird-builder/src/main/scala/com/twitter/summingbird/source/OfflineSource.scala b/summingbird-builder/src/main/scala/com/twitter/summingbird/source/OfflineSource.scala index 855244790..0656f4faf 100644 --- a/summingbird-builder/src/main/scala/com/twitter/summingbird/source/OfflineSource.scala +++ b/summingbird-builder/src/main/scala/com/twitter/summingbird/source/OfflineSource.scala @@ -17,18 +17,11 @@ limitations under the License. package com.twitter.summingbird.source -import cascading.flow.FlowDef import com.twitter.scalding.DateRange import com.twitter.scalding.Mappable -import com.twitter.scalding.Mode -import com.twitter.scalding.TypedPipe -import com.twitter.summingbird.batch.{ Batcher, BatchID } -import com.twitter.summingbird.scalding.ScaldingEnv import com.twitter.tormenta.spout.Spout -import java.util.Date - object OfflineSource { def apply[Event](fn: DateRange => Mappable[Event]) = new OfflineSource[Event] { diff --git a/summingbird-builder/src/main/scala/com/twitter/summingbird/store/CompoundStore.scala b/summingbird-builder/src/main/scala/com/twitter/summingbird/store/CompoundStore.scala index 111992dc3..99cc9d6eb 100644 --- a/summingbird-builder/src/main/scala/com/twitter/summingbird/store/CompoundStore.scala +++ b/summingbird-builder/src/main/scala/com/twitter/summingbird/store/CompoundStore.scala @@ -17,7 +17,6 @@ limitations under the License. package com.twitter.summingbird.store import com.twitter.summingbird.online.Externalizer -import com.twitter.storehaus.ReadableStore import com.twitter.storehaus.algebra.Mergeable import com.twitter.summingbird.batch.BatchID import com.twitter.summingbird.scalding.batch.BatchedStore diff --git a/summingbird-builder/src/test/scala/com/twitter/summingbird/builder/BuilderJobTest.scala b/summingbird-builder/src/test/scala/com/twitter/summingbird/builder/BuilderJobTest.scala index 8e539b27e..af4d23216 100644 --- a/summingbird-builder/src/test/scala/com/twitter/summingbird/builder/BuilderJobTest.scala +++ b/summingbird-builder/src/test/scala/com/twitter/summingbird/builder/BuilderJobTest.scala @@ -32,7 +32,6 @@ import java.util.Date import scala.util.Try object TestJob { - import Dsl._ import StoreAlgebra.enrich implicit val batcher: Batcher = Batcher.ofHours(1) diff --git a/summingbird-builder/src/test/scala/com/twitter/summingbird/builder/OptionsTest.scala b/summingbird-builder/src/test/scala/com/twitter/summingbird/builder/OptionsTest.scala index 535c787b4..21185f7c8 100644 --- a/summingbird-builder/src/test/scala/com/twitter/summingbird/builder/OptionsTest.scala +++ b/summingbird-builder/src/test/scala/com/twitter/summingbird/builder/OptionsTest.scala @@ -28,9 +28,6 @@ import org.scalatest.WordSpec import org.apache.hadoop.conf.Configuration -import com.twitter.bijection.Conversion.asMethod -import ConfigBijection._ - class TestJob1(env: Env) extends AbstractJob(env) { implicit def batcher = Batcher.ofHours(1) diff --git a/summingbird-chill/src/test/scala/com/twitter/summingbird/chill/SerializerLaws.scala b/summingbird-chill/src/test/scala/com/twitter/summingbird/chill/SerializerLaws.scala index 78e3021e4..81a3eb37b 100644 --- a/summingbird-chill/src/test/scala/com/twitter/summingbird/chill/SerializerLaws.scala +++ b/summingbird-chill/src/test/scala/com/twitter/summingbird/chill/SerializerLaws.scala @@ -18,7 +18,6 @@ package com.twitter.summingbird.chill import org.scalacheck.{ Arbitrary, Properties } import org.scalacheck.Prop._ -import org.scalatest.WordSpec import com.twitter.chill._ import com.twitter.summingbird.batch._ diff --git a/summingbird-client/src/main/scala/com/twitter/summingbird/store/ClientMergeable.scala b/summingbird-client/src/main/scala/com/twitter/summingbird/store/ClientMergeable.scala index 285e9940a..6852fe299 100644 --- a/summingbird-client/src/main/scala/com/twitter/summingbird/store/ClientMergeable.scala +++ b/summingbird-client/src/main/scala/com/twitter/summingbird/store/ClientMergeable.scala @@ -18,10 +18,9 @@ package com.twitter.summingbird.store import com.twitter.algebird.{ MapMonoid, Monoid, Semigroup } import com.twitter.algebird.util.UtilAlgebras._ -import com.twitter.bijection.Pivot import com.twitter.storehaus.{ FutureCollector, FutureOps, ReadableStore } -import com.twitter.storehaus.algebra.{ Mergeable, MergeableStore } -import com.twitter.summingbird.batch.{ BatchID, Batcher, Timestamp } +import com.twitter.storehaus.algebra.Mergeable +import com.twitter.summingbird.batch.{ BatchID, Batcher } import com.twitter.util.Future import scala.collection.breakOut diff --git a/summingbird-client/src/main/scala/com/twitter/summingbird/store/MergeOperations.scala b/summingbird-client/src/main/scala/com/twitter/summingbird/store/MergeOperations.scala index 3bb8c6b32..7ededb457 100644 --- a/summingbird-client/src/main/scala/com/twitter/summingbird/store/MergeOperations.scala +++ b/summingbird-client/src/main/scala/com/twitter/summingbird/store/MergeOperations.scala @@ -21,7 +21,7 @@ import com.twitter.algebird.util.UtilAlgebras._ import com.twitter.bijection.Pivot import com.twitter.storehaus.FutureCollector import com.twitter.summingbird.batch.BatchID -import com.twitter.util.{ Future, Return, Try } +import com.twitter.util.Future object MergeOperations { type FOpt[T] = Future[Option[T]] diff --git a/summingbird-client/src/main/scala/com/twitter/summingbird/store/PresentingStore.scala b/summingbird-client/src/main/scala/com/twitter/summingbird/store/PresentingStore.scala index 3723d062a..707ac06d4 100644 --- a/summingbird-client/src/main/scala/com/twitter/summingbird/store/PresentingStore.scala +++ b/summingbird-client/src/main/scala/com/twitter/summingbird/store/PresentingStore.scala @@ -19,7 +19,6 @@ package com.twitter.summingbird.store import com.twitter.storehaus.{ ReadableStore, Store } import com.twitter.storehaus.algebra.MergeableStore import com.twitter.summingbird.batch.BatchID -import com.twitter.util.Future /** * Returns a MergeableStore that augments a Summingbird "online diff --git a/summingbird-core/src/main/scala/com/twitter/summingbird/ExecutionConfig.scala b/summingbird-core/src/main/scala/com/twitter/summingbird/ExecutionConfig.scala index 878956263..94b7049ce 100644 --- a/summingbird-core/src/main/scala/com/twitter/summingbird/ExecutionConfig.scala +++ b/summingbird-core/src/main/scala/com/twitter/summingbird/ExecutionConfig.scala @@ -16,8 +16,6 @@ package com.twitter.summingbird -import com.twitter.summingbird._ - /** * @author Ian O Connell */ @@ -34,4 +32,3 @@ trait ExecutionConfig[P <: Platform[P]] { def graph: TailProducer[P, Any] } - diff --git a/summingbird-core/src/main/scala/com/twitter/summingbird/Stats.scala b/summingbird-core/src/main/scala/com/twitter/summingbird/Stats.scala index 93a632c96..a230a0b20 100644 --- a/summingbird-core/src/main/scala/com/twitter/summingbird/Stats.scala +++ b/summingbird-core/src/main/scala/com/twitter/summingbird/Stats.scala @@ -17,12 +17,10 @@ package com.twitter.summingbird import com.twitter.summingbird.option.JobId -import scala.collection.JavaConverters._ import scala.collection.parallel.mutable.ParHashSet import scala.ref.WeakReference import scala.util.Try import java.util.concurrent.ConcurrentHashMap -import java.util.Collections trait CounterIncrementor { def incrBy(by: Long): Unit diff --git a/summingbird-core/src/main/scala/com/twitter/summingbird/memory/ConcurrentMemory.scala b/summingbird-core/src/main/scala/com/twitter/summingbird/memory/ConcurrentMemory.scala index eab8524bc..1ab274bba 100644 --- a/summingbird-core/src/main/scala/com/twitter/summingbird/memory/ConcurrentMemory.scala +++ b/summingbird-core/src/main/scala/com/twitter/summingbird/memory/ConcurrentMemory.scala @@ -23,9 +23,8 @@ import com.twitter.summingbird.planner.DagOptimizer import com.twitter.algebird.{ Monoid, Semigroup } import com.twitter.summingbird._ import com.twitter.summingbird.option.JobId -import scala.collection.mutable.Buffer import scala.concurrent.{ ExecutionContext, Future } -import java.util.concurrent.{ BlockingQueue, LinkedBlockingQueue, ConcurrentHashMap } +import java.util.concurrent.{ BlockingQueue, ConcurrentHashMap } object ConcurrentMemory { implicit def toSource[T](traversable: TraversableOnce[T]): Producer[ConcurrentMemory, T] = diff --git a/summingbird-example/src/main/scala/com/twitter/summingbird/example/ExampleJob.scala b/summingbird-example/src/main/scala/com/twitter/summingbird/example/ExampleJob.scala index cdf43e02e..7c3e7d383 100644 --- a/summingbird-example/src/main/scala/com/twitter/summingbird/example/ExampleJob.scala +++ b/summingbird-example/src/main/scala/com/twitter/summingbird/example/ExampleJob.scala @@ -18,11 +18,7 @@ package com.twitter.summingbird.example import com.twitter.summingbird._ import com.twitter.summingbird.batch.Batcher -import com.twitter.summingbird.online.MergeableStoreFactory -import com.twitter.summingbird.storm.Storm import twitter4j.Status -import twitter4j.TwitterStreamFactory -import twitter4j.conf.ConfigurationBuilder object StatusStreamer { /** diff --git a/summingbird-example/src/main/scala/com/twitter/summingbird/example/Storage.scala b/summingbird-example/src/main/scala/com/twitter/summingbird/example/Storage.scala index 490155528..3f0b807e3 100644 --- a/summingbird-example/src/main/scala/com/twitter/summingbird/example/Storage.scala +++ b/summingbird-example/src/main/scala/com/twitter/summingbird/example/Storage.scala @@ -26,7 +26,6 @@ import com.twitter.finagle.memcached.protocol.text.Memcached import com.twitter.storehaus.Store import com.twitter.storehaus.algebra.MergeableStore import com.twitter.storehaus.memcache.{ HashEncoder, MemcacheStore } -import com.twitter.summingbird.batch.BatchID import org.jboss.netty.buffer.ChannelBuffer /** diff --git a/summingbird-online/src/main/scala/com/twitter/summingbird/online/FlatMapOperation.scala b/summingbird-online/src/main/scala/com/twitter/summingbird/online/FlatMapOperation.scala index 1dfbdfd19..d5f541169 100644 --- a/summingbird-online/src/main/scala/com/twitter/summingbird/online/FlatMapOperation.scala +++ b/summingbird-online/src/main/scala/com/twitter/summingbird/online/FlatMapOperation.scala @@ -16,7 +16,6 @@ package com.twitter.summingbird.online -import com.twitter.storehaus.ReadableStore import com.twitter.util.{ Future, Await } import java.io.{ Closeable, Serializable } diff --git a/summingbird-online/src/main/scala/com/twitter/summingbird/online/FutureQueue.scala b/summingbird-online/src/main/scala/com/twitter/summingbird/online/FutureQueue.scala index 4acf98a4a..a8844b316 100644 --- a/summingbird-online/src/main/scala/com/twitter/summingbird/online/FutureQueue.scala +++ b/summingbird-online/src/main/scala/com/twitter/summingbird/online/FutureQueue.scala @@ -18,11 +18,11 @@ package com.twitter.summingbird.online import com.twitter.bijection.twitter_util.UtilBijections import com.twitter.summingbird.online.option.{ MaxFutureWaitTime, MaxWaitingFutures } -import com.twitter.util.{ Await, Future, Promise, Return, Throw } +import com.twitter.util.{ Await, Future, Promise } import java.util.concurrent.TimeoutException import java.util.concurrent.atomic.AtomicInteger import org.slf4j.{ Logger, LoggerFactory } -import scala.util.{ Failure, Success, Try } +import scala.util.Try private[summingbird] object FutureQueue { /** diff --git a/summingbird-online/src/main/scala/com/twitter/summingbird/online/MergeableStoreFactory.scala b/summingbird-online/src/main/scala/com/twitter/summingbird/online/MergeableStoreFactory.scala index bf43387eb..8eadeb326 100644 --- a/summingbird-online/src/main/scala/com/twitter/summingbird/online/MergeableStoreFactory.scala +++ b/summingbird-online/src/main/scala/com/twitter/summingbird/online/MergeableStoreFactory.scala @@ -17,7 +17,7 @@ package com.twitter.summingbird.online import com.twitter.algebird.Semigroup -import com.twitter.storehaus.algebra.{ MergeableStore, Mergeable, StoreAlgebra } +import com.twitter.storehaus.algebra.{ MergeableStore, Mergeable } import com.twitter.summingbird.batch.{ Batcher, BatchID } /* diff --git a/summingbird-online/src/main/scala/com/twitter/summingbird/online/Queue.scala b/summingbird-online/src/main/scala/com/twitter/summingbird/online/Queue.scala index 2fa1af000..775ce33f5 100644 --- a/summingbird-online/src/main/scala/com/twitter/summingbird/online/Queue.scala +++ b/summingbird-online/src/main/scala/com/twitter/summingbird/online/Queue.scala @@ -16,10 +16,8 @@ limitations under the License. package com.twitter.summingbird.online -import com.twitter.util.{ Await, Duration, Future, Try } - import java.util.{ Queue => JQueue } -import java.util.concurrent.{ ArrayBlockingQueue, BlockingQueue, LinkedBlockingQueue, TimeUnit } +import java.util.concurrent.{ ArrayBlockingQueue, BlockingQueue, LinkedBlockingQueue } import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicInteger /** diff --git a/summingbird-online/src/main/scala/com/twitter/summingbird/online/WrappedTSInMergeable.scala b/summingbird-online/src/main/scala/com/twitter/summingbird/online/WrappedTSInMergeable.scala index 3c92b75bf..44179f029 100644 --- a/summingbird-online/src/main/scala/com/twitter/summingbird/online/WrappedTSInMergeable.scala +++ b/summingbird-online/src/main/scala/com/twitter/summingbird/online/WrappedTSInMergeable.scala @@ -18,7 +18,7 @@ package com.twitter.summingbird.online import com.twitter.algebird.{ Semigroup, Tuple2Semigroup } import com.twitter.storehaus.algebra.Mergeable -import com.twitter.summingbird.batch.{ BatchID, Timestamp } +import com.twitter.summingbird.batch.{ Timestamp } import com.twitter.util.{ Future, Time } // Cannot use a MergeableProxy here since we change the type. diff --git a/summingbird-online/src/test/scala/com/twitter/summingbird/online/PlannerSpec.scala b/summingbird-online/src/test/scala/com/twitter/summingbird/online/PlannerSpec.scala index 6023dabfe..dbdbace1e 100644 --- a/summingbird-online/src/test/scala/com/twitter/summingbird/online/PlannerSpec.scala +++ b/summingbird-online/src/test/scala/com/twitter/summingbird/online/PlannerSpec.scala @@ -16,21 +16,14 @@ package com.twitter.summingbird.online -import com.twitter.algebird.{ MapAlgebra, Semigroup } -import com.twitter.storehaus.{ JMapStore, ReadableStore } -import com.twitter.storehaus.algebra.MergeableStore import com.twitter.summingbird._ import com.twitter.summingbird.memory._ import com.twitter.summingbird.planner._ import com.twitter.summingbird.online.option._ -import com.twitter.util.Future import org.scalatest.WordSpec -import scala.collection.JavaConverters._ import scala.collection.mutable.{ Map => MMap } import org.scalacheck._ -import Gen._ import Arbitrary._ -import org.scalacheck.Prop._ import scala.util.{ Failure, Success, Try } /** diff --git a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/LoopState.scala b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/LoopState.scala index 0a748eb4c..a3069f96d 100644 --- a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/LoopState.scala +++ b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/LoopState.scala @@ -16,7 +16,6 @@ package com.twitter.summingbird.scalding -import com.twitter.algebird.monad._ import com.twitter.summingbird.batch._ // This is not really usable, just a mock that does the same state over and over diff --git a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/MockMappable.scala b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/MockMappable.scala index 5360f5ccc..161ff75bb 100644 --- a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/MockMappable.scala +++ b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/MockMappable.scala @@ -18,7 +18,7 @@ package com.twitter.summingbird.scalding import cascading.scheme.NullScheme import cascading.tap.Tap -import cascading.tuple.{ Tuple, Fields, TupleEntry } +import cascading.tuple.Fields import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } import java.io.{ InputStream, OutputStream } import org.apache.hadoop.mapred.JobConf diff --git a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestService.scala b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestService.scala index a3816b69e..7fa533312 100644 --- a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestService.scala +++ b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestService.scala @@ -19,7 +19,7 @@ package com.twitter.summingbird.scalding import com.twitter.algebird.monad._ import com.twitter.summingbird.batch._ -import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } +import com.twitter.scalding.{ Source => ScaldingSource, _ } import com.twitter.summingbird.scalding.batch.{ BatchedService => BBatchedService } import scala.collection.mutable.Buffer import cascading.tuple.Tuple diff --git a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestSink.scala b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestSink.scala index f657d5a36..3a264391d 100644 --- a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestSink.scala +++ b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestSink.scala @@ -16,12 +16,8 @@ package com.twitter.summingbird.scalding -import com.twitter.algebird.monad._ import com.twitter.summingbird.batch._ -import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } -import com.twitter.scalding.typed.TypedSink - /** * This is a test sink that assumes single threaded testing with * cascading local mode diff --git a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestSource.scala b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestSource.scala index 2a452ce65..d0f22171e 100644 --- a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestSource.scala +++ b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestSource.scala @@ -18,14 +18,10 @@ package com.twitter.summingbird.scalding -import com.twitter.algebird.monad._ -import com.twitter.summingbird.batch._ - -import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } +import com.twitter.scalding.{ Source => ScaldingSource, _ } import com.twitter.summingbird.{ Producer, TimeExtractor } import scala.collection.mutable.Buffer import cascading.tuple.Tuple -import cascading.flow.FlowDef class LocalIterableSource[+T](src: Iterable[T], valid: Boolean) extends IterableSource[T](src) { override def validateTaps(mode: Mode): Unit = { diff --git a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestStore.scala b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestStore.scala index ec5eeacdf..0f475ce3c 100644 --- a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestStore.scala +++ b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestStore.scala @@ -16,17 +16,14 @@ package com.twitter.summingbird.scalding -import com.twitter.algebird.Semigroup import com.twitter.algebird.monad._ import com.twitter.summingbird.batch._ -import com.twitter.summingbird.batch.state.HDFSState -import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } +import com.twitter.scalding.{ Source => ScaldingSource, _ } import com.twitter.scalding.typed.TypedSink import scala.collection.mutable.Buffer -import cascading.scheme.local.{ TextDelimited => CLTextDelimited } import cascading.tuple.{ Tuple, TupleEntry } import cascading.flow.FlowDef diff --git a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestUtil.scala b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestUtil.scala index 97e9ba2c3..e64408cf0 100644 --- a/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestUtil.scala +++ b/summingbird-scalding-test/src/main/scala/com/twitter/summingbird/scalding/TestUtil.scala @@ -16,16 +16,11 @@ package com.twitter.summingbird.scalding -import com.twitter.algebird.{ MapAlgebra, Monoid, Group, Interval, Last } -import com.twitter.algebird.monad._ +import com.twitter.algebird.{ Monoid, Group, Interval } import com.twitter.summingbird.batch._ import com.twitter.summingbird.TimeExtractor -import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } - import org.scalacheck._ -import org.scalacheck.Prop._ -import org.scalacheck.Properties object TestUtil { def simpleTimeExtractor[T <: (Long, _)]: TimeExtractor[T] = TimeExtractor(_._1) diff --git a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingLaws.scala b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingLaws.scala index e73f625b9..a5982f199 100644 --- a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingLaws.scala +++ b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingLaws.scala @@ -16,39 +16,22 @@ package com.twitter.summingbird.scalding -import com.twitter.algebird.{ MapAlgebra, Monoid, Group, Interval, Last } -import com.twitter.algebird.monad._ -import com.twitter.summingbird.{ Producer, TimeExtractor, TestGraphs } +import com.twitter.algebird.{ MapAlgebra, Monoid } +import com.twitter.summingbird.TestGraphs import com.twitter.summingbird.batch._ -import com.twitter.summingbird.batch.state.HDFSState import com.twitter.summingbird.option.JobId import com.twitter.summingbird.SummingbirdRuntimeStats -import java.util.TimeZone -import java.io.File - -import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } -import com.twitter.scalding.typed.TypedSink +import com.twitter.scalding.{ Test => TestMode, _ } import org.scalacheck._ -import org.scalacheck.Prop._ -import org.scalacheck.Properties import org.apache.hadoop.conf.Configuration -import scala.collection.JavaConverters._ -import scala.collection.mutable.{ ArrayBuffer, Buffer, HashMap => MutableHashMap, Map => MutableMap, SynchronizedBuffer, SynchronizedMap } import scala.util.{ Try => ScalaTry } -import cascading.scheme.local.{ TextDelimited => CLTextDelimited } -import cascading.tuple.{ Tuple, Fields, TupleEntry } import cascading.flow.Flow import cascading.stats.FlowStats -import cascading.tap.Tap -import cascading.scheme.NullScheme -import org.apache.hadoop.mapred.JobConf -import org.apache.hadoop.mapred.RecordReader -import org.apache.hadoop.mapred.OutputCollector import org.scalatest.WordSpec diff --git a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingSerializationSpec.scala b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingSerializationSpec.scala index ac91e378c..bb4abc4df 100644 --- a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingSerializationSpec.scala +++ b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/ScaldingSerializationSpec.scala @@ -16,36 +16,14 @@ package com.twitter.summingbird.scalding -import com.twitter.algebird.{ MapAlgebra, Monoid, Group, Interval, Last } -import com.twitter.algebird.monad._ -import com.twitter.summingbird.{ Producer, TimeExtractor, TestGraphs } +import com.twitter.algebird.Interval +import com.twitter.summingbird.{ TimeExtractor, TestGraphs } import com.twitter.summingbird.batch._ -import com.twitter.summingbird.batch.state.HDFSState -import java.util.TimeZone -import java.io.File - -import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } -import com.twitter.scalding.typed.TypedSink - -import org.scalacheck._ -import org.scalacheck.Prop._ -import org.scalacheck.Properties +import com.twitter.scalding.{ Source => ScaldingSource, _ } import org.apache.hadoop.conf.Configuration -import scala.collection.JavaConverters._ -import scala.collection.mutable.{ ArrayBuffer, Buffer, HashMap => MutableHashMap, Map => MutableMap, SynchronizedBuffer, SynchronizedMap } - -import cascading.scheme.local.{ TextDelimited => CLTextDelimited } -import cascading.tuple.{ Tuple, Fields, TupleEntry } -import cascading.flow.FlowDef -import cascading.tap.Tap -import cascading.scheme.NullScheme -import org.apache.hadoop.mapred.JobConf -import org.apache.hadoop.mapred.RecordReader -import org.apache.hadoop.mapred.OutputCollector - import org.scalatest.WordSpec import com.twitter.scalding.Config diff --git a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/TimePathedSourceTest.scala b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/TimePathedSourceTest.scala index ed302eede..c393ced84 100644 --- a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/TimePathedSourceTest.scala +++ b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/TimePathedSourceTest.scala @@ -16,9 +16,7 @@ package com.twitter.summingbird.scalding -import com.twitter.summingbird.scalding._ import source.{ TimePathedSource => BTimePathedSource } -import com.twitter.summingbird._ import org.scalacheck._ import Gen._ import Arbitrary._ diff --git a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchLaws.scala b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchLaws.scala index 7c6a773f4..4b2dea790 100644 --- a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchLaws.scala +++ b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchLaws.scala @@ -16,38 +16,11 @@ package com.twitter.summingbird.scalding -import com.twitter.algebird.{ MapAlgebra, Monoid, Group, Interval, Last } -import com.twitter.algebird.monad._ -import com.twitter.summingbird.{ Producer, TimeExtractor, TestGraphs } import com.twitter.summingbird.batch._ -import com.twitter.summingbird.batch.state.HDFSState -import java.util.TimeZone -import java.io.File - -import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } -import com.twitter.scalding.typed.TypedSink - -import org.scalacheck._ import org.scalacheck.Prop._ import org.scalacheck.Properties -import org.apache.hadoop.conf.Configuration - -import scala.collection.JavaConverters._ -import scala.collection.mutable.{ ArrayBuffer, Buffer, HashMap => MutableHashMap, Map => MutableMap, SynchronizedBuffer, SynchronizedMap } - -import cascading.scheme.local.{ TextDelimited => CLTextDelimited } -import cascading.tuple.{ Tuple, Fields, TupleEntry } -import cascading.flow.FlowDef -import cascading.tap.Tap -import cascading.scheme.NullScheme -import org.apache.hadoop.mapred.JobConf -import org.apache.hadoop.mapred.RecordReader -import org.apache.hadoop.mapred.OutputCollector - -import org.scalatest.WordSpec - object VersionBatchLaws extends Properties("VersionBatchLaws") { property("version -> BatchID -> version") = forAll { (l: Long) => (l == Long.MinValue) || { @@ -76,4 +49,3 @@ object VersionBatchLaws extends Properties("VersionBatchLaws") { (batcher.earliestTimeOf(b.next.next).milliSinceEpoch > l) } } - diff --git a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchedStoreTest.scala b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchedStoreTest.scala index a5f983aaa..77061a8d0 100644 --- a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchedStoreTest.scala +++ b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/VersionBatchedStoreTest.scala @@ -16,42 +16,18 @@ package com.twitter.summingbird.scalding -import com.twitter.algebird.{ MapAlgebra, Monoid, Group, Interval, Last } -import com.twitter.algebird.monad._ -import com.twitter.summingbird.{ Producer, TimeExtractor, TestGraphs } +import com.twitter.algebird.MapAlgebra +import com.twitter.summingbird.TestGraphs import com.twitter.summingbird.batch._ -import com.twitter.summingbird.batch.state.HDFSState -import com.twitter.summingbird.option.JobId -import com.twitter.summingbird.SummingbirdRuntimeStats import com.twitter.summingbird.scalding.store.{ VersionedBatchStore, InitialBatchedStore } import com.twitter.bijection._ import com.twitter.scalding.commons.source.VersionedKeyValSource -import java.util.TimeZone import java.io.File -import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } -import com.twitter.scalding.typed.TypedSink +import com.twitter.scalding._ import org.scalacheck._ -import org.scalacheck.Prop._ -import org.scalacheck.Properties - -import org.apache.hadoop.conf.Configuration - -import scala.collection.JavaConverters._ -import scala.collection.mutable.{ ArrayBuffer, Buffer, HashMap => MutableHashMap, Map => MutableMap, SynchronizedBuffer, SynchronizedMap } -import scala.util.{ Try => ScalaTry } - -import cascading.scheme.local.{ TextDelimited => CLTextDelimited } -import cascading.tuple.{ Tuple, Fields, TupleEntry } -import cascading.flow.Flow -import cascading.stats.FlowStats -import cascading.tap.Tap -import cascading.scheme.NullScheme -import org.apache.hadoop.mapred.JobConf -import org.apache.hadoop.mapred.RecordReader -import org.apache.hadoop.mapred.OutputCollector import org.scalatest.WordSpec diff --git a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/batch/LTuple2Test.scala b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/batch/LTuple2Test.scala index a8bbb6b48..634b831b1 100644 --- a/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/batch/LTuple2Test.scala +++ b/summingbird-scalding-test/src/test/scala/com/twitter/summingbird/scalding/batch/LTuple2Test.scala @@ -16,15 +16,6 @@ package com.twitter.summingbird.scalding.batch -import cascading.flow.{ Flow, FlowDef } - -import com.twitter.algebird._ -import com.twitter.algebird.monad._ -import com.twitter.summingbird.batch._ -import com.twitter.summingbird.option.{ Commutative, NonCommutative, Commutativity } -import com.twitter.scalding.{ Source => ScaldingSource, Test => TestMode, _ } - -import org.scalacheck._ import org.scalacheck.Prop._ import org.scalacheck.Properties diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/Service.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/Service.scala index da00b85ed..7d884aff6 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/Service.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/Service.scala @@ -17,7 +17,6 @@ package com.twitter.summingbird.scalding import com.twitter.algebird.Semigroup -import com.twitter.scalding.TypedPipe import com.twitter.scalding.typed.LookupJoin import com.twitter.summingbird._ import com.twitter.summingbird.option._ @@ -189,7 +188,7 @@ private[scalding] object InternalService { * @param left TypedPipe of producer of input to the join * @param mergeLog TypedPipe of merges to the store * @param valueExpansion a function on the values coming out of the join - * @param reduers an option number of reducers to use for the join + * @param reducers an option number of reducers to use for the join * * This function performs the loop join by sorting the input by time and then calling scanLeft to merge the two TypedPipes. * The result is a join stream and the output stream of the store. diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/Store.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/Store.scala index a9ef2cc0f..c530cd8a6 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/Store.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/Store.scala @@ -17,13 +17,7 @@ package com.twitter.summingbird.scalding import com.twitter.algebird.Semigroup -import com.twitter.algebird.monad.{ StateWithError, Reader } -import com.twitter.scalding.{ Dsl, TypedPipe, MapsideReduce, TupleSetter, TupleConverter } -import com.twitter.summingbird._ import com.twitter.summingbird.option._ -import cascading.flow.FlowDef - -import org.slf4j.LoggerFactory trait Store[K, V] extends java.io.Serializable { /** diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/batch/BatchedOperations.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/batch/BatchedOperations.scala index 831b3a49a..44657883f 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/batch/BatchedOperations.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/batch/BatchedOperations.scala @@ -17,14 +17,11 @@ package com.twitter.summingbird.scalding.batch import com.twitter.summingbird.batch.{ BatchID, Batcher } -import com.twitter.algebird.{ Universe, Empty, Interval, Intersection, InclusiveLower, ExclusiveUpper, InclusiveUpper } -import com.twitter.bijection.{ Injection, Bijection, Conversion } +import com.twitter.algebird.Interval import com.twitter.summingbird.batch.Timestamp import com.twitter.summingbird.scalding._ import com.twitter.scalding.Mode -import Conversion.asMethod - /** * Services and Stores are very similar, but not exact. * This shares the logic for them. diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/batch/BatchedSink.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/batch/BatchedSink.scala index 9e8873c99..197438e09 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/batch/BatchedSink.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/batch/BatchedSink.scala @@ -17,7 +17,7 @@ package com.twitter.summingbird.scalding.batch import com.twitter.algebird.monad.{ StateWithError, Reader } -import com.twitter.algebird.{ Interval, Intersection, InclusiveLower, ExclusiveUpper, InclusiveUpper } +import com.twitter.algebird.Interval import com.twitter.summingbird.batch.{ BatchID, Batcher, Timestamp } import com.twitter.summingbird.scalding._ import com.twitter.scalding.Mode diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/package.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/package.scala index eeb9313b5..1c0749fa2 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/package.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/package.scala @@ -23,9 +23,7 @@ import cascading.flow.FlowDef import com.twitter.algebird.monad.{ Reader, StateWithError } import com.twitter.algebird.Interval -import com.twitter.summingbird import com.twitter.summingbird.batch.Timestamp -import org.apache.hadoop.io.Writable package object scalding { /** How we represent the streams in scalding */ diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/BatchedDeltaService.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/BatchedDeltaService.scala index d2eb573f3..41a61944c 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/BatchedDeltaService.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/BatchedDeltaService.scala @@ -16,12 +16,10 @@ package com.twitter.summingbird.scalding.service -import com.twitter.algebird.monad.{ StateWithError, Reader } import com.twitter.algebird.Semigroup import com.twitter.scalding.{ Mode, TypedPipe } import com.twitter.scalding.typed.LookupJoin -import com.twitter.summingbird.batch.{ BatchID, Batcher, Timestamp } -import cascading.flow.FlowDef +import com.twitter.summingbird.batch.{ BatchID, Timestamp } import com.twitter.summingbird.scalding._ /** diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/BatchedWindowService.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/BatchedWindowService.scala index ce88543ce..9fbc5eb28 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/BatchedWindowService.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/BatchedWindowService.scala @@ -16,12 +16,10 @@ package com.twitter.summingbird.scalding.service -import com.twitter.summingbird.batch.{ BatchID, Batcher, Timestamp, Milliseconds } +import com.twitter.summingbird.batch.{ BatchID, Timestamp, Milliseconds } import com.twitter.summingbird.scalding._ -import com.twitter.scalding.{ Mode, TypedPipe, AbsoluteDuration } +import com.twitter.scalding.{ Mode, TypedPipe } import com.twitter.scalding.typed.LookupJoin -import com.twitter.algebird.monad.Reader -import cascading.flow.FlowDef /** * This is a service that has a finite memory. There is a materialized diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/SimpleService.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/SimpleService.scala index 07dbf03c7..b4032d8c9 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/SimpleService.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/SimpleService.scala @@ -21,7 +21,7 @@ import com.twitter.algebird.Interval import com.twitter.bijection.Conversion.asMethod import com.twitter.summingbird.scalding._ import com.twitter.summingbird.batch.Timestamp -import com.twitter.scalding.{ Source => SSource, _ } +import com.twitter.scalding._ import cascading.flow.FlowDef /** diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/SimpleWindowService.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/SimpleWindowService.scala index c405719e9..c664efb47 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/SimpleWindowService.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/service/SimpleWindowService.scala @@ -16,9 +16,9 @@ package com.twitter.summingbird.scalding.service -import com.twitter.summingbird.batch.{ BatchID, Batcher, Timestamp } +import com.twitter.summingbird.batch.{ BatchID, Timestamp } import com.twitter.summingbird.scalding._ -import com.twitter.scalding.{ Mode, TypedPipe, AbsoluteDuration } +import com.twitter.scalding.{ Mode, TypedPipe } import com.twitter.algebird.monad.Reader import cascading.flow.FlowDef diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/InitialBatchedStore.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/InitialBatchedStore.scala index c16c81c77..0273c2e27 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/InitialBatchedStore.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/InitialBatchedStore.scala @@ -17,12 +17,10 @@ package com.twitter.summingbird.scalding.store import com.twitter.scalding.{ Mode, TypedPipe } -import com.twitter.summingbird._ import com.twitter.summingbird.scalding.batch.BatchedStore import com.twitter.summingbird.scalding.{ Try, FlowProducer, Scalding } import com.twitter.summingbird.batch.{ BatchID, OrderedFromOrderingExt } import cascading.flow.FlowDef -import com.twitter.summingbird.scalding._ /** * For (firstNonZero - 1) we read empty. For all before we error on read. For all later, we proxy diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/VersionedBatchStore.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/VersionedBatchStore.scala index d1407f42c..e6be055df 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/VersionedBatchStore.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/VersionedBatchStore.scala @@ -20,14 +20,12 @@ import cascading.flow.FlowDef import com.twitter.algebird.monad.Reader import com.twitter.bijection.Injection import com.twitter.scalding.commons.source.VersionedKeyValSource -import com.twitter.scalding.{ Mode, TypedPipe, Hdfs => HdfsMode, TupleSetter } +import com.twitter.scalding.{ Mode, TypedPipe, Hdfs => HdfsMode } import com.twitter.summingbird.batch.store.HDFSMetadata import com.twitter.summingbird.batch.{ BatchID, Batcher, Timestamp, OrderedFromOrderingExt } -import com.twitter.summingbird.scalding._ import com.twitter.summingbird.scalding.batch.BatchedStore -import com.twitter.summingbird.scalding.{ Try, FlowProducer, Scalding } +import com.twitter.summingbird.scalding.{ Try, FlowProducer } import org.slf4j.LoggerFactory -import scala.util.{ Try => ScalaTry } /** * Scalding implementation of the batch read and write components of a diff --git a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/VersionedStore.scala b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/VersionedStore.scala index dd55e9c1f..4334211c3 100644 --- a/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/VersionedStore.scala +++ b/summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/store/VersionedStore.scala @@ -16,13 +16,9 @@ limitations under the License. package com.twitter.summingbird.scalding.store -import cascading.flow.FlowDef import com.twitter.bijection.Injection -import com.twitter.scalding.{ Dsl, Mode, TDsl, TypedPipe } import com.twitter.scalding.commons.source.VersionedKeyValSource -import com.twitter.summingbird.batch.{ Batcher, BatchID, PrunedSpace, Timestamp } -import scala.util.control.Exception.allCatch -import com.twitter.summingbird.scalding._ +import com.twitter.summingbird.batch.{ Batcher, BatchID, PrunedSpace } /** * Scalding implementation of the batch read and write components diff --git a/summingbird-storm-test/src/main/scala/com/twitter/summingbird/storm/StormTestRun.scala b/summingbird-storm-test/src/main/scala/com/twitter/summingbird/storm/StormTestRun.scala index ea76cfabb..9174c50f5 100644 --- a/summingbird-storm-test/src/main/scala/com/twitter/summingbird/storm/StormTestRun.scala +++ b/summingbird-storm-test/src/main/scala/com/twitter/summingbird/storm/StormTestRun.scala @@ -17,16 +17,13 @@ package com.twitter.summingbird.storm import com.twitter.algebird.Semigroup -import backtype.storm.{ Config => BacktypeStormConfig, LocalCluster, Testing } +import backtype.storm.{ Config => BacktypeStormConfig, LocalCluster } import com.twitter.summingbird.online.executor.InflightTuples import backtype.storm.testing.{ CompleteTopologyParam, MockedSources } import com.twitter.summingbird.storm.spout.TraversableSpout import com.twitter.summingbird.online.option._ import com.twitter.summingbird.option._ import com.twitter.summingbird._ -import com.twitter.summingbird.planner._ -import com.twitter.tormenta.spout.Spout -import scala.collection.JavaConverters._ import java.security.Permission import com.twitter.util.Duration diff --git a/summingbird-storm-test/src/main/scala/com/twitter/summingbird/storm/TestStore.scala b/summingbird-storm-test/src/main/scala/com/twitter/summingbird/storm/TestStore.scala index 6e17db892..ec5ec9e32 100644 --- a/summingbird-storm-test/src/main/scala/com/twitter/summingbird/storm/TestStore.scala +++ b/summingbird-storm-test/src/main/scala/com/twitter/summingbird/storm/TestStore.scala @@ -23,7 +23,6 @@ import com.twitter.summingbird.online._ import com.twitter.util.Future import java.util.{ Collections, HashMap, Map => JMap, UUID } import java.util.concurrent.atomic.AtomicInteger -import scala.collection.mutable.SynchronizedMap import java.util.WeakHashMap import scala.collection.JavaConverters._ diff --git a/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/InjectionLaws.scala b/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/InjectionLaws.scala index 742c4cb51..91e6f2f2b 100644 --- a/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/InjectionLaws.scala +++ b/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/InjectionLaws.scala @@ -19,7 +19,6 @@ package com.twitter.summingbird.storm import com.twitter.summingbird.batch.Timestamp import org.scalacheck._ -import Gen._ import Arbitrary._ import org.scalacheck.Prop._ diff --git a/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormLaws.scala b/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormLaws.scala index 861f9c032..fe2d51a70 100644 --- a/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormLaws.scala +++ b/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormLaws.scala @@ -16,36 +16,22 @@ package com.twitter.summingbird.storm -import backtype.storm.{ Config => BacktypeStormConfig, LocalCluster, Testing } -import backtype.storm.generated.StormTopology -import backtype.storm.testing.{ CompleteTopologyParam, MockedSources } -import com.twitter.algebird.{ MapAlgebra, Semigroup } -import com.twitter.storehaus.{ ReadableStore, JMapStore } -import com.twitter.storehaus.algebra.MergeableStore +import backtype.storm.LocalCluster +import com.twitter.algebird.MapAlgebra +import com.twitter.storehaus.ReadableStore import com.twitter.summingbird._ -import com.twitter.summingbird.batch.{ BatchID, Batcher } +import com.twitter.summingbird.batch.Batcher import com.twitter.summingbird.storm.spout.TraversableSpout -import com.twitter.summingbird.storm.option._ import com.twitter.summingbird.online._ import com.twitter.summingbird.memory._ import com.twitter.summingbird.planner._ -import com.twitter.tormenta.spout.Spout import com.twitter.util.Future -import java.util.{ Collections, HashMap, Map => JMap, UUID } -import java.util.concurrent.atomic.AtomicInteger import org.scalatest.WordSpec import org.scalacheck._ -import org.scalacheck.Prop._ -import org.scalacheck.Properties -import scala.collection.JavaConverters._ import scala.collection.mutable.{ ArrayBuffer, - HashMap => MutableHashMap, - Map => MutableMap, - SynchronizedBuffer, - SynchronizedMap + SynchronizedBuffer } -import java.security.Permission /** * Tests for Summingbird's Storm planner. diff --git a/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormPlanTopology.scala b/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormPlanTopology.scala index 0889ce50f..043ed7980 100644 --- a/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormPlanTopology.scala +++ b/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/StormPlanTopology.scala @@ -16,12 +16,9 @@ package com.twitter.summingbird.storm -import com.twitter.storehaus.JMapStore -import com.twitter.storehaus.algebra.MergeableStore import com.twitter.summingbird._ import com.twitter.summingbird.online._ import com.twitter.summingbird.planner._ -import com.twitter.summingbird.storm.planner._ import com.twitter.storehaus.{ ReadableStore, JMapStore } import com.twitter.storehaus.algebra.MergeableStore import com.twitter.summingbird.batch.{ BatchID, Batcher } diff --git a/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/TopologyTests.scala b/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/TopologyTests.scala index 7843a070a..d097feeee 100644 --- a/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/TopologyTests.scala +++ b/summingbird-storm-test/src/test/scala/com/twitter/summingbird/storm/TopologyTests.scala @@ -17,33 +17,19 @@ package com.twitter.summingbird.storm import backtype.storm.generated.StormTopology -import com.twitter.algebird.{ MapAlgebra, Semigroup } -import com.twitter.storehaus.{ JMapStore, ReadableStore } -import com.twitter.storehaus.algebra.MergeableStore +import com.twitter.algebird.MapAlgebra import com.twitter.summingbird._ -import com.twitter.summingbird.online._ import com.twitter.summingbird.online.option._ -import com.twitter.summingbird.storm.option._ -import com.twitter.summingbird.batch.{ BatchID, Batcher } +import com.twitter.summingbird.batch.Batcher import com.twitter.summingbird.storm.spout.TraversableSpout -import com.twitter.tormenta.spout.Spout -import com.twitter.util.{ Future, Try } -import java.util.{ Collections, HashMap, UUID, Map => JMap } -import java.util.concurrent.atomic.AtomicInteger import org.scalatest.WordSpec import org.scalacheck._ -import org.scalacheck.Prop._ -import org.scalacheck.Properties import scala.collection.JavaConversions._ -import scala.collection.JavaConverters._ -import scala.collection.mutable.{ ArrayBuffer, SynchronizedBuffer, SynchronizedMap, HashMap => MutableHashMap, Map => MutableMap } /** * Tests for Summingbird's Storm planner. */ class TopologyTests extends WordSpec { - import MapAlgebra.sparseEquiv - // This is dangerous, obviously. The Storm platform graphs tested // here use the UnitBatcher, so the actual time extraction isn't // needed. diff --git a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/BuildSummer.scala b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/BuildSummer.scala index 1c65ed8dd..0f687bb73 100644 --- a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/BuildSummer.scala +++ b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/BuildSummer.scala @@ -20,7 +20,7 @@ import com.twitter.algebird.Semigroup import com.twitter.algebird.util.summer._ import com.twitter.summingbird.{ Counter, Group, Name } import com.twitter.summingbird.online.option.{ CompactValues, SummerBuilder, SummerConstructor } -import com.twitter.summingbird.option.{ CacheSize, JobId } +import com.twitter.summingbird.option.JobId import com.twitter.summingbird.planner.Dag import com.twitter.summingbird.storm.planner.StormNode import com.twitter.util.{ Future, FuturePool } diff --git a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/Executor.scala b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/Executor.scala index 085d8e19a..5df91f884 100644 --- a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/Executor.scala +++ b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/Executor.scala @@ -15,7 +15,6 @@ */ package com.twitter.summingbird.storm -import com.twitter.summingbird._ import com.twitter.summingbird.chill.ChillExecutionConfig import com.twitter.scalding.Args diff --git a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/SpoutProvider.scala b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/SpoutProvider.scala index 5afd77425..3afa956bd 100644 --- a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/SpoutProvider.scala +++ b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/SpoutProvider.scala @@ -13,7 +13,6 @@ import com.twitter.summingbird.option.JobId import com.twitter.summingbird.planner.{ Dag, SummerNode } import com.twitter.summingbird.storm.planner.StormNode import com.twitter.tormenta.spout.Spout -import com.twitter.summingbird.storm.option.SpoutStormMetrics import com.twitter.summingbird.storm.spout.KeyValueSpout case class SpoutProvider(storm: Storm, stormDag: Dag[Storm], node: StormNode, jobID: JobId)(implicit topologyBuilder: TopologyBuilder) { diff --git a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StoreStatReporter.scala b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StoreStatReporter.scala index 0ce147060..662a7ac34 100644 --- a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StoreStatReporter.scala +++ b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StoreStatReporter.scala @@ -18,11 +18,10 @@ package com.twitter.summingbird.storm import backtype.storm.task.TopologyContext import backtype.storm.metric.api.CountMetric -import org.slf4j.LoggerFactory import com.twitter.storehaus.algebra.reporting.{ StoreReporter, MergeableReporter } import com.twitter.storehaus.algebra.{ Mergeable, MergeableProxy } import com.twitter.storehaus.{ Store, StoreProxy } -import com.twitter.util.{ Promise, Future } +import com.twitter.util.Future /** * diff --git a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormMetric.scala b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormMetric.scala index 0d375ff01..c873257e1 100644 --- a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormMetric.scala +++ b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormMetric.scala @@ -16,8 +16,6 @@ limitations under the License. package com.twitter.summingbird.storm -import java.io.Serializable - import backtype.storm.task.TopologyContext import com.twitter.util.Duration diff --git a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormStatProvider.scala b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormStatProvider.scala index 83cfc2c93..5866b0c4f 100644 --- a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormStatProvider.scala +++ b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormStatProvider.scala @@ -4,7 +4,6 @@ import backtype.storm.metric.api.CountMetric import backtype.storm.task.TopologyContext import com.twitter.summingbird.{ CounterIncrementor, Group, Name, PlatformStatProvider } import com.twitter.summingbird.option.JobId -import com.twitter.util.{ Promise, Await } import java.util.concurrent.ConcurrentHashMap import org.slf4j.LoggerFactory import scala.collection.JavaConverters._ diff --git a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/TupleInjections.scala b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/TupleInjections.scala index d9b20d744..5041228a7 100644 --- a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/TupleInjections.scala +++ b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/TupleInjections.scala @@ -16,9 +16,8 @@ limitations under the License. package com.twitter.summingbird.storm -import com.twitter.bijection.{ Injection, Inversion, AbstractInjection } +import com.twitter.bijection.{ Injection, Inversion } import java.util.{ List => JList, ArrayList => JAList } -import scala.util.Try class SingleItemInjection[T] extends Injection[T, JList[AnyRef]] { diff --git a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/option/SummerOptions.scala b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/option/SummerOptions.scala index e2b2feae6..53046438e 100644 --- a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/option/SummerOptions.scala +++ b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/option/SummerOptions.scala @@ -18,8 +18,6 @@ package com.twitter.summingbird.storm.option import com.twitter.summingbird.storm.StormMetric -import com.twitter.util.Duration - /** * Options used by the sink phase of the Storm Platform's topology. * diff --git a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/package.scala b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/package.scala index 22614bb4c..5b7728ce3 100644 --- a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/package.scala +++ b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/package.scala @@ -16,8 +16,6 @@ package com.twitter.summingbird -import com.twitter.storehaus.ReadableStore - /** * Package containing the Summingbird Storm platform. */ diff --git a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/spout/TraversableSpout.scala b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/spout/TraversableSpout.scala index 132320a7e..af4e186a0 100644 --- a/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/spout/TraversableSpout.scala +++ b/summingbird-storm/src/main/scala/com/twitter/summingbird/storm/spout/TraversableSpout.scala @@ -16,13 +16,9 @@ package com.twitter.summingbird.storm.spout -import backtype.storm.testing.CompletableSpout -import backtype.storm.topology.IRichSpout -import backtype.storm.topology.OutputFieldsDeclarer -import backtype.storm.tuple.Fields import backtype.storm.tuple.Values import com.twitter.tormenta.spout.Spout -import java.util.{ List => JList, ArrayList } +import java.util.ArrayList import collection.JavaConverters._ object TraversableSpout { diff --git a/summingbird-storm/src/test/scala/com/twitter/summingbird/storm/TestAggregateOutpoutCollector.scala b/summingbird-storm/src/test/scala/com/twitter/summingbird/storm/TestAggregateOutpoutCollector.scala index 61dd44708..663742851 100644 --- a/summingbird-storm/src/test/scala/com/twitter/summingbird/storm/TestAggregateOutpoutCollector.scala +++ b/summingbird-storm/src/test/scala/com/twitter/summingbird/storm/TestAggregateOutpoutCollector.scala @@ -3,7 +3,6 @@ package com.twitter.summingbird.storm import backtype.storm.spout.{ ISpoutOutputCollector, SpoutOutputCollector } import scala.collection.mutable.{ Set => MSet } import java.util -import org.scalacheck._ object TestAggregateOutpoutCollector { type ExpectedTuple = (Int, Map[_, _], Option[String], Option[Seq[Any]]) diff --git a/summingbird-storm/src/test/scala/com/twitter/summingbird/storm/TestKeyValueSpout.scala b/summingbird-storm/src/test/scala/com/twitter/summingbird/storm/TestKeyValueSpout.scala index 14f1436fb..e9667575c 100644 --- a/summingbird-storm/src/test/scala/com/twitter/summingbird/storm/TestKeyValueSpout.scala +++ b/summingbird-storm/src/test/scala/com/twitter/summingbird/storm/TestKeyValueSpout.scala @@ -1,7 +1,6 @@ package com.twitter.summingbird.storm import backtype.storm.spout.ISpoutOutputCollector -import backtype.storm.tuple.Values import com.twitter.algebird.Semigroup import com.twitter.algebird.util.summer.{ AsyncSummer, BufferSize, FlushFrequency, MemoryFlushPercent, SyncSummingQueue } import com.twitter.summingbird.online.executor.KeyValueShards @@ -10,10 +9,8 @@ import com.twitter.summingbird.storm.spout.KeyValueSpout import com.twitter.tormenta.spout.{ BaseSpout, Spout } import com.twitter.util.Duration import com.twitter.summingbird.batch.{ BatchID, Timestamp } -import com.twitter.summingbird.storm.collector.AggregatorOutputCollector import java.util.{ List => JList } import org.scalatest.WordSpec -import org.scalacheck._ import scala.collection.mutable.{ Set => MSet } /**