IGNITE-28737 Calcite. CacheOperationContext with keepBinary = true need to be used during dml operations by zstan · Pull Request #13198 · apache/ignite

zstan · 2026-06-01T14:43:15Z

No description provided.

zstan · 2026-06-01T14:43:29Z

No diff are found:

PR:
Benchmark                              (engine)  Mode  Cnt    Score    Error  Units
JmhSqlInsertBenchmark.sqlBatchInsert         H2  avgt   10  318.685 ±  9.853  us/op
JmhSqlInsertBenchmark.sqlBatchInsert    CALCITE  avgt   10  257.238 ± 10.517  us/op
JmhSqlInsertBenchmark.sqlSimpleInsert        H2  avgt   10  155.345 ±  5.747  us/op
JmhSqlInsertBenchmark.sqlSimpleInsert   CALCITE  avgt   10  224.764 ± 14.185  us/op

Benchmark                              (engine)  Mode  Cnt    Score    Error  Units
JmhSqlInsertBenchmark.sqlBatchInsert         H2  avgt   10  328.143 ± 15.095  us/op
JmhSqlInsertBenchmark.sqlBatchInsert    CALCITE  avgt   10  255.619 ± 13.665  us/op
JmhSqlInsertBenchmark.sqlSimpleInsert        H2  avgt   10  155.137 ±  5.734  us/op
JmhSqlInsertBenchmark.sqlSimpleInsert   CALCITE  avgt   10  221.011 ±  9.267  us/op

master:
Benchmark                              (engine)  Mode  Cnt    Score    Error  Units
JmhSqlInsertBenchmark.sqlBatchInsert         H2  avgt   10  320.868 ± 23.729  us/op
JmhSqlInsertBenchmark.sqlBatchInsert    CALCITE  avgt   10  254.849 ±  9.252  us/op
JmhSqlInsertBenchmark.sqlSimpleInsert        H2  avgt   10  155.123 ±  7.118  us/op
JmhSqlInsertBenchmark.sqlSimpleInsert   CALCITE  avgt   10  225.755 ± 11.280  us/op

JmhSqlInsertBenchmark.sqlBatchInsert         H2  avgt   10  313.485 ± 16.779  us/op
JmhSqlInsertBenchmark.sqlBatchInsert    CALCITE  avgt   10  259.445 ± 19.988  us/op
JmhSqlInsertBenchmark.sqlSimpleInsert        H2  avgt   10  156.609 ±  7.658  us/op
JmhSqlInsertBenchmark.sqlSimpleInsert   CALCITE  avgt   10  222.638 ± 11.634  us/op

ignitetcbot · 2026-06-03T08:12:14Z

TCBot Test Analysis

TeamCity: --> Run :: All Results
Branch: pull/13198/head
Base: master
Tested commit: 220ffe3

Possible Blockers (0)

No blockers found.

New Tests (1)

Calcite SQL 3: 1 tests
- IgniteCalciteTestSuite3: PublicApiIntegrationTest.testSimpleInsert - PASSED

…ed to be used during dml operations

This reverts commit 7ebc93a.

ignitetcbot · 2026-06-04T05:17:20Z

TCBot Test Analysis

TeamCity: --> Run :: All Results
Branch: pull/13198/head
Base: master
Tested commit: 36d3122

Possible Blockers (0)

No blockers found.

New Tests (2)

Calcite SQL 3: 2 tests
- IgniteCalciteTestSuite3: PublicApiIntegrationTest.testTxInsert - PASSED
- IgniteCalciteTestSuite3: PublicApiIntegrationTest.testSimpleInsert - PASSED

Copilot

Pull request overview

This PR targets Calcite DML execution with keepBinary=true, aiming to avoid unnecessary binary deserialization (especially around entry-processor-based DML) and to add coverage ensuring DML works via the public IgniteCache API in both regular and transactional modes.

Changes:

