Skip to content

[SPARK-16779][TRIVIAL] Avoid using postfix operators where they do not add much and remove whitelisting #14407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed

[SPARK-16779][TRIVIAL] Avoid using postfix operators where they do not add much and remove whitelisting #14407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0608b9f
Add postix ops import
holdenk Jul 27, 2016
bb82dce
Wait we can rewrite this to just avoid postfix and also avoid slurpin…
holdenk Jul 27, 2016
1decad4
Remove postfix \!\! on process
holdenk Jul 29, 2016
b264f2d
Remove postfixOps from most places - still left in the XML parsing pl…
holdenk Jul 29, 2016
eafa36b
Merge branch 'master' into SPARK-16779
holdenk Jul 29, 2016
bbf1bf2
Fix accidental changes to StatusTrackerSuite
holdenk Jul 29, 2016
c6383bf
fix blockmanager too
holdenk Jul 29, 2016
4dbd5fa
Add missing . for seconds in cachedtable stuie
holdenk Jul 29, 2016
89ee6ae
Cleanup some more things that were not in the standard build
holdenk Jul 30, 2016
91aabd2
Fix some of the postfix operations in the Yarn suites left out of the…
holdenk Jul 30, 2016
df67cde
Switch back to try to capture things besinds non-zero exit values
holdenk Jul 30, 2016
4e81888
Merge branch 'master' into SPARK-16779
holdenk Aug 8, 2016
e4d8452
Update to keep postfix time operations
holdenk Aug 8, 2016
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
1 change: 0 additions & 1 deletion core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import java.util.{Arrays, Comparator, Date}

import scala.collection.JavaConverters._
import scala.concurrent.duration._
import scala.language.postfixOps
import scala.util.control.NonFatal

import com.google.common.primitives.Longs
Expand Down
1 change: 0 additions & 1 deletion core/src/main/scala/org/apache/spark/scheduler/TaskSchedulerImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicLong
import scala.collection.mutable.ArrayBuffer
import scala.collection.mutable.HashMap
import scala.collection.mutable.HashSet
import scala.language.postfixOps
import scala.util.Random

import org.apache.spark._
Expand Down
2 changes: 0 additions & 2 deletions core/src/main/scala/org/apache/spark/util/RpcUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package org.apache.spark.util

import scala.language.postfixOps

import org.apache.spark.SparkConf
import org.apache.spark.rpc.{RpcAddress, RpcEndpointRef, RpcEnv, RpcTimeout}

Expand Down
1 change: 0 additions & 1 deletion core/src/test/scala/org/apache/spark/HeartbeatReceiverSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import java.util.concurrent.{ExecutorService, TimeUnit}
import scala.collection.Map
import scala.collection.mutable
import scala.concurrent.duration._
import scala.language.postfixOps

import org.mockito.Matchers
import org.mockito.Matchers._
Expand Down
1 change: 0 additions & 1 deletion core/src/test/scala/org/apache/spark/deploy/history/ApplicationCacheSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import javax.servlet.http.{HttpServletRequest, HttpServletResponse}

import scala.collection.mutable
import scala.collection.mutable.ListBuffer
import scala.language.postfixOps

import com.codahale.metrics.Counter
import com.google.common.cache.LoadingCache
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/scala/org/apache/spark/rdd/PipedRDDSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import java.io.File

import scala.collection.Map
import scala.io.Codec
import scala.language.postfixOps
import scala.sys.process._
import scala.util.Try

Expand Down Expand Up @@ -215,7 +214,8 @@ class PipedRDDSuite extends SparkFunSuite with SharedSparkContext {
}

def testCommandAvailable(command: String): Boolean = {
Try(Process(command) !!).isSuccess
val attempt = Try(Process(command).run().exitValue())
attempt.isSuccess && attempt.get == 0
}

def testExportInputFile(varName: String) {
Expand Down
1 change: 0 additions & 1 deletion core/src/test/scala/org/apache/spark/storage/MemoryStoreSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ package org.apache.spark.storage
import java.nio.ByteBuffer

import scala.language.implicitConversions
import scala.language.postfixOps
import scala.language.reflectiveCalls
import scala.reflect.ClassTag

Expand Down
2 changes: 0 additions & 2 deletions external/kafka-0-10/src/main/scala/org/apache/spark/streaming/kafka010/KafkaTestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import java.util.concurrent.TimeoutException

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.language.postfixOps
import scala.util.control.NonFatal

import kafka.admin.AdminUtils
Expand Down Expand Up @@ -279,4 +278,3 @@ private[kafka010] class KafkaTestUtils extends Logging {
}
}
}

2 changes: 0 additions & 2 deletions external/kafka-0-8/src/main/scala/org/apache/spark/streaming/kafka/KafkaTestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import java.util.concurrent.TimeoutException

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.language.postfixOps
import scala.util.control.NonFatal

