Introduce batch support. #136

vbabanin · 2025-10-17T20:11:25Z

https://jira.mongodb.org/browse/HIBERNATE-40
https://jira.mongodb.org/browse/HIBERNATE-35

evergreen-ci-prod · 2025-10-17T20:11:29Z

There is an existing patch(es) for this commit SHA:

Evergreen patch with PR

Please note that the status that is posted is not in the context of this PR but rather the (latest) existing patch and that may affect some tests that may depend on the particular PR. If your tests do not rely on any PR-specific values (like base or head branch name) then your tests will report the same status. If you would like a patch to run in the context of this PR and abort the other(s), comment 'evergreen retry'.

vbabanin · 2025-10-17T20:13:19Z

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

-    @Override
-    public void addBatch(String mql) throws SQLException {
-        checkClosed();
-        throw new SQLFeatureNotSupportedException("TODO-HIBERNATE-35 https://jira.mongodb.org/browse/HIBERNATE-35");
-    }
-
-    @Override
-    public void clearBatch() throws SQLException {
-        checkClosed();
-        throw new SQLFeatureNotSupportedException("TODO-HIBERNATE-35 https://jira.mongodb.org/browse/HIBERNATE-35");
-    }
-
-    @Override
-    public int[] executeBatch() throws SQLException {
-        checkClosed();
-        closeLastOpenResultSet();
-        throw new SQLFeatureNotSupportedException("TODO-HIBERNATE-35 https://jira.mongodb.org/browse/HIBERNATE-35");
-    }


These are not implemented because Hibernate relies on PreparedStatement methods for batching.

stIncMale · 2025-10-22T22:06:38Z

Let's remove MongoStatement.executeUpdate(String) - Hibernate ORM does not use it. We should do it after dealing with the current PR.

Update: we decided to leave it, as removing it causes code restructuring (otherwise the code looks weird), and we don't want to do that. Continue having this method seems to be a lesser burden than removing it.

src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementIntegrationTests.java

stIncMale · 2025-10-24T22:05:40Z

src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementIntegrationTests.java

+
+        @ParameterizedTest(name = "test not supported update elements. Parameters: option={0}")
+        @ValueSource(strings = {"hint", "collation", "arrayFilters", "sort", "upsert", "c"})
+        void testNotSupportedUpdateElements(String unsupportedElement) {


These are not called "element", they are called "option". See https://www.mongodb.com/docs/manual/reference/command/update/. Let's make all the changes needed to reflect that.

The same applies to testNotSupportedDeleteElements.

As discussed during the walkthrough - renamed to "field".

stIncMale · 2025-10-24T22:12:08Z

src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementIntegrationTests.java

+        }
+
+        @ParameterizedTest(name = "test not supported update elements. Parameters: option={0}")
+        @ValueSource(strings = {"hint", "collation", "arrayFilters", "sort", "upsert", "c"})


I suspect, we should use both keys and values, like "hint: 'abc'", here, as otherwise the { _id: 1 } value currently used as the value of each option is not always valid. If we use a valid value for each option, then having an exception makes it more clear the the option name itself caused it.

The same applies to testNotSupportedDeleteElements.

…redStatementIntegrationTests.java Co-authored-by: Valentin Kovalenko <[email protected]>

stIncMale

Finished reviewing MongoPreparedStatementIntegrationTests. So far I have the following reviewed:

AbstractQueryIntegrationTests
LimitOffsetFetchClauseIntegrationTests
BatchUpdateIntegrationTests
MongoPreparedStatementIntegrationTests

We worked thoroughly on MongoPreparedStatement, MongoStatement during the code walkthrough. But I will still need to look at them once the changes are pushed.

The last reviewed commit is 11a2b07.

stIncMale · 2025-10-27T14:04:04Z

src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementIntegrationTests.java

+                            .returns(0, BatchUpdateException::getErrorCode);
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }


We don't need this catch (SQLException e) here and in any other test in ExecuteBatchTests.

Pre-existing test methods need it because they implement Function, while the new tests implement Work, and its Work.execute method throws SQLException.

src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementIntegrationTests.java

stIncMale · 2025-10-27T14:14:38Z

src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementIntegrationTests.java

