Skip to content

Conversation

@ajantha-bhat
Copy link
Member

@ajantha-bhat ajantha-bhat commented Dec 5, 2021

This is a back sync of #3375 and its dependant #3675 to spark-3.1 folder

@github-actions github-actions bot added the spark label Dec 5, 2021
// But these two conversions already exist and well tested. So, we are going with this approach.
SparkFilters.convert(DataSourceStrategy.translateFilter(sparkExpression, supportNestedPredicatePushdown = true).get)
}
}
Copy link
Contributor

@kbendick kbendick Dec 5, 2021

Choose a reason for hiding this comment

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

I noticed that this Scala file was placed in the java codepath (e.g. it's in src/main/java and not src/main/scala).

Is there a reason for this?

Seems like something that might need to be updated in the original PR as well if it's not intentional.

Copy link
Member Author

Choose a reason for hiding this comment

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

good catch @kbendick , I think I didn't notice it while creating a package. I will first fix in the spark-3.2 and then update these PR. Thanks

Copy link
Contributor

Choose a reason for hiding this comment

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

No worries. I feel like we already have this class (though maybe I saw it when you previously merged it). I believe I saw it being used in the add_files procedure code.

If we already do, then just use that one and just remove the extra file.

Thanks for taking care of this. 🙂

Copy link
Member Author

@ajantha-bhat ajantha-bhat Dec 6, 2021

Choose a reason for hiding this comment

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

I checked add_files procedure, it doesn't involve this functionality or code. So, probably you might have seen it in my spark-3.2 merged PR.

Copy link
Contributor

@kbendick kbendick left a comment

Choose a reason for hiding this comment

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

Also, I noticed there's a file rename here (as well as in the original PR).

I admittedly didn't review the other one and only recently became more familiar with this area of the codebase, but given the accidental Java / Scala file path thing, is this file name change intentional?

The new name of the file is: spark/v3.1/spark/src/main/java/org/apache/spark/sql/catalyst/plans.logical/SetWriteDistributionAndOrdering.scala

It's odd to me that it would be catalyst/plans.logical/SetWriteDistributionAndOrdering.scala instead of with a slash in the file path name (instead using plans.logical for just part of the path).

Maybe this is a notation I'm not familiar with? But I would definitely double check if I were you.

Thanks overall for this very welcomed additional SQL functionality 😀

@ajantha-bhat
Copy link
Member Author

ajantha-bhat commented Dec 6, 2021

The new name of the file is: spark/v3.1/spark/src/main/java/org/apache/spark/sql/catalyst/plans.logical/SetWriteDistributionAndOrdering.scala
It's odd to me that it would be catalyst/plans.logical/SetWriteDistributionAndOrdering.scala instead of with a slash in the file path name (instead using plans.logical for just part of the path).

@kbendick: That shows only in the PR. but when merged, github / codebase can understand that it is a sub package.
See final results here: https://github.com/apache/iceberg/tree/master/spark/v3.2/spark/src/main/java/org/apache/spark/sql/catalyst/plans/logical

@ajantha-bhat
Copy link
Member Author

CI failed because of this problem
I will update my testcase

@ajantha-bhat ajantha-bhat marked this pull request as draft December 6, 2021 04:43
@ajantha-bhat ajantha-bhat force-pushed the call3.1 branch 2 times, most recently from a7593b0 to 8868002 Compare December 6, 2021 05:20
@ajantha-bhat ajantha-bhat marked this pull request as ready for review December 6, 2021 06:33
@ajantha-bhat
Copy link
Member Author

@kbendick : PR is ready. Could you please take a look at it again ?
cc: @rdblue , @RussellSpitzer

@ajantha-bhat
Copy link
Member Author

The new name of the file is: spark/v3.1/spark/src/main/java/org/apache/spark/sql/catalyst/plans.logical/SetWriteDistributionAndOrdering.scala

It's odd to me that it would be catalyst/plans.logical/SetWriteDistributionAndOrdering.scala instead of with a slash in the file path name (instead using plans.logical for just part of the path).

I have created a sub packages, instead single package. So, the path is using '/' now instead of '.'

@ajantha-bhat
Copy link
Member Author

@jackye1995 : could you please add 0.13.0 milestone for this PR ?

@jackye1995 jackye1995 added this to the Iceberg 0.13.0 Release milestone Dec 9, 2021
@jackye1995
Copy link
Contributor

thanks for reminding, I am planning to review tomorrow morning

@RussellSpitzer
Copy link
Member

@ajantha-bhat Are there any specific changes here from 3.2 that I should look out for?

Copy link
Contributor

@jackye1995 jackye1995 left a comment

Choose a reason for hiding this comment

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

I did a comparison and it looks the same as 3.2, and I don't have much concern. Thanks for the backport.

@RussellSpitzer RussellSpitzer merged commit fc68cee into apache:master Dec 9, 2021
@RussellSpitzer
Copy link
Member

Merged! I'll go take a look at the 3.0 backport

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.

4 participants