Skip to content

Conversation

@tdas
Copy link
Contributor

@tdas tdas commented Nov 16, 2016

What changes were proposed in this pull request?

SPARK-18459: triggerId seems like a number that should be increasing with each trigger, whether or not there is data in it. However, actually, triggerId increases only where there is a batch of data in a trigger. So its better to rename it to batchId.

SPARK-18460: triggerDetails was missing from json representation. Fixed it.

How was this patch tested?

Updated existing unit tests.

@tdas tdas changed the title [SPARK-18459][Structured Streaming] Rename triggerId to batchId in StreamingQueryStatus.triggerDetails [SPARK-18459][SPARK-18460][Structured Streaming] Rename triggerId to batchId in StreamingQueryStatus.triggerDetails Nov 16, 2016
("processingRate" -> JDouble(processingRate)) ~
("latency" -> latency.map(JDouble).getOrElse(JNothing)) ~
("triggerDetails" -> JsonProtocol.mapToJson(triggerDetails.asScala))
("triggerDetails" -> JsonProtocol.mapToJson(triggerDetails.asScala)) ~
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the fix for triggerDetails not being in the status.json.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tdas tdas changed the title [SPARK-18459][SPARK-18460][Structured Streaming] Rename triggerId to batchId in StreamingQueryStatus.triggerDetails [SPARK-18459][SPARK-18460][Structured Streaming] Rename triggerId to batchId and add triggerDetails to json in StreamingQueryStatus Nov 16, 2016
@tdas tdas changed the title [SPARK-18459][SPARK-18460][Structured Streaming] Rename triggerId to batchId and add triggerDetails to json in StreamingQueryStatus [SPARK-18459][SPARK-18460][StructuredStreaming] Rename triggerId to batchId and add triggerDetails to json in StreamingQueryStatus Nov 16, 2016
@SparkQA
Copy link

SparkQA commented Nov 16, 2016

Test build #68681 has finished for PR 15895 at commit 02e8eeb.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Nov 16, 2016

Test build #68682 has finished for PR 15895 at commit ca96e81.

  • This patch fails PySpark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@SparkQA
Copy link

SparkQA commented Nov 16, 2016

Test build #68713 has finished for PR 15895 at commit d3d892c.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@zsxwing
Copy link
Member

zsxwing commented Nov 16, 2016

LGTM. Merging to master, 2.1 and 2.0.

asfgit pushed a commit that referenced this pull request Nov 16, 2016
…atchId and add triggerDetails to json in StreamingQueryStatus

## What changes were proposed in this pull request?

SPARK-18459: triggerId seems like a number that should be increasing with each trigger, whether or not there is data in it. However, actually, triggerId increases only where there is a batch of data in a trigger. So its better to rename it to batchId.

SPARK-18460: triggerDetails was missing from json representation. Fixed it.

## How was this patch tested?
Updated existing unit tests.

Author: Tathagata Das <tathagata.das1565@gmail.com>

Closes #15895 from tdas/SPARK-18459.

(cherry picked from commit 0048ce7)
Signed-off-by: Shixiong Zhu <shixiong@databricks.com>
@zsxwing
Copy link
Member

zsxwing commented Nov 16, 2016

Oh, merge conflicts with 2.0. Could you submit a PR for 2.0?

@asfgit asfgit closed this in 0048ce7 Nov 16, 2016
asfgit pushed a commit that referenced this pull request Nov 16, 2016
…atchId and add triggerDetails to json in StreamingQueryStatus (for branch-2.0)

This is a fix for branch-2.0 for the earlier PR #15895

## What changes were proposed in this pull request?

SPARK-18459: triggerId seems like a number that should be increasing with each trigger, whether or not there is data in it. However, actually, triggerId increases only where there is a batch of data in a trigger. So its better to rename it to batchId.

SPARK-18460: triggerDetails was missing from json representation. Fixed it.
## How was this patch tested?

Updated tests

Author: Tathagata Das <tathagata.das1565@gmail.com>

Closes #15908 from tdas/SPARK-18459-2.0.
uzadude pushed a commit to uzadude/spark that referenced this pull request Jan 27, 2017
…atchId and add triggerDetails to json in StreamingQueryStatus

## What changes were proposed in this pull request?

SPARK-18459: triggerId seems like a number that should be increasing with each trigger, whether or not there is data in it. However, actually, triggerId increases only where there is a batch of data in a trigger. So its better to rename it to batchId.

SPARK-18460: triggerDetails was missing from json representation. Fixed it.

## How was this patch tested?
Updated existing unit tests.

Author: Tathagata Das <tathagata.das1565@gmail.com>

Closes apache#15895 from tdas/SPARK-18459.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants