Add check for java 11 when building gcp jars and add sbt clean #233

david-zlai · 2025-01-17T00:44:58Z

Summary

Checklist

Added Unit Tests
Covered by existing CI
Integration tested
Documentation update

Tested:

(dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ asdf local java corretto-17.0.13.11.1
(dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ asdf reshim java corretto-17.0.13.11.1
j(dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ javac --version
javac 17.0.13
(dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ python  api/py/ai/chronon/repo/run.py --mode upload --conf production/group_bys/quickstart/purchases.v1 --ds  2023-12-01 --dataproc 
(dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ 
(dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ bash distribution/build_and_upload_gcp_artifacts.sh canary
Working in /Users/davidhan/zipline/chronon
Building wheel
Failed major version of 17. Expecting java version of at least 11.

Summary by CodeRabbit

New Features
- Added commands for generating Python code from Thrift files in the build script.
- Introduced a clean command to prepare the build environment before assembly tasks.
- Added validation for the existence of the Zipline wheel file after building.
Chores
- Updated build configuration to target Java 11 compiler settings.

coderabbitai · 2025-01-17T00:45:05Z

Walkthrough

The pull request modifies the build_and_upload_gcp_artifacts.sh script by adding commands to generate Python code from Thrift files, introducing a clean command for the build environment, and validating the existence of a specific Zipline wheel file. Additionally, the build.sbt file is updated to include Java compiler options for compatibility with Java 11. These changes ensure proper artifact generation and build environment preparation.

Changes

File	Change Summary
`distribution/build_and_upload_gcp_artifacts.sh`	Added commands for generating Python code from Thrift files, introduced `sbt clean`, and added Zipline wheel file existence check.
`build.sbt`	Added `javacOptions` to set source and target compatibility to Java 11.

Possibly related PRs

Add script to upload cloud gcp jars to appropriate bucket. #203: The main PR and this PR both involve the build_and_upload_gcp_artifacts.sh script, with the main PR adding commands for generating Python code from Thrift files, while this PR introduces the script itself for building and uploading GCP artifacts.
fix: thrift --gen was outputting incorrectly in a nested fashion #219: This PR also modifies the build_and_upload_gcp_artifacts.sh script, specifically addressing the output structure of generated Python files from Thrift definitions, which is directly related to the changes made in the main PR regarding Thrift file processing.

Suggested reviewers

chewy-zlai
piyush-zlai
tchow-zlai

Poem

🌟 In scripts we weave, with Thrift's embrace,
Python code flows, in a clean-up space.
Java's version, eleven we seek,
Build artifacts strong, no errors to speak!
🚀 A seamless journey, through code we glide,
With every command, our changes take pride!

Warning

Review ran into problems

🔥 Problems

GitHub Actions: Resource not accessible by integration - https://docs.github.com/rest/actions/workflow-runs#list-workflow-runs-for-a-repository.

Please grant the required permissions to the CodeRabbit GitHub App under the organization or repository settings.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro (Legacy)

📥 Commits

Reviewing files that changed from the base of the PR and between 7cf0e41 and 2aac656.

📒 Files selected for processing (1)

distribution/build_and_upload_gcp_artifacts.sh (2 hunks)

🚧 Files skipped from review as they are similar to previous changes (1)

distribution/build_and_upload_gcp_artifacts.sh

⏰ Context from checks skipped due to timeout of 90000ms (6)

GitHub Check: table_utils_delta_format_spark_tests
GitHub Check: other_spark_tests
GitHub Check: mutation_spark_tests
GitHub Check: join_spark_tests
GitHub Check: fetcher_spark_tests
GitHub Check: no_spark_scala_tests

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

coderabbitai

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro (Legacy)

📥 Commits

Reviewing files that changed from the base of the PR and between db12b81 and e75db81.

📒 Files selected for processing (1)

distribution/build_and_upload_gcp_artifacts.sh (2 hunks)

🔇 Additional comments (1)

distribution/build_and_upload_gcp_artifacts.sh (1)

46-46: LGTM!

Good addition of sbt clean before assembly commands.

coderabbitai · 2025-01-17T00:46:03Z

distribution/build_and_upload_gcp_artifacts.sh

+# Check for java 11 because gcp requires java 11
+MAJOR_JAVA_VERSION=$(javac --version | cut -d " " -f2 | cut -d "." -f 1)
+EXPECTED_JAVA_VERSION=11
+if [[ $MAJOR_JAVA_VERSION -gt $EXPECTED_JAVA_VERSION ]] ; then
+    echo "Failed java major version of $MAJOR_JAVA_VERSION. Expecting java version of at least $EXPECTED_JAVA_VERSION."
+    exit 1
+fi


⚠️ Potential issue

Fix Java version check logic.

The check fails for Java versions > 11, contradicting the requirement of "Java 11 or higher".

-if [[ $MAJOR_JAVA_VERSION -gt $EXPECTED_JAVA_VERSION ]] ; then - echo "Failed java major version of $MAJOR_JAVA_VERSION. Expecting java version of at least $EXPECTED_JAVA_VERSION." +if [[ $MAJOR_JAVA_VERSION -lt $EXPECTED_JAVA_VERSION ]] ; then + echo "Failed java major version of $MAJOR_JAVA_VERSION. Expecting java version of at least $EXPECTED_JAVA_VERSION."

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

# Check for java 11 because gcp requires java 11

MAJOR_JAVA_VERSION=$(javac --version | cut -d " " -f2 | cut -d "." -f 1)

EXPECTED_JAVA_VERSION=11

if [[ $MAJOR_JAVA_VERSION -gt $EXPECTED_JAVA_VERSION ]] ; then

echo "Failed java major version of $MAJOR_JAVA_VERSION. Expecting java version of at least $EXPECTED_JAVA_VERSION."

exit 1

fi

# Check for java 11 because gcp requires java 11

MAJOR_JAVA_VERSION=$(javac --version | cut -d " " -f2 | cut -d "." -f 1)

EXPECTED_JAVA_VERSION=11

if [[ $MAJOR_JAVA_VERSION -lt $EXPECTED_JAVA_VERSION ]] ; then

echo "Failed java major version of $MAJOR_JAVA_VERSION. Expecting java version of at least $EXPECTED_JAVA_VERSION."

exit 1

fi

david-zlai · 2025-01-17T01:07:27Z

distribution/build_and_upload_gcp_artifacts.sh

+if [[ $MAJOR_JAVA_VERSION -gt $EXPECTED_JAVA_VERSION ]] ; then
+    echo "Failed java major version of $MAJOR_JAVA_VERSION. Expecting java version of at least $EXPECTED_JAVA_VERSION."
+    exit 1
+fi


Suggested change

if [[ $MAJOR_JAVA_VERSION -gt $EXPECTED_JAVA_VERSION ]] ; then

echo "Failed java major version of $MAJOR_JAVA_VERSION. Expecting java version of at least $EXPECTED_JAVA_VERSION."

exit 1

fi

if [[ ! $MAJOR_JAVA_VERSION -eq $EXPECTED_JAVA_VERSION ]] ; then

echo "Failed java major version of $MAJOR_JAVA_VERSION. Expecting java version $EXPECTED_JAVA_VERSION."

exit 1

fi

tchow-zlai · 2025-01-17T01:34:38Z

.tool-versions

@@ -1,4 +1,4 @@
-java corretto-17.0.9.8.1
+java corretto-17.0.13.11.1


actaully why do we have this change? and shouldn't we be using java 11 corretto?

hmm yeah we should be keeping java 17 there.

as for using java 11, yeah we should but it's been set to 17 though since beginning i guess

tchow-zlai · 2025-01-17T01:36:24Z

distribution/build_and_upload_gcp_artifacts.sh

@@ -24,6 +24,14 @@ if [[ EXPECTED_MINIMUM_MINOR_PYTHON_VERSION -gt MINOR_PYTHON_VERSION ]] ; then
    exit 1
 fi

+# Check for java 11 because gcp requires java 11
+MAJOR_JAVA_VERSION=$(javac --version | cut -d " " -f2 | cut -d "." -f 1)


just checking this would work for java 8 where the versioning looks like 1.8.X right?

ah no... dang it.

davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/gbu_driver_run) $ javac --version javac 11.0.25

cut -d " " -f2 -> would return the second keyword 11.0.25
and then
cut -d "." -f 1 -> would return just the 11

i can remove this check since i'm enforcing java11 in the build.sbt

.tool-versions

piyush-zlai · 2025-01-17T14:07:55Z

distribution/build_and_upload_gcp_artifacts.sh

@@ -24,6 +24,14 @@ if [[ EXPECTED_MINIMUM_MINOR_PYTHON_VERSION -gt MINOR_PYTHON_VERSION ]] ; then
    exit 1
 fi

+# Check for java 11 because gcp requires java 11


might be worth enforcing etc in the build.sbt as well - wdyt?

good point. adding

## Summary ## Checklist - [ ] Added Unit Tests - [ ] Covered by existing CI - [ ] Integration tested - [ ] Documentation update Tested: ``` (dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ asdf local java corretto-17.0.13.11.1 (dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ asdf reshim java corretto-17.0.13.11.1 j(dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ javac --version javac 17.0.13 (dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ python api/py/ai/chronon/repo/run.py --mode upload --conf production/group_bys/quickstart/purchases.v1 --ds 2023-12-01 --dataproc (dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ (dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/check_for_java11) $ bash distribution/build_and_upload_gcp_artifacts.sh canary Working in /Users/davidhan/zipline/chronon Building wheel Failed major version of 17. Expecting java version of at least 11. ```  ## Summary by CodeRabbit - **New Features** - Added commands for generating Python code from Thrift files in the build script. - Introduced a clean command to prepare the build environment before assembly tasks. - Added validation for the existence of the Zipline wheel file after building. - **Chores** - Updated build configuration to target Java 11 compiler settings.

…an (#233) ## Summary ## Cheour clientslist - [ ] Added Unit Tests - [ ] Covered by existing CI - [ ] Integration tested - [ ] Documentation update Tested: ``` (dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/cheour clients_for_java11) $ asdf local java corretto-17.0.13.11.1 (dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/cheour clients_for_java11) $ asdf reshim java corretto-17.0.13.11.1 j(dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/cheour clients_for_java11) $ javac --version javac 17.0.13 (dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/cheour clients_for_java11) $ python api/py/ai/chronon/repo/run.py --mode upload --conf production/group_bys/quiour clientsstart/purchases.v1 --ds 2023-12-01 --dataproc (dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/cheour clients_for_java11) $ (dev_chronon) davidhan@Davids-MacBook-Pro: ~/zipline/chronon (davidhan/cheour clients_for_java11) $ bash distribution/build_and_upload_gcp_artifacts.sh canary Working in /Users/davidhan/zipline/chronon Building wheel Failed major version of 17. Expecting java version of at least 11. ```  ## Summary by CodeRabbit - **New Features** - Added commands for generating Python code from Thrift files in the build script. - Introduced a clean command to prepare the build environment before assembly tasks. - Added validation for the existence of the Zipline wheel file after building. - **Chores** - Updated build configuration to target Java 11 compiler settings.

david-zlai requested a review from tchow-zlai January 17, 2025 00:45

coderabbitai bot reviewed Jan 17, 2025

View reviewed changes

tchow-zlai approved these changes Jan 17, 2025

View reviewed changes

david-zlai commented Jan 17, 2025

View reviewed changes

tchow-zlai reviewed Jan 17, 2025

View reviewed changes

david-zlai commented Jan 17, 2025

View reviewed changes

.tool-versions Outdated Show resolved Hide resolved

piyush-zlai reviewed Jan 17, 2025

View reviewed changes

david-zlai added 4 commits January 17, 2025 10:57

Add check for java 11 when building gcp jars and add sbt clean

5748b27

comment

57134a4

better comment

291e24f

enforce java11 in build.sbt

0f8acf7

david-zlai force-pushed the davidhan/check_for_java11 branch from 488a53a to 0f8acf7 Compare January 17, 2025 15:57

david-zlai added 2 commits January 17, 2025 10:58

put java version back

7cf0e41

remove the check and lean on sbt

2aac656

tchow-zlai approved these changes Jan 17, 2025

View reviewed changes

david-zlai merged commit 32ae8d7 into main Jan 17, 2025
9 checks passed

david-zlai deleted the davidhan/check_for_java11 branch January 17, 2025 20:03

This was referenced Jan 17, 2025

Bazel migration for cloud_gcp module #240

Merged

Maka service_commons package java 11 compatible #270

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add check for java 11 when building gcp jars and add sbt clean #233

Add check for java 11 when building gcp jars and add sbt clean #233

david-zlai commented Jan 17, 2025 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Jan 17, 2025 •

edited

Loading

Review ran into problems

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

coderabbitai bot left a comment

coderabbitai bot Jan 17, 2025

david-zlai Jan 17, 2025

tchow-zlai Jan 17, 2025

david-zlai Jan 17, 2025

tchow-zlai Jan 17, 2025

david-zlai Jan 17, 2025

david-zlai Jan 17, 2025

piyush-zlai Jan 17, 2025

david-zlai Jan 17, 2025

		@@ -1,4 +1,4 @@
		java corretto-17.0.9.8.1
		java corretto-17.0.13.11.1

Add check for java 11 when building gcp jars and add sbt clean #233

Add check for java 11 when building gcp jars and add sbt clean #233

Conversation

david-zlai commented Jan 17, 2025 • edited by coderabbitai bot Loading

Summary

Checklist

Summary by CodeRabbit

coderabbitai bot commented Jan 17, 2025 • edited Loading

Walkthrough

Changes

Possibly related PRs

Suggested reviewers

Poem

Review ran into problems

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

coderabbitai bot left a comment

Choose a reason for hiding this comment

coderabbitai bot Jan 17, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

david-zlai commented Jan 17, 2025 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Jan 17, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)