Skip to content

Conversation

@wangyum
Copy link
Member

@wangyum wangyum commented May 17, 2021

What changes were proposed in this pull request?

This fixes the compilation error due to the logical conflicts between #31776 and #29642 .

Why are the changes needed?

To recover compilation.

Does this PR introduce any user-facing change?

No.

How was this patch tested?

@dongjoon-hyun
Copy link
Member

Thank you!

@github-actions github-actions bot added the SQL label May 17, 2021
FilterApi.lt(longColumn(n), decimalToInt64(v.asInstanceOf[JBigDecimal]))
case ParquetSchemaType(_: DecimalLogicalTypeAnnotation, FIXED_LEN_BYTE_ARRAY, length)
if pushDownDecimal =>
if pushDownDecimal =>
Copy link
Member

Choose a reason for hiding this comment

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

Although this is HOTFIX, okay.

@wangyum wangyum changed the title [HOT-FIX] Fix conflict issue [HOT-FIX][SPARK-32792][SQL] Fix conflict with SPARK-34661 May 17, 2021
@dongjoon-hyun dongjoon-hyun changed the title [HOT-FIX][SPARK-32792][SQL] Fix conflict with SPARK-34661 [SPARK-32792][SQL][FOLLOWUP] Fix conflict with SPARK-34661 May 17, 2021
Copy link
Member

@dongjoon-hyun dongjoon-hyun left a comment

Choose a reason for hiding this comment

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

+1, LGTM. I also verified this manually.

@dongjoon-hyun
Copy link
Member

Thank you so much, @wangyum and @HyukjinKwon . Merged to master to recover master branch.

@wangyum wangyum deleted the HOT-FIX branch May 17, 2021 05:14
@HyukjinKwon
Copy link
Member

Nice!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants