You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by li...@apache.org on 2018/12/02 00:24:10 UTC
spark git commit: [SPARK-26241][SQL] Add queryId to
IncrementalExecution
Repository: spark
Updated Branches:
refs/heads/master 55c968581 -> cbb9bb96d
[SPARK-26241][SQL] Add queryId to IncrementalExecution
## What changes were proposed in this pull request?
This is a small change for better debugging: to pass query uuid in IncrementalExecution, when we look at the QueryExecution in isolation to trace back the query.
## How was this patch tested?
N/A - just add some field for better debugging.
Closes #23192 from rxin/SPARK-26241.
Authored-by: Reynold Xin <rx...@databricks.com>
Signed-off-by: gatorsmile <ga...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/cbb9bb96
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/cbb9bb96
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/cbb9bb96
Branch: refs/heads/master
Commit: cbb9bb96d292d6e738f2f33637fb1c9715b167ac
Parents: 55c9685
Author: Reynold Xin <rx...@databricks.com>
Authored: Sat Dec 1 16:24:06 2018 -0800
Committer: gatorsmile <ga...@gmail.com>
Committed: Sat Dec 1 16:24:06 2018 -0800
----------------------------------------------------------------------
.../scala/org/apache/spark/sql/execution/command/commands.scala | 2 +-
.../spark/sql/execution/streaming/IncrementalExecution.scala | 1 +
.../apache/spark/sql/execution/streaming/MicroBatchExecution.scala | 1 +
.../sql/execution/streaming/continuous/ContinuousExecution.scala | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/cbb9bb96/sql/core/src/main/scala/org/apache/spark/sql/execution/command/commands.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/commands.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/commands.scala
index ab40936..754a331 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/command/commands.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/command/commands.scala
@@ -154,7 +154,7 @@ case class ExplainCommand(
// output mode does not matter since there is no `Sink`.
new IncrementalExecution(
sparkSession, logicalPlan, OutputMode.Append(), "<unknown>",
- UUID.randomUUID, 0, OffsetSeqMetadata(0, 0))
+ UUID.randomUUID, UUID.randomUUID, 0, OffsetSeqMetadata(0, 0))
} else {
sparkSession.sessionState.executePlan(logicalPlan)
}
http://git-wip-us.apache.org/repos/asf/spark/blob/cbb9bb96/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/IncrementalExecution.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/IncrementalExecution.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/IncrementalExecution.scala
index a73e88c..af52af0 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/IncrementalExecution.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/IncrementalExecution.scala
@@ -42,6 +42,7 @@ class IncrementalExecution(
logicalPlan: LogicalPlan,
val outputMode: OutputMode,
val checkpointLocation: String,
+ val queryId: UUID,
val runId: UUID,
val currentBatchId: Long,
val offsetSeqMetadata: OffsetSeqMetadata)
http://git-wip-us.apache.org/repos/asf/spark/blob/cbb9bb96/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MicroBatchExecution.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MicroBatchExecution.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MicroBatchExecution.scala
index 5defca3..64e09ed 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MicroBatchExecution.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/MicroBatchExecution.scala
@@ -521,6 +521,7 @@ class MicroBatchExecution(
triggerLogicalPlan,
outputMode,
checkpointFile("state"),
+ id,
runId,
currentBatchId,
offsetSeqMetadata)
http://git-wip-us.apache.org/repos/asf/spark/blob/cbb9bb96/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousExecution.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousExecution.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousExecution.scala
index af23c5c..4d42428 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousExecution.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/streaming/continuous/ContinuousExecution.scala
@@ -199,6 +199,7 @@ class ContinuousExecution(
withSink,
outputMode,
checkpointFile("state"),
+ id,
runId,
currentBatchId,
offsetSeqMetadata)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org