You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2018/09/11 19:53:26 UTC
spark git commit: Revert "[SPARK-23820][CORE] Enable use of long form
of callsite in logs"
Repository: spark
Updated Branches:
refs/heads/master cfbdd6a1f -> 97d4afaa1
Revert "[SPARK-23820][CORE] Enable use of long form of callsite in logs"
This reverts commit e58dadb77ed6cac3e1b2a037a6449e5a6e7f2cec.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/97d4afaa
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/97d4afaa
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/97d4afaa
Branch: refs/heads/master
Commit: 97d4afaa13aaa771220adb3625f1783ce1b3a8df
Parents: cfbdd6a
Author: Sean Owen <se...@databricks.com>
Authored: Tue Sep 11 14:52:58 2018 -0500
Committer: Sean Owen <se...@databricks.com>
Committed: Tue Sep 11 14:52:58 2018 -0500
----------------------------------------------------------------------
.../scala/org/apache/spark/internal/config/package.scala | 3 ---
.../src/main/scala/org/apache/spark/storage/RDDInfo.scala | 10 +---------
2 files changed, 1 insertion(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/97d4afaa/core/src/main/scala/org/apache/spark/internal/config/package.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/internal/config/package.scala b/core/src/main/scala/org/apache/spark/internal/config/package.scala
index ee41bd1..bf0391c 100644
--- a/core/src/main/scala/org/apache/spark/internal/config/package.scala
+++ b/core/src/main/scala/org/apache/spark/internal/config/package.scala
@@ -77,9 +77,6 @@ package object config {
private[spark] val EVENT_LOG_OVERWRITE =
ConfigBuilder("spark.eventLog.overwrite").booleanConf.createWithDefault(false)
- private[spark] val EVENT_LOG_CALLSITE_FORM =
- ConfigBuilder("spark.eventLog.callsite").stringConf.createWithDefault("short")
-
private[spark] val EXECUTOR_CLASS_PATH =
ConfigBuilder(SparkLauncher.EXECUTOR_EXTRA_CLASSPATH).stringConf.createOptional
http://git-wip-us.apache.org/repos/asf/spark/blob/97d4afaa/core/src/main/scala/org/apache/spark/storage/RDDInfo.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/storage/RDDInfo.scala b/core/src/main/scala/org/apache/spark/storage/RDDInfo.scala
index 64e5c8b..e5abbf7 100644
--- a/core/src/main/scala/org/apache/spark/storage/RDDInfo.scala
+++ b/core/src/main/scala/org/apache/spark/storage/RDDInfo.scala
@@ -17,9 +17,7 @@
package org.apache.spark.storage
-import org.apache.spark.SparkEnv
import org.apache.spark.annotation.DeveloperApi
-import org.apache.spark.internal.config._
import org.apache.spark.rdd.{RDD, RDDOperationScope}
import org.apache.spark.util.Utils
@@ -55,16 +53,10 @@ class RDDInfo(
}
private[spark] object RDDInfo {
- private lazy val callsiteForm = SparkEnv.get.conf.get(EVENT_LOG_CALLSITE_FORM)
-
def fromRdd(rdd: RDD[_]): RDDInfo = {
val rddName = Option(rdd.name).getOrElse(Utils.getFormattedClassName(rdd))
val parentIds = rdd.dependencies.map(_.rdd.id)
- val callSite = callsiteForm match {
- case "short" => rdd.creationSite.shortForm
- case "long" => rdd.creationSite.longForm
- }
new RDDInfo(rdd.id, rddName, rdd.partitions.length,
- rdd.getStorageLevel, parentIds, callSite, rdd.scope)
+ rdd.getStorageLevel, parentIds, rdd.creationSite.shortForm, rdd.scope)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org