SQL-2544: Merge `on-prem-eap` branch into master #337

bucaojit · 2025-04-01T16:28:07Z

~~Note: Still working through eap integration test and evergreen issues, other area can be reviewed.~~

Merging the eap branch into master so that we only have one branch to manage and avoid needing to cherry-pick.

Added version check in MongoConnection to only allow eap builds to support direct connection.
Added gradle changes for running eap integration tests.
Added conditional logic for whether to run tasks or not based on the BUILD_TYPE env variable.

* add eap to jar names; disable publishing to maven * fix s3 puts * remove silk * update bucket name * cleanup evg file * cleanup pt2 * remove final bucket ref * feedback

…mongodb#288) * SQL-2380: Initial evergreen attempt to fetch library files * SQL-2380: Do not use variables * SQL-2380: Fix variables * SQL-2380: Update build task to fetch all libraries * SQL-2380: Special case windows for now * SQL-2380: Remove debug code * SQL-2380: Debug code to check that files are included in jar * SQL-2380: Clean up debug code * SQL-2380: Restore unintended change * SQL-2380: Parse lib version from tag and use that for fetching * SQL-2380: Fix typo * SQL-2380: Properly export new variable * Update .evg.yml Co-authored-by: Natacha Bagnard <[email protected]> * Update .evg.yml Co-authored-by: Patrick Meredith <[email protected]> --------- Co-authored-by: Natacha Bagnard <[email protected]> Co-authored-by: Patrick Meredith <[email protected]>

