Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GLUTEN-4803][UT] Add Golden Files for TPC-H Spark33 + Gluten Execution Plan #4804

Merged
merged 6 commits into from
Mar 1, 2024

Conversation

zwangsheng
Copy link
Contributor

What changes were proposed in this pull request?

Close #4803

As title, follow up to add TPC-H + Spark33 Golden Files.

How was this patch tested?

unit tests

Copy link

#4803

Copy link

Run Gluten Clickhouse CI

1 similar comment
Copy link

Run Gluten Clickhouse CI

@zwangsheng
Copy link
Contributor Author

Hi @ulysses-you @PHILO-HE, please take a review and help re-trigger the fail ci.

- name: Upload golden files
if: failure()
uses: actions/upload-artifact@v4
with:
name: golden-files-spark32
path: |
/tmp/${{ github.run_id }}/tpch-approved-plan/**
/tmp/${{ github.run_id }}/spark322/tpch-approved-plan/**
Copy link
Contributor

Choose a reason for hiding this comment

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

does the path correct ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, this path is CI Local Disk Path, which will be created when copy golden files from docker image.

@@ -81,7 +81,7 @@ abstract class VeloxTPCHSuite extends VeloxTPCHTableSupport {
def shouldCheckGoldenFiles(): Boolean = {
Seq("v1", "v1-bhj").contains(subType()) && (formatSparkVersion match {
case "322" => true
case "331" => false
case "331" => true
Copy link
Contributor

Choose a reason for hiding this comment

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

can we use the major version, 32, 33 ? what happens if we update Spark minor version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sound good to me, we can match those main version with startsWith

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Update, please take a review.

Copy link

Run Gluten Clickhouse CI

Copy link
Contributor

Choose a reason for hiding this comment

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

the golden files path did not change ..

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Well, right, in order to avoid frequent changes caused by upgrading the minor version, the concept of the minor version should be masked

Copy link

Run Gluten Clickhouse CI

Copy link
Contributor

@PHILO-HE PHILO-HE left a comment

Choose a reason for hiding this comment

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

Looks good! Thanks!

- name: Upload golden files
if: failure()
uses: actions/upload-artifact@v4
with:
name: golden-files-spark32
path: |
/tmp/${{ github.run_id }}/tpch-approved-plan/**
/tmp/${{ github.run_id }}/spark32/tpch-approved-plan/**
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: can we use $GITHUB_RUN_ID for consistency?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I tried using $GITHUB_RUN_ID, but it is considered as string not a var. Then take this approach.

@ulysses-you
Copy link
Contributor

let's hold on this pr for #4815

@zwangsheng zwangsheng marked this pull request as draft March 1, 2024 03:41
Copy link

github-actions bot commented Mar 1, 2024

Run Gluten Clickhouse CI

@zwangsheng
Copy link
Contributor Author

zwangsheng commented Mar 1, 2024

Do some rebase operations, mark as draft for now.

@zwangsheng zwangsheng marked this pull request as ready for review March 1, 2024 05:41
Copy link

github-actions bot commented Mar 1, 2024

Run Gluten Clickhouse CI

@zwangsheng zwangsheng requested a review from PHILO-HE March 1, 2024 07:34
Copy link
Contributor

@PHILO-HE PHILO-HE left a comment

Choose a reason for hiding this comment

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

Thanks for your continuous efforts!

@ulysses-you ulysses-you merged commit 45592df into apache:main Mar 1, 2024
19 checks passed
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.

[UT] Add Golden Files for TPC-H Spark33 + Gluten Execution Plan
3 participants