Adjust keepBinary handling for entry-processor/invoke results in several DHT/atomic update code paths.
Add a new Calcite integration test (PublicApiIntegrationTest) and include it in the Calcite IntegrationTestSuite.
Add Calcite-side utility helpers for forcing/restoring CacheOperationContext keep-binary mode; plus minor build/benchmark updates.

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java	Tweaks keep-binary behavior when recording entry-processor results during tx prepare.
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java	Adjusts binary unwrapping behavior for atomic update completion (TRANSFORM path).
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java	Changes how keep-binary is applied when adding computed entry-processor results.
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/util/Commons.java	Adds helpers to force/restore keep-binary `CacheOperationContext` for Calcite operations.
modules/calcite/src/test/java/org/apache/ignite/testsuites/IntegrationTestSuite.java	Registers the new public API integration test in the Calcite suite.
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/PublicApiIntegrationTest.java	New test covering DML via `IgniteCache` with and without `withKeepBinary()`, including tx case.
modules/calcite/pom.xml	Removes direct `checker-qual` dependency/property.
modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sql/JmhSqlUdfBenchmark.java	Adds standard class-level JMH annotations.
modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sql/JmhSqlSortBenchmark.java	Adds standard class-level JMH annotations.
modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sql/JmhSqlSetOpBenchmark.java	Adds standard class-level JMH annotations.
modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sql/JmhSqlScanBenchmark.java	Adds standard class-level JMH annotations.
modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sql/JmhSqlDmlBenchmark.java	Adds standard class-level JMH annotations.
modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sql/JmhSqlCorrelateBenchmark.java	Adds standard class-level JMH annotations.
modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sql/JmhSqlAggBenchmark.java	Adds standard class-level JMH annotations.
modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/sql/JmhSqlInsertBenchmark.java	New JMH benchmark comparing SQL insert APIs.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+    private void runQuery(int begin, int end, boolean transactional, IgniteCache<?, ?> cache) {
+        Transaction tx = null;
+
+        cache.query(new SqlFieldsQuery("CREATE TABLE IF NOT EXISTS emp(empid INTEGER, deptid INTEGER, name VARCHAR, salary INTEGER, " +
+            "PRIMARY KEY(empid, deptid)) WITH \"AFFINITY_KEY=deptid" + (transactional ? ", ATOMICITY=transactional" : "") + "\""));
+
+        if (transactional) {
+            //noinspection resource
+            tx = client.transactions().txStart(PESSIMISTIC, READ_COMMITTED);
+        }
+
+        for (int i = begin; i < end; i++) {
+            cache.query(new SqlFieldsQuery("INSERT INTO emp (empid, deptid, name, salary) VALUES (?, ?, ?, ?)").setArgs(
+                i, i % 2, "Employee " + i, i / 10));
+
+            cache.query(new SqlFieldsQuery("UPDATE emp SET name = '' WHERE empid = ? AND deptid = ?").setArgs(i, i % 2));
+            cache.query(new SqlFieldsQuery("DELETE FROM emp WHERE empid = ?").setArgs(i - 1)).getAll();
+        }
+
+        if (transactional)
+            tx.commit();
+    }


+    public static CacheOperationContext setKeepBinaryContext(GridCacheContext<?, ?> cctx) {
+        CacheOperationContext opCtx = cctx.operationContextPerCall();
+
+        // Force keepBinary for operation context to avoid binary deserialization inside entry processor
+        CacheOperationContext newOpCtx = null;
+
+        if (opCtx == null)
+            // Mimics behavior of GridCacheAdapter#keepBinary and GridCacheProxyImpl#keepBinary
+            newOpCtx = new CacheOperationContext(false, false, true, null, false, null, false, null, null);
+        else if (!opCtx.isKeepBinary())
+            newOpCtx = opCtx.keepBinary();
+
+        if (newOpCtx != null)
+            cctx.operationContextPerCall(newOpCtx);
+
+        return opCtx;
+    }


                        retVal.addEntryProcessResult(ctx,
                            k,
                            null,
                            compRes.get1(),
                            compRes.get2(),
-                            req.keepBinary());
+                            true);


zstan force-pushed the ignite-28737 branch 2 times, most recently from 7d05287 to 765fa5d Compare June 1, 2026 15:13

zstan force-pushed the ignite-28737 branch from c2c3b81 to 46faf6a Compare June 3, 2026 08:41

zstan added 6 commits June 3, 2026 12:58

IGNITE-28737 Calcite. CacheOperationContext with keepBinary = true ne…

540c0f0

…ed to be used during dml operations

check

7963f97

Revert "check"

1974807

This reverts commit 7ebc93a.

check2

0d14729

check3

351ae4d

check4

36d3122

zstan force-pushed the ignite-28737 branch from 46faf6a to 36d3122 Compare June 3, 2026 09:58

zstan requested a review from Copilot June 4, 2026 05:35

Copilot started reviewing on behalf of zstan June 4, 2026 05:35 View session

Copilot AI reviewed Jun 4, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

IGNITE-28737 Calcite. CacheOperationContext with keepBinary = true need to be used during dml operations#13198

IGNITE-28737 Calcite. CacheOperationContext with keepBinary = true need to be used during dml operations#13198
zstan wants to merge 6 commits into
apache:masterfrom
zstan:ignite-28737

zstan commented Jun 1, 2026

Uh oh!

zstan commented Jun 1, 2026 •

edited

Loading

Uh oh!

ignitetcbot commented Jun 3, 2026

Uh oh!

ignitetcbot commented Jun 4, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

zstan commented Jun 1, 2026

Uh oh!

zstan commented Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ignitetcbot commented Jun 3, 2026

TCBot Test Analysis

Possible Blockers (0)

New Tests (1)

Uh oh!

ignitetcbot commented Jun 4, 2026

TCBot Test Analysis

Possible Blockers (0)

New Tests (2)

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

zstan commented Jun 1, 2026 •

edited

Loading