+
+        @Test
+        void testBatchInsert() {
+            var batchCount = 3;


Maybe let's call it batchSize here and in other places? Feels more natural, and is closer to hibernate.jdbc.batch_size, which has the same meaning.

Neither JDBC API documentation, nor the JDBC specification seem to use "count" to refer to the number of commands in a batch.

stIncMale · 2025-10-27T14:32:33Z

src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementIntegrationTests.java

+            for (int i = 0; i < batchCount; i++) {
+                expectedDocs.add(BsonDocument.parse(format(
+                        """
+                        {
+                            "_id": %d,
+                            "title": "Book %d"
+                        }""",
+                        i + 1, i + 1)));


Let's use for (int i = 1; i <= batchCount; i++), especially given that above we used these exact boundaries, so that we could use i, i instead of i + 1, i + 1. The same suggestion applies to testBatchUpdate.

stIncMale · 2025-10-27T14:45:55Z

src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementIntegrationTests.java

+        }
+
+        @Test
+        @DisplayName("Test statement’s batch queue is reset once executeBatch returns")


The API documentation of PreparedStatement.addBatch calls it "batch of commands". I found "qeue" neither in the API documentation nor in the JDBC specification. Unless I missed it, and "queue" is the term that is actually used, let's say either "statement’s batch" or "statement's batch of commands".

…redStatementIntegrationTests.java Co-authored-by: Valentin Kovalenko <[email protected]>

Remove redundant tests.

# Conflicts: # src/main/java/com/mongodb/hibernate/jdbc/MongoPreparedStatement.java # src/test/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementTests.java

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

src/main/java/com/mongodb/hibernate/jdbc/MongoPreparedStatement.java

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

src/main/java/com/mongodb/hibernate/jdbc/MongoPreparedStatement.java

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

Co-authored-by: Valentin Kovalenko <[email protected]>

stIncMale

Almost done, but some more review work (or, rather, trying and maybe proposing) is needed in the area of exception handling and transaction handling. I continue reviewing.

src/main/java/com/mongodb/hibernate/jdbc/MongoPreparedStatement.java

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

stIncMale · 2025-10-29T05:06:28Z

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

+        private static final Set<String> SUPPORTED_INSERT_COMMAND_FIELDS = Set.of("documents");
+
+        private static final Set<String> SUPPORTED_UPDATE_COMMAND_FIELDS = Set.of("updates");
+        private static final Set<String> SUPPORTED_UPDATE_STATEMENT_FIELDS = Set.of("q", "u", "multi");
+
+        private static final Set<String> SUPPORTED_DELETE_COMMAND_FIELDS = Set.of("deletes");
+        private static final Set<String> SUPPORTED_DELETE_STATEMENT_FIELDS = Set.of("q", "limit");


[optional]

What do you think about moving these to CommandDescription? That way the information tightly related to commands stays mostly there.

P.S. At first I thought about moving them there as instance methods, potentially with the checks, but then I realized that different commands have different structure (for example, aggregate does not have statements), which makes such endeavour non-trivial.

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

stIncMale

The last reviewed commit is ~~afd8853~~ ~~18a18f7~~, ~~515a8ac~~, 0a3ec1a.

I reviewed everything but:

MongoStatementTests
MongoPreparedStatementTests
the changes to MongoPreparedStatementIntegrationTests after 510bc2d (this commit and the changes before it were reviewed)

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

Co-authored-by: Valentin Kovalenko <[email protected]>

# Conflicts: # src/main/java/com/mongodb/hibernate/jdbc/MongoStatement.java

… methods package-private.

…t.java Co-authored-by: Valentin Kovalenko <[email protected]>

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

Co-authored-by: Valentin Kovalenko <[email protected]>

vbabanin and others added 12 commits September 10, 2025 22:40

Introduce batch support.

4b65eb2

Add tests and refactor MongoStatements.

5b17d58

Merge branch 'main' into HIBERNATE-40

3f1ebcb

Rename tests.

ded2bb7

Rename variables.

92d9c41

Rename methods, add tests.

b78cb77

Revert to private.

a7f7792

Add JDBC exception handling.

7372d56

Apply spotless.

330de0f

Apply spotless.

5c81496

Revert SqlTransientException handling.

e4d7afd

Remove SQlConsumer.

183aafc

vbabanin self-assigned this Oct 17, 2025

vbabanin requested a review from a team as a code owner October 17, 2025 20:11

vbabanin requested review from nhachicha and removed request for a team October 17, 2025 20:11

vbabanin requested review from stIncMale and removed request for nhachicha October 17, 2025 20:11

vbabanin commented Oct 17, 2025

View reviewed changes

Fix issues.

9577603

stIncMale requested changes Oct 25, 2025

View reviewed changes

vbabanin and others added 3 commits October 24, 2025 21:42

Update src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPrepa…

76acbc5

…redStatementIntegrationTests.java Co-authored-by: Valentin Kovalenko <[email protected]>

Update src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPrepa…

39df511

…redStatementIntegrationTests.java Co-authored-by: Valentin Kovalenko <[email protected]>

Update src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPrepa…

11a2b07

…redStatementIntegrationTests.java Co-authored-by: Valentin Kovalenko <[email protected]>

stIncMale requested changes Oct 27, 2025

View reviewed changes

vbabanin and others added 3 commits October 27, 2025 13:39

Update src/integrationTest/java/com/mongodb/hibernate/jdbc/MongoPrepa…

510bc2d

…redStatementIntegrationTests.java Co-authored-by: Valentin Kovalenko <[email protected]>

Fix batch update count reporting.

6faa9cb

Remove redundant tests.

Merge branch 'main' into HIBERNATE-40

b27ef0e

# Conflicts: # src/main/java/com/mongodb/hibernate/jdbc/MongoPreparedStatement.java # src/test/java/com/mongodb/hibernate/jdbc/MongoPreparedStatementTests.java

vbabanin added 4 commits October 28, 2025 10:21

Remove catch.

4317e2f

Use constants.

2b5be78

Remove accidental use of NO_ERROR_CODE.

40c75cf

Consolidate batch execution logic in one place.

91a88f1

Copilot AI reviewed Oct 28, 2025

View reviewed changes

Remove redundunt methods.

9435785

stIncMale requested changes Oct 28, 2025

View reviewed changes

vbabanin and others added 2 commits October 28, 2025 16:10

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

46d4682

Co-authored-by: Valentin Kovalenko <[email protected]>

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

afd8853

Co-authored-by: Valentin Kovalenko <[email protected]>

stIncMale requested changes Oct 29, 2025

View reviewed changes

stIncMale mentioned this pull request Oct 29, 2025

Convert SQLException's to Hibernate ORM exception's. #130

Merged

stIncMale requested changes Oct 29, 2025

View reviewed changes

vbabanin and others added 8 commits October 29, 2025 12:16

Apply suggestions from code review

18a18f7

Co-authored-by: Valentin Kovalenko <[email protected]>

Merge branch 'refs/heads/main' into HIBERNATE-40

9460bf2

# Conflicts: # src/main/java/com/mongodb/hibernate/jdbc/MongoStatement.java

Move inside try, do not start transactions too early

234921a

Remove SQLConstraintViolationException.

7a17cd5

Make visibility of WriteModelConverter and WriteModelsToCommandMapper…

5cfa2ff

… methods package-private.

use fully qualified class name in TODO for clarity.

c7f884f

Update src/main/java/com/mongodb/hibernate/jdbc/MongoPreparedStatemen…

9286eb7

…t.java Co-authored-by: Valentin Kovalenko <[email protected]>

Craete helper method for syntax error exceptions.

515a8ac

vbabanin requested a review from stIncMale October 30, 2025 20:48

stIncMale requested changes Oct 30, 2025

View reviewed changes

vbabanin and others added 4 commits October 30, 2025 16:04

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

355edfe

Co-authored-by: Valentin Kovalenko <[email protected]>

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

1409883

Co-authored-by: Valentin Kovalenko <[email protected]>

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

5e4503b

Co-authored-by: Valentin Kovalenko <[email protected]>

Change to SQLFeatureNotSupportedException.

0a3ec1a

stIncMale approved these changes Oct 30, 2025

View reviewed changes

vbabanin merged commit b8fb8b8 into main Oct 30, 2025
7 checks passed

vbabanin deleted the HIBERNATE-40 branch October 30, 2025 23:33

vbabanin restored the HIBERNATE-40 branch October 30, 2025 23:34

Introduce batch support. #136

Introduce batch support. #136

Uh oh!

Conversation

vbabanin commented Oct 17, 2025

Uh oh!

evergreen-ci-prod bot commented Oct 17, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

stIncMale commented Oct 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vbabanin Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

stIncMale left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stIncMale left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

stIncMale left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

stIncMale commented Oct 22, 2025 •

edited

Loading

vbabanin Oct 28, 2025 •

edited

Loading

stIncMale left a comment •

edited

Loading