…er (mongodb#290) * Add integration tests * Load library based on JVMplatform/os info --------- Co-authored-by: Oliver Bucaojit <[email protected]>

This reverts commit d3d606c.

…fetch function in JDBC (mongodb#291) * remove fetch mongosqltranslate windows * rename windows folder to be consistent with evergreen

* Release artifacts to translators-connectors-releases/eap/mongo-jdbc-driver-eap/ Co-authored-by: Oliver Bucaojit <[email protected]>

* Update logic to extract versions * Use correct input Co-authored-by: Oliver Bucaojit <[email protected]> --------- Co-authored-by: Oliver Bucaojit <[email protected]>

* SQL-2385: JDBC documentation * feedback and formatting

* Use property to flag tag triggered releases * Simplify logic * Fix typ * Adding useful build logs

* SQL-2387: upload jdbc docs * udpate name

* SQL-2423: correctly report db version * test length * spotless * rework to be more streamlined * SQL-2423: update logic * spotless * add logging * reset libmongosqltranslate * refactor * add comment * spotless

* SQL-2461: Add getCursorName * SQL-2461: Add getCursorName * SQL-2461: Add getCursorName

* SQL-2436: Split variables intialization for JDBC * SQL-2436: Move SSDLC variables to first logging command

* add handling for non-integer indexes * change null to empty string * add filter to stream to remove non-integer indexes * add boolean valueType to sortableBsonDoc

* SQL-2463: update release instructions * change pr base * remove files * add quotes * wording change * clarify tags * clarify versioning * clarifications

…mongodb#308)

* Augment original uri for specific auth mech * remove redundant comments * Throw instead of returning Null when the augment the uri won't work * Don't forget to wrap the exception in a SQLException * Spotless

* Add THIRDPARTY-LICENSE notice * Clean-up

)

bucaojit · 2025-04-01T16:46:59Z

.evg.yml

@@ -713,11 +832,21 @@ functions:
        script: |
          ARTIFACTS_DIR=artifacts
          S3_ARTIFACTS_DIR='mongo-jdbc-driver/artifacts/${version_id}/${build_variant}'
+          export BUILD_TYPE="snapshot"


Added this BUILD_TYPE variable to use for the tasks to determine whether the eap or standard build is running.

bucaojit · 2025-04-01T16:47:29Z

src/main/java/com/mongodb/jdbc/MongoConnection.java

-                            mongosqlTranslate.getMongosqlTranslateVersion().version;
-                    if (!mongosqlTranslate.checkDriverVersion().compatible) {
+                    String version = MongoDriver.getVersion();
+                    if (MongoDriver.isEapBuild()) {


Added check for build type based on whether the version contains libv

bucaojit · 2025-04-01T16:48:20Z

build.gradle

@@ -12,6 +12,8 @@ import com.github.jk1.license.render.TextReportRenderer

 if (project.hasProperty('isTagTriggered')) {
    version = getAbbreviatedGitVersion()
+} else if (project.hasProperty('isEapBuild')){


Added this property for integration tests to set the version to the eap format.

terakilobyte

Really good work! I had one question/concern, and a request: Can you run an eap build to make sure it all functions?

terakilobyte · 2025-04-02T20:10:56Z

.evg.yml

@@ -167,6 +134,8 @@ tasks:
      - func: "run smoke test"

  - name: "publish-maven"
+    # TODO: remove this before merging eap branch back into main branch, to allow download center to update.


Wondering if we should put a check in the publish-maven task that prevents it from functioning if eap.

Yeah, sure I added some checks for publish-maven, publish-s3, download center, and ssdlc tasks.

bucaojit · 2025-04-04T16:39:41Z

@terakilobyte Here's a run with the eap build:
https://evergreen.mongodb.com/version/67edcb5c187a62000708bd14
I manually set the variables:

+          export BUILD_TYPE="eap"
+          export MDBJDBC_VER=v3.0.0-beta-2-libv1.0.0-beta-3

The release has one smoke test failure, it looks like the version wasn't set to the EAP version I suspect because the git tag isn't set. I'll find something else I can set to fake that.

bucaojit · 2025-04-07T23:21:52Z

The last commit fixes the issue I was seeing with trying to manually test the eap build with setting the env variables to BUILD_TYPE=eap.
Here's the evergreen results for that:
https://evergreen.mongodb.com/version/67f45a798c388b00076b053d

nbagnard

Pretty good work getting all the way there already! 🔥

I reviewed as thoroughly as I could and noted a couple of things.
But I will likely have to pull it and use it to do the final review pass.

nbagnard · 2025-04-08T23:38:44Z

.evg.yml

+          ./gradlew :smoketest:test -Psmoketest
+          EXITCODE=$?
+          ./resources/run_adf.sh stop         
+          exit $EXITCODE

  "export variables":
    - command: shell.exec


I think something happened and the commands have been duplicated/added to each other.
My guess it that you want to dedup this and tune the step where MDBJBC_VER and LIBMONGOSQLTRANSLATE are calculated.

nbagnard · 2025-04-08T23:41:17Z

.evg.yml

+            if [[ "${triggered_by_git_tag}" == *"-libv"* ]]; then
+              echo "Detected EAP tag format."
+              export BUILD_TYPE="eap"
+            else
+              echo "Setting standard build."
+              export BUILD_TYPE="standard"
+            fi
            export MDBJDBC_VER=$(echo ${triggered_by_git_tag} | sed s/v//)
          else
            export MDBJDBC_VER=snapshot
+            export BUILD_TYPE=snapshot


Suggested change

if [[ "${triggered_by_git_tag}" == *"-libv"* ]]; then

echo "Detected EAP tag format."

export BUILD_TYPE="eap"

else

echo "Setting standard build."

export BUILD_TYPE="standard"

fi

export MDBJDBC_VER=$(echo ${triggered_by_git_tag} | sed s/v//)

else

export MDBJDBC_VER=snapshot

export BUILD_TYPE=snapshot

if [[ "${triggered_by_git_tag}" == *"-libv"* ]]; then

echo "Detected EAP tag format."

export BUILD_TYPE="eap"

# tag should be formatted as 'v<JDBC major>.<minor>.<patch>-libv<libmongosqltranslate major>.<minor>.<patch>

export MDBJDBC_VER=$(echo ${triggered_by_git_tag} | awk -F'-libv' '{print $1}' | sed s/v// )

export LIBMONGOSQLTRANSLATE_VER=$(echo ${triggered_by_git_tag} | awk -F'-libv' '{print $2}')

else

echo "Setting standard build."

export BUILD_TYPE="standard"

export MDBJDBC_VER=$(echo ${triggered_by_git_tag} | sed s/v//)

fi

else

export MDBJDBC_VER=snapshot

export LIBMONGOSQLTRANSLATE_VER=snapshot

export BUILD_TYPE=snapshot

nbagnard · 2025-04-09T22:19:29Z

src/main/java/com/mongodb/jdbc/MongoDatabaseMetaData.java

+    private int serverMajorVersion;
+    private int serverMinorVersion;


Are these variables used?

nbagnard · 2025-04-09T22:28:37Z

src/main/java/com/mongodb/jdbc/MongoStatement.java

        GetNamespacesResult namespaceResult =
                mongoSQLTranslate.getNamespaces(currentDB.getName(), sql);
-
-        logger.log(Level.FINE, "Namespaces: " + namespaceResult);


We want to keep the logs. It's probably because I pushed the PR after you started the merge work

nbagnard · 2025-04-09T22:30:49Z

src/main/java/com/mongodb/jdbc/mongosql/BaseResult.java

You don't want to revert the changes in src/main/java/com/mongodb/jdbc/mongosql. I believe.

nbagnard · 2025-04-09T23:03:22Z

src/main/java/com/mongodb/jdbc/mongosql/CheckDriverVersionResult.java

Keep file from master here too.

nbagnard · 2025-04-09T23:03:26Z

src/main/java/com/mongodb/jdbc/mongosql/GetMongosqlTranslateVersionResult.java

Keep file from master here too.

nbagnard · 2025-04-09T23:03:32Z

src/main/java/com/mongodb/jdbc/mongosql/GetNamespacesResult.java

Keep file from master here too.

nbagnard · 2025-04-09T23:05:03Z

src/main/java/com/mongodb/jdbc/mongosql/MongoSQLTranslate.java

This one is trickier. You want to keep the first 186 lines from master, but incorporate the fixes for empty schemas done later in the file.

nbagnard · 2025-04-09T23:05:19Z

src/main/java/com/mongodb/jdbc/mongosql/TranslateResult.java

Keep file from master here too.

jchemburkar and others added 23 commits March 26, 2025 16:04

remove fetch mongosqltranslate windows

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

022740a

Revert "remove fetch mongosqltranslate windows"

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

811885f

This reverts commit d3d606c.

SQL-2385: JDBC documentation (mongodb#292)

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

8bb2bbd

* SQL-2385: JDBC documentation * feedback and formatting

SQL-2387: upload jdbc docs (mongodb#296)

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

a769fcf

* SQL-2387: upload jdbc docs * udpate name

SQL-2467: ensure proper db is used for queries (mongodb#305)

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

a24ba4d

SQL-2682: Pull mongosqltranslate library from Gradle script (mongodb#335

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

3ae02e9

)

Merge remote-tracking branch 'origin/master'

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

59c757f

SQL-2544: Changes for direct cluster integration tests

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

Loading
Loading status checks…

6ef7638

bucaojit requested a review from a team as a code owner April 1, 2025 16:28

bucaojit commented Apr 1, 2025

View reviewed changes

bucaojit added 2 commits April 1, 2025 09:54

SQL-2544: Update dc integration test creds

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

Loading
Loading status checks…

46a34c2

SQL-2544: Fix smoke test for eap and standard build

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

Loading
Loading status checks…

75610de

terakilobyte reviewed Apr 2, 2025

View reviewed changes

SQL-2544: Add conditional logic for eap and non-eap builds

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

Loading
Loading status checks…

7efcc7f

bucaojit requested a review from nbagnard April 2, 2025 22:34

SQL-2544: Fix incorrect eap check in integration test

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

Loading
Loading status checks…

4f5fa6c

SQL-2544: Fix smoketest for eap build for manual test with env var

Verified

This commit was signed with the committer’s verified signature.

bucaojit Oliver Bucaojit

GPG key ID: 77E92AB68E294A00

Verified
Learn about vigilant mode

Loading
Loading status checks…

013161d

nbagnard requested changes Apr 9, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SQL-2544: Merge `on-prem-eap` branch into master #337

SQL-2544: Merge `on-prem-eap` branch into master #337

bucaojit commented Apr 1, 2025 •

edited

Loading

bucaojit Apr 1, 2025

bucaojit Apr 1, 2025

bucaojit Apr 1, 2025

terakilobyte left a comment

terakilobyte Apr 2, 2025

bucaojit Apr 2, 2025

bucaojit commented Apr 4, 2025

bucaojit commented Apr 7, 2025

nbagnard left a comment

nbagnard Apr 8, 2025

nbagnard Apr 8, 2025

nbagnard Apr 9, 2025

nbagnard Apr 9, 2025

nbagnard Apr 9, 2025

nbagnard Apr 9, 2025

nbagnard Apr 9, 2025

nbagnard Apr 9, 2025

nbagnard Apr 9, 2025

nbagnard Apr 9, 2025

		private int serverMajorVersion;
		private int serverMinorVersion;

SQL-2544: Merge on-prem-eap branch into master #337

Are you sure you want to change the base?

SQL-2544: Merge on-prem-eap branch into master #337

Conversation

bucaojit commented Apr 1, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

terakilobyte left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bucaojit commented Apr 4, 2025

bucaojit commented Apr 7, 2025

nbagnard left a 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SQL-2544: Merge `on-prem-eap` branch into master #337

SQL-2544: Merge `on-prem-eap` branch into master #337

bucaojit commented Apr 1, 2025 •

edited

Loading