From 14d3f76952244c23616d1e77450085680a61827c Mon Sep 17 00:00:00 2001 From: Shunsuke Otani Date: Fri, 21 Apr 2017 02:06:57 +0900 Subject: [PATCH] Remove unnecessary semicolon (#1668) --- .../src/main/scala/com/twitter/scalding/Job.scala | 3 +-- .../src/main/scala/com/twitter/scalding/Operations.scala | 4 ++-- .../scala/com/twitter/scalding/ReduceOperations.scala | 2 +- .../twitter/scalding/serialization/KryoSerializers.scala | 8 ++++---- .../src/main/scala/com/twitter/scalding/CalendarOps.scala | 6 +++--- .../twitter/scalding/serialization/MurmurHashUtils.scala | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/scalding-core/src/main/scala/com/twitter/scalding/Job.scala b/scalding-core/src/main/scala/com/twitter/scalding/Job.scala index 5642251b01..b90c4346ac 100644 --- a/scalding-core/src/main/scala/com/twitter/scalding/Job.scala +++ b/scalding-core/src/main/scala/com/twitter/scalding/Job.scala @@ -15,7 +15,6 @@ limitations under the License. */ package com.twitter.scalding -import com.twitter.algebird.monad.Reader import com.twitter.algebird.Semigroup import cascading.flow.{ Flow, FlowDef, FlowListener, FlowStep, FlowStepListener, FlowSkipStrategy, FlowStepStrategy } import cascading.pipe.Pipe @@ -353,7 +352,7 @@ class Job(val args: Args) extends FieldConversions with java.io.Serializable { def timeout[T](timeout: AbsoluteDuration)(t: => T): Option[T] = { val f = timeoutExecutor.submit(new Callable[Option[T]] { def call(): Option[T] = Some(t) - }); + }) try { f.get(timeout.toMillisecs, TimeUnit.MILLISECONDS) } catch { diff --git a/scalding-core/src/main/scala/com/twitter/scalding/Operations.scala b/scalding-core/src/main/scala/com/twitter/scalding/Operations.scala index e3e46124b7..c7425471e4 100644 --- a/scalding-core/src/main/scala/com/twitter/scalding/Operations.scala +++ b/scalding-core/src/main/scala/com/twitter/scalding/Operations.scala @@ -22,7 +22,7 @@ package com.twitter.scalding { import com.twitter.chill.MeatLocker import scala.collection.JavaConverters._ - import com.twitter.algebird.{ Semigroup, StatefulSummer, SummingWithHitsCache, AdaptiveCache } + import com.twitter.algebird.{ Semigroup, SummingWithHitsCache, AdaptiveCache } import com.twitter.scalding.mathematics.Poisson import serialization.Externalizer import scala.util.Try @@ -653,7 +653,7 @@ package com.twitter.scalding { override def prepare(flowProcess: FlowProcess[_], operationCall: OperationCall[Poisson]): Unit = { super.prepare(flowProcess, operationCall) val p = new Poisson(frac, seed) - operationCall.setContext(p); + operationCall.setContext(p) } def operate(flowProcess: FlowProcess[_], functionCall: FunctionCall[Poisson]): Unit = { diff --git a/scalding-core/src/main/scala/com/twitter/scalding/ReduceOperations.scala b/scalding-core/src/main/scala/com/twitter/scalding/ReduceOperations.scala index 376e0daf2e..7645cac59c 100644 --- a/scalding-core/src/main/scala/com/twitter/scalding/ReduceOperations.scala +++ b/scalding-core/src/main/scala/com/twitter/scalding/ReduceOperations.scala @@ -374,7 +374,7 @@ trait ReduceOperations[+Self <: ReduceOperations[Self]] extends java.io.Serializ * topClicks will be a List[(Long,Long)] */ def sortWithTake[T: TupleConverter](f: (Fields, Fields), k: Int)(lt: (T, T) => Boolean): Self = { - val ord = Ordering.fromLessThan(lt); + val ord = Ordering.fromLessThan(lt) sortedTake(f, k)(implicitly[TupleConverter[T]], ord) } diff --git a/scalding-core/src/main/scala/com/twitter/scalding/serialization/KryoSerializers.scala b/scalding-core/src/main/scala/com/twitter/scalding/serialization/KryoSerializers.scala index 8269e96628..82fe2bcb1e 100644 --- a/scalding-core/src/main/scala/com/twitter/scalding/serialization/KryoSerializers.scala +++ b/scalding-core/src/main/scala/com/twitter/scalding/serialization/KryoSerializers.scala @@ -40,7 +40,7 @@ class RichDateSerializer extends KSerializer[RichDate] { // RichDates are immutable, no need to copy them setImmutable(true) def write(kser: Kryo, out: Output, date: RichDate): Unit = { - out.writeLong(date.timestamp, true); + out.writeLong(date.timestamp, true) } def read(kser: Kryo, in: Input, cls: Class[RichDate]): RichDate = @@ -51,12 +51,12 @@ class DateRangeSerializer extends KSerializer[DateRange] { // DateRanges are immutable, no need to copy them setImmutable(true) def write(kser: Kryo, out: Output, range: DateRange): Unit = { - out.writeLong(range.start.timestamp, true); - out.writeLong(range.end.timestamp, true); + out.writeLong(range.start.timestamp, true) + out.writeLong(range.end.timestamp, true) } def read(kser: Kryo, in: Input, cls: Class[DateRange]): DateRange = { - DateRange(RichDate(in.readLong(true)), RichDate(in.readLong(true))); + DateRange(RichDate(in.readLong(true)), RichDate(in.readLong(true))) } } diff --git a/scalding-date/src/main/scala/com/twitter/scalding/CalendarOps.scala b/scalding-date/src/main/scala/com/twitter/scalding/CalendarOps.scala index b4477b4760..d79cff3d8d 100644 --- a/scalding-date/src/main/scala/com/twitter/scalding/CalendarOps.scala +++ b/scalding-date/src/main/scala/com/twitter/scalding/CalendarOps.scala @@ -34,10 +34,10 @@ object CalendarOps { } def truncate(date: Date, field: Int): Date = { - val cal = Calendar.getInstance(); - cal.setTime(date); + val cal = Calendar.getInstance() + cal.setTime(date) - truncate(cal, field).getTime(); + truncate(cal, field).getTime() } } diff --git a/scalding-serialization/src/main/scala/com/twitter/scalding/serialization/MurmurHashUtils.scala b/scalding-serialization/src/main/scala/com/twitter/scalding/serialization/MurmurHashUtils.scala index 27d4c54ed3..98700af2cc 100644 --- a/scalding-serialization/src/main/scala/com/twitter/scalding/serialization/MurmurHashUtils.scala +++ b/scalding-serialization/src/main/scala/com/twitter/scalding/serialization/MurmurHashUtils.scala @@ -43,7 +43,7 @@ object MurmurHashUtils { } final def hashUnencodedChars(input: CharSequence): Int = { - var h1 = seed; + var h1 = seed // step through the CharSequence 2 chars at a time var i = 0