Skip to content

[SPARK-3010] fix redundant conditional #1992

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 6 commits into from
Closed

[SPARK-3010] fix redundant conditional #1992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d032bf9
[SQL]Excess judgment
scwf Aug 13, 2014
e274515
fix redundant conditions
scwf Aug 13, 2014
0824df4
Merge branch 'master' of https://github.com/apache/spark into patch-4
scwf Aug 14, 2014
6811401
fix merge confilct
scwf Aug 17, 2014
e16239c
fix confilct
scwf Aug 17, 2014
b2a044a
merge SecurityManager
scwf Aug 17, 2014
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
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/SecurityManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ private[spark] class SecurityManager(sparkConf: SparkConf) extends Logging {
def checkUIViewPermissions(user: String): Boolean = {
logDebug("user=" + user + " aclsEnabled=" + aclsEnabled() + " viewAcls=" +
viewAcls.mkString(","))
if (aclsEnabled() && (user != null) && (!viewAcls.contains(user))) false else true
!aclsEnabled || user == null || viewAcls.contains(user)
}

/**
Expand All @@ -309,7 +309,7 @@ private[spark] class SecurityManager(sparkConf: SparkConf) extends Logging {
def checkModifyPermissions(user: String): Boolean = {
logDebug("user=" + user + " aclsEnabled=" + aclsEnabled() + " modifyAcls=" +
modifyAcls.mkString(","))
if (aclsEnabled() && (user != null) && (!modifyAcls.contains(user))) false else true
!aclsEnabled || user == null || modifyAcls.contains(user)
}


Expand Down
13 changes: 4 additions & 9 deletions core/src/test/scala/org/apache/spark/rdd/PartitionPruningRDDSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ class PartitionPruningRDDSuite extends FunSuite with SharedSparkContext {
Iterator()
}
}
val prunedRDD = PartitionPruningRDD.create(rdd, {
x => if (x == 2) true else false
})
val prunedRDD = PartitionPruningRDD.create(rdd, _ == 2)
assert(prunedRDD.partitions.length == 1)
val p = prunedRDD.partitions(0)
assert(p.index == 0)
Expand All @@ -62,13 +60,10 @@ class PartitionPruningRDDSuite extends FunSuite with SharedSparkContext {
List(split.asInstanceOf[TestPartition].testValue).iterator
}
}
val prunedRDD1 = PartitionPruningRDD.create(rdd, {
x => if (x == 0) true else false
})
val prunedRDD1 = PartitionPruningRDD.create(rdd, _ == 0)

val prunedRDD2 = PartitionPruningRDD.create(rdd, {
x => if (x == 2) true else false
})

val prunedRDD2 = PartitionPruningRDD.create(rdd, _ == 2)

val merged = prunedRDD1 ++ prunedRDD2
assert(merged.count() == 2)
Expand Down
4 changes: 1 addition & 3 deletions sql/core/src/main/scala/org/apache/spark/sql/columnar/ColumnType.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,7 @@ private[sql] object BOOLEAN extends NativeColumnType(BooleanType, 4, 1) {
buffer.put(if (v) 1.toByte else 0.toByte)
}

override def extract(buffer: ByteBuffer) = {
if (buffer.get() == 1) true else false
}
override def extract(buffer: ByteBuffer) = buffer.get() == 1

override def setField(row: MutableRow, ordinal: Int, value: Boolean) {
row.setBoolean(ordinal, value)
Expand Down
2 changes: 1 addition & 1 deletion yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ trait ClientBase extends Logging {
if (! localPath.isEmpty()) {
val localURI = new URI(localPath)
if (!ClientBase.LOCAL_SCHEME.equals(localURI.getScheme())) {
val setPermissions = if (destName.equals(ClientBase.APP_JAR)) true else false
val setPermissions = destName.equals(ClientBase.APP_JAR)
val destPath = copyRemoteFile(dst, qualifyForLocal(localURI), replication, setPermissions)
val destFs = FileSystem.get(destPath.toUri(), conf)
distCacheMgr.addResource(destFs, conf, destPath, localResources, LocalResourceType.FILE,
Expand Down