import kafka.admin.AdminUtils
Expand Down Expand Up @@ -274,4 +273,3 @@ private[kafka] class KafkaTestUtils extends Logging {
}
}
}

3 changes: 1 addition & 2 deletions graphx/src/main/scala/org/apache/spark/graphx/lib/PageRank.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.spark.graphx.lib

import scala.language.postfixOps
import scala.reflect.ClassTag

import org.apache.spark.graphx._
Expand Down Expand Up @@ -109,7 +108,7 @@ object PageRank extends Logging {
require(resetProb >= 0 && resetProb <= 1, s"Random reset probability must belong" +
s" to [0, 1], but got ${resetProb}")

val personalized = srcId isDefined
val personalized = srcId.isDefined
Copy link
Member

@srowen srowen Jul 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, certainly the kind of case we want to fix IMHO

val src: VertexId = srcId.getOrElse(-1L)

// Initialize the PageRank graph with each edge attribute having
Expand Down
1 change: 0 additions & 1 deletion mllib/src/main/scala/org/apache/spark/mllib/util/MFDataGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package org.apache.spark.mllib.util

import java.{util => ju}

import scala.language.postfixOps
import scala.util.Random

import org.apache.spark.SparkContext
Expand Down
1 change: 0 additions & 1 deletion repl/src/test/scala/org/apache/spark/repl/ExecutorClassLoaderSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import java.util
import scala.concurrent.duration._
import scala.io.Source
import scala.language.implicitConversions
import scala.language.postfixOps

import com.google.common.io.Files
import org.mockito.Matchers.anyString
Expand Down
2 changes: 0 additions & 2 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/types/DecimalSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package org.apache.spark.sql.types

import scala.language.postfixOps

import org.scalatest.PrivateMethodTester

import org.apache.spark.SparkFunSuite
Expand Down
1 change: 0 additions & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import java.io.File
import java.nio.charset.StandardCharsets
import java.util.UUID

import scala.language.postfixOps
import scala.util.Random

import org.scalatest.Matchers._
Expand Down
2 changes: 0 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/DatasetAggregatorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package org.apache.spark.sql

import scala.language.postfixOps

import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
import org.apache.spark.sql.expressions.Aggregator
import org.apache.spark.sql.expressions.scalalang.typed
Expand Down
2 changes: 0 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/DatasetCacheSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package org.apache.spark.sql

import scala.language.postfixOps

import org.apache.spark.sql.functions._
import org.apache.spark.sql.test.SharedSQLContext

Expand Down
2 changes: 0 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/DatasetPrimitiveSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package org.apache.spark.sql

import scala.language.postfixOps

import org.apache.spark.sql.test.SharedSQLContext

case class IntClass(value: Int)
Expand Down
2 changes: 0 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ package org.apache.spark.sql
import java.io.{Externalizable, ObjectInput, ObjectOutput}
import java.sql.{Date, Timestamp}

import scala.language.postfixOps

import org.apache.spark.sql.catalyst.encoders.{OuterScopes, RowEncoder}
import org.apache.spark.sql.catalyst.util.sideBySide
import org.apache.spark.sql.execution.streaming.MemoryStream
Expand Down
3 changes: 2 additions & 1 deletion sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/SQLQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,6 +1774,7 @@ class SQLQuerySuite extends QueryTest with SQLTestUtils with TestHiveSingleton {
}

def testCommandAvailable(command: String): Boolean = {
Try(Process(command) !!).isSuccess
val attempt = Try(Process(command).run().exitValue())
attempt.isSuccess && attempt.get == 0
}
}
1 change: 0 additions & 1 deletion streaming/src/test/scala/org/apache/spark/streaming/InputStreamsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicInteger

import scala.collection.JavaConverters._
import scala.collection.mutable
import scala.language.postfixOps

import com.google.common.io.Files
import org.apache.hadoop.fs.Path
Expand Down
4 changes: 1 addition & 3 deletions yarn/src/main/scala/org/apache/spark/deploy/yarn/AMDelegationTokenRenewer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ package org.apache.spark.deploy.yarn
import java.security.PrivilegedExceptionAction
import java.util.concurrent.{Executors, TimeUnit}

import scala.language.postfixOps

import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.fs.{FileSystem, Path}
import org.apache.hadoop.security.UserGroupInformation
Expand Down Expand Up @@ -128,7 +126,7 @@ private[yarn] class AMDelegationTokenRenewer(
try {
val remoteFs = FileSystem.get(freshHadoopConf)
val credentialsPath = new Path(credentialsFile)
val thresholdTime = System.currentTimeMillis() - (daysToKeepFiles days).toMillis
val thresholdTime = System.currentTimeMillis() - (daysToKeepFiles.days).toMillis
hadoopUtil.listFilesSorted(
remoteFs, credentialsPath.getParent,
credentialsPath.getName, SparkHadoopUtil.SPARK_YARN_CREDS_TEMP_EXTENSION)
Expand Down