Skip to content

Conversation

@zsxwing
Copy link
Member

@zsxwing zsxwing commented Mar 7, 2017

What changes were proposed in this pull request?

The new watermark should override the old one. Otherwise, we just pick up the first column which has a watermark, it may be unexpected.

How was this patch tested?

The new test.

@zsxwing
Copy link
Member Author

zsxwing commented Mar 7, 2017

cc @marmbrus

@marmbrus
Copy link
Contributor

marmbrus commented Mar 8, 2017

LGTM

@SparkQA
Copy link

SparkQA commented Mar 8, 2017

Test build #74147 has finished for PR 17199 at commit 6527cb1.

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

@zsxwing
Copy link
Member Author

zsxwing commented Mar 8, 2017

retest this please

@SparkQA
Copy link

SparkQA commented Mar 8, 2017

Test build #74166 has finished for PR 17199 at commit 6527cb1.

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

@zsxwing
Copy link
Member Author

zsxwing commented Mar 8, 2017

Thanks! Merging to master and 2.1.

asfgit pushed a commit that referenced this pull request Mar 8, 2017
## What changes were proposed in this pull request?

The new watermark should override the old one. Otherwise, we just pick up the first column which has a watermark, it may be unexpected.

## How was this patch tested?

The new test.

Author: Shixiong Zhu <shixiong@databricks.com>

Closes #17199 from zsxwing/SPARK-19859.

(cherry picked from commit d8830c5)
Signed-off-by: Shixiong Zhu <shixiong@databricks.com>
@asfgit asfgit closed this in d8830c5 Mar 8, 2017
@zsxwing zsxwing deleted the SPARK-19859 branch March 8, 2017 04:38
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