Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jan 20, 2022. It is now read-only.

Remove deprecation indirections #472

Merged
merged 1 commit into from
Mar 8, 2014
Merged

Remove deprecation indirections #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions summingbird-builder/src/main/scala/com/twitter/summingbird/builder/CompletedBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ limitations under the License.
package com.twitter.summingbird.builder

import com.twitter.bijection.Injection
import com.twitter.chill.java.IterableRegistrar
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.batch.Batcher
import com.twitter.summingbird.{ Env, KeyedProducer, Options, Summer, Platform }
import com.twitter.summingbird.option.CacheSize
import com.twitter.summingbird.scalding.Scalding
import com.twitter.summingbird.storm.Storm
import com.twitter.summingbird.util.CacheSize

import java.io.Serializable

Expand Down
2 changes: 1 addition & 1 deletion summingbird-builder/src/main/scala/com/twitter/summingbird/builder/SourceBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import com.twitter.chill.java.IterableRegistrar
import com.twitter.storehaus.algebra.MergeableStore
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.batch.BatchedStore
import com.twitter.summingbird.service.CompoundService
Expand All @@ -32,7 +33,6 @@ import com.twitter.summingbird.store.CompoundStore
import com.twitter.summingbird.storm.{
MergeableStoreSupplier, StoreWrapper, Storm, StormEnv, StormSource, StormSink
}
import com.twitter.summingbird.util.CacheSize
import java.io.Serializable
import java.util.Date

Expand Down
107 changes: 0 additions & 107 deletions summingbird-builder/src/main/scala/com/twitter/summingbird/builder/package.scala
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion summingbird-builder/src/main/scala/com/twitter/summingbird/scalding/VersionedState.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import com.twitter.algebird.{
Interval,
ExclusiveUpper
}
import com.twitter.summingbird.scalding.{WaitingState => _}
import com.twitter.summingbird.batch.{
Batcher,
BatchID,
Expand Down
4 changes: 2 additions & 2 deletions summingbird-example/src/main/scala/com/twitter/summingbird/example/StormRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import com.twitter.summingbird.batch.BatchID
import com.twitter.summingbird.Options
import com.twitter.summingbird.option.CacheSize
import com.twitter.summingbird.storm.{ StormStore, Storm, Executor, StormExecutionConfig}
import com.twitter.summingbird.storm.option.{FlatMapParallelism, SinkParallelism, SpoutParallelism}
import com.twitter.summingbird.storm.option.{FlatMapParallelism, SummerParallelism, SpoutParallelism}
import backtype.storm.{Config => BTConfig}
import com.twitter.scalding.Args
import com.twitter.tormenta.spout.TwitterSpout
Expand Down Expand Up @@ -121,7 +121,7 @@ object StormRunner {
}

override def getNamedOptions: Map[String, Options] = Map(
"DEFAULT" -> Options().set(SinkParallelism(2))
"DEFAULT" -> Options().set(SummerParallelism(2))
.set(FlatMapParallelism(80))
.set(SpoutParallelism(16))
.set(CacheSize(100))
Expand Down
2 changes: 1 addition & 1 deletion summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/Executor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package com.twitter.summingbird.scalding
import com.twitter.summingbird._
import com.twitter.scalding.{RichDate, DateParser, Hdfs, Args}

import com.twitter.summingbird.batch.Timestamp
import com.twitter.summingbird.batch.{Timestamp, WaitingState}
import com.twitter.summingbird.batch.option.{FlatMapShards, Reducers}
import com.twitter.summingbird.chill.ChillExecutionConfig
import com.twitter.algebird.Interval
Expand Down
33 changes: 0 additions & 33 deletions summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/option/package.scala
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,73 +70,5 @@ package object scalding {
}

val ScaldingConfig = summingbird.batch.BatchConfig


// ALL DEPRECATION ALIASES BELOW HERE, NOTHING ELSE.
@deprecated("Use com.twitter.summingbird.batch.WaitingState", "0.3.2")
type WaitingState[T] = summingbird.batch.WaitingState[T]
@deprecated("Use com.twitter.summingbird.batch.PrepareState", "0.3.2")
type PrepareState[T] = summingbird.batch.PrepareState[T]
@deprecated("Use com.twitter.summingbird.batch.RunningState", "0.3.2")
type RunningState[T] = summingbird.batch.RunningState[T]

@deprecated("Use com.twitter.summingbird.scalding.service.SimpleService", "0.3.2")
type SimpleService[K, V] = com.twitter.summingbird.scalding.service.SimpleService[K, V]

@deprecated("Use com.twitter.summingbird.scalding.batch.BatchedService", "0.3.2")
type BatchedService[K, V] = com.twitter.summingbird.scalding.batch.BatchedService[K, V]

@deprecated("Use com.twitter.summingbird.scalding.batch.BatchedService", "0.3.2")
val BatchedService = com.twitter.summingbird.scalding.batch.BatchedService

@deprecated("com.twitter.summingbird.scalding.store.VersionedBatchStore", "0.3.2")
type VersionedBatchStore[K, V, W, X] = com.twitter.summingbird.scalding.store.VersionedBatchStore[K, V, W, X]
val VersionedBatchStore = com.twitter.summingbird.scalding.store.VersionedBatchStore

@deprecated("com.twitter.summingbird.scalding.store.VersionedBatchStoreBase", "0.3.2")
type VersionedBatchStoreBase[K, V] = com.twitter.summingbird.scalding.store.VersionedBatchStoreBase[K, V]

@deprecated("com.twitter.summingbird.scalding.batch.BatchedStore", "0.3.2")
type BatchedScaldingStore[K, V] = com.twitter.summingbird.scalding.batch.BatchedStore[K, V]

@deprecated("com.twitter.summingbird.scalding.Service", "0.3.2")
type ScaldingScaldingService[K, V] = com.twitter.summingbird.scalding.Service[K, V]

@deprecated("com.twitter.summingbird.scalding.Store", "0.3.2")
type ScaldingStore[K, V] = com.twitter.summingbird.scalding.Store[K, V]

@deprecated("com.twitter.summingbird.scalding.Sink", "0.3.2")
type ScaldingSink[T] = com.twitter.summingbird.scalding.Sink[T]

@deprecated("com.twitter.summingbird.scalding.batch.BatchedSink", "0.3.2")
type BatchedScaldingSink[T] = com.twitter.summingbird.scalding.batch.BatchedSink[T]

@deprecated("com.twitter.summingbird.scalding.store.InitialBatchedStore", "0.3.2")
type InitialBatchedStore[K, V] = com.twitter.summingbird.scalding.store.InitialBatchedStore[K, V]

@deprecated("com.twitter.summingbird.scalding.service.BatchedDeltaService", "0.3.2")
type BatchedDeltaService[K, V] = com.twitter.summingbird.scalding.service.BatchedDeltaService[K, V]

@deprecated("com.twitter.summingbird.scalding.service.BatchedWindowService", "0.3.2")
type BatchedWindowService[K, V] = com.twitter.summingbird.scalding.service.BatchedWindowService[K, V]

@deprecated("com.twitter.summingbird.scalding.service.EmptyService", "0.3.2")
type EmptyService[K, V] = com.twitter.summingbird.scalding.service.EmptyService[K, V]

@deprecated("com.twitter.summingbird.scalding.service.SimpleWindowedService", "0.3.2")
type SimpleWindowedService[K, V] = com.twitter.summingbird.scalding.service.SimpleWindowedService[K, V]

@deprecated("com.twitter.summingbird.scalding.service.UniqueKeyedService", "0.3.2")
type UniqueKeyedService[K, V] = com.twitter.summingbird.scalding.service.UniqueKeyedService[K, V]
val UniqueKeyedService = com.twitter.summingbird.scalding.service.UniqueKeyedService

@deprecated("com.twitter.summingbird.scalding.source.TimePathedSource", "0.3.2")
val TimePathedSource = com.twitter.summingbird.scalding.source.TimePathedSource

@deprecated("com.twitter.summingbird.scalding.store.DirectoryBatchedStore", "0.3.2")
type DirectoryBatchedStore[K <: Writable, V <: Writable] = com.twitter.summingbird.scalding.store.DirectoryBatchedStore[K, V]

@deprecated("com.twitter.summingbird.scalding.store.VersionedStore", "0.3.2")
val VersionedStore = com.twitter.summingbird.scalding.store.VersionedStore
}

24 changes: 0 additions & 24 deletions summingbird-scalding/src/main/scala/com/twitter/summingbird/scalding/state/package.scala
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion summingbird-storm/src/main/scala/com/twitter/summingbird/storm/BaseBolt.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import backtype.storm.tuple.{Tuple, TupleImpl, Fields}

import java.util.{ Map => JMap }

import com.twitter.summingbird.storm.option.{AckOnEntry, AnchorTuples, MaxWaitingFutures}
import com.twitter.summingbird.storm.option.{AckOnEntry, AnchorTuples}
import com.twitter.summingbird.online.executor.OperationContainer
import com.twitter.summingbird.online.executor.{InflightTuples, InputState}

Expand Down
6 changes: 1 addition & 5 deletions summingbird-storm/src/main/scala/com/twitter/summingbird/storm/Constants.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,7 @@ limitations under the License.

package com.twitter.summingbird.storm

import com.twitter.summingbird.option.MonoidIsCommutative
import com.twitter.summingbird.storm.option.{OnlineSuccessHandler => SOnlineSuccessHandler,
OnlineExceptionHandler => SOnlineExceptionHandler,
MaxWaitingFutures => SMaxWaitingFutures,
CacheSize => DEPCacheSize, _ }
import com.twitter.summingbird.storm.option._
import com.twitter.summingbird.option._
import com.twitter.summingbird.online.option._

Expand Down
4 changes: 2 additions & 2 deletions summingbird-storm/src/main/scala/com/twitter/summingbird/storm/FlatMapBoltProvider.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import com.twitter.summingbird.storm.option.{AckOnEntry, AnchorTuples}
import com.twitter.summingbird.online.{MultiTriggerCache, SummingQueueCache, CacheBuilder}
import com.twitter.summingbird.online.executor.InputState
import com.twitter.summingbird.online.option.{IncludeSuccessHandler, MaxWaitingFutures, MaxFutureWaitTime}
import com.twitter.summingbird.util.CacheSize
import com.twitter.summingbird.option.CacheSize
import com.twitter.summingbird.planner._
import com.twitter.summingbird.online.executor
import com.twitter.summingbird.online.FlatMapOperation
Expand Down Expand Up @@ -200,4 +200,4 @@ case class FlatMapBoltProvider(storm: Storm, stormDag: Dag[Storm], node: StormNo
case None => getIntermediateFMBolt[Any, Any].asInstanceOf[BaseBolt[Any, Any]]
}
}
}
}
2 changes: 1 addition & 1 deletion summingbird-storm/src/main/scala/com/twitter/summingbird/storm/StormPlatform.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import com.twitter.summingbird.storm.option.{AckOnEntry, AnchorTuples}
import com.twitter.summingbird.online.{MultiTriggerCache, SummingQueueCache}
import com.twitter.summingbird.online.executor.InputState
import com.twitter.summingbird.online.option.{IncludeSuccessHandler, MaxWaitingFutures, MaxFutureWaitTime}
import com.twitter.summingbird.util.CacheSize
import com.twitter.summingbird.option.CacheSize
import com.twitter.tormenta.spout.Spout
import com.twitter.summingbird.planner._
import com.twitter.summingbird.online.executor
Expand Down
Loading