This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git.
from 99ac71d IGNITE-12650 Mark MVCC with @IgniteExperimental - Fixes #7419.
add f32b44d IGNITE-12590: Fix (remove) check KEY at the MERGE command
(#7321)
No new revisions were added by this update.
Summary of changes:
modules/clients/pom.xml | 8 +
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 2 +
.../ignite/jdbc/thin/JdbcThinSqlMergeTest.java | 82 +++++++++
.../internal/processors/query/h2/QueryParser.java | 15 +-
.../processors/query/h2/dml/UpdatePlanBuilder.java | 40 ++--
.../processors/query/h2/sql/GridSqlMerge.java | 24 ---
.../query/h2/sql/GridSqlQueryParser.java | 50 ++---
.../query/h2/sql/GridSqlQuerySplitter.java | 16 +-
.../cache/IgniteCacheMergeSqlQueryFailingTest.java | 68 +++++++
.../query/SqlMergeOnClientNodeTest.java} | 22 ++-
.../internal/processors/query/SqlMergeTest.java | 201 +++++++++++++++++++++
.../query/h2/sql/GridQueryParsingTest.java | 63 +------
.../IgniteBinaryCacheQueryTestSuite.java | 9 +-
13 files changed, 456 insertions(+), 144 deletions(-)
create mode 100644
modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSqlMergeTest.java
create mode 100644
modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheMergeSqlQueryFailingTest.java
copy
modules/{core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerClientSelfTest.java
=>
indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlMergeOnClientNodeTest.java}
(71%)
create mode 100644
modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlMergeTest.java
