This is an automated email from the ASF dual-hosted git repository.
NSAmelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new c2ea5e5b5e1 IGNITE-29245 Fix thin client
putAllConflict/removeAllConflict ignoring keepBinary on the server (#13781)
c2ea5e5b5e1 is described below
commit c2ea5e5b5e14e6dacd8c63b354b686654b20ddc6
Author: Nikita Amelchev <[email protected]>
AuthorDate: Tue Nov 3 15:16:27 2026 +0300
IGNITE-29245 Fix thin client putAllConflict/removeAllConflict ignoring
keepBinary on the server (#13781)
---
.../processors/cache/IgniteCacheProxy.java | 3 +-
.../platform/client/cache/ClientCacheRequest.java | 2 +-
.../ThinClientPutAllConflictKeepBinaryTest.java | 112 +++++++++++++++++++++
.../org/apache/ignite/client/ClientTestSuite.java | 2 +
4 files changed, 117 insertions(+), 2 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 32e5279e48f..4887bf9f4be 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -94,7 +94,8 @@ public interface IgniteCacheProxy<K, V> extends
IgniteCache<K, V>, Externalizabl
public IgniteCache<K, V> withApplicationAttributes(Map<String, String>
appAttrs);
/**
- * @return Internal proxy.
+ * @return Internal proxy with the operation context of the current
thread, not of this proxy:
+ * {@link #withKeepBinary()} and other {@code with*} methods applied
to this proxy are ignored.
*/
public GridCacheProxyImpl<K, V> internalProxy();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRequest.java
index 8966eecedc8..b9ec01cae5f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheRequest.java
@@ -85,7 +85,7 @@ public abstract class ClientCacheRequest extends
ClientRequest {
* @return Cache.
*/
protected IgniteInternalCache<?, ?> internalCache(ClientConnectionContext
ctx) {
- return ((IgniteCacheProxy<?, ?>)cache(ctx)).internalProxy();
+ return ((IgniteCacheProxy<?,
?>)rawCache(ctx)).internalProxy().keepBinary();
}
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPutAllConflictKeepBinaryTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPutAllConflictKeepBinaryTest.java
new file mode 100644
index 00000000000..809ae27d566
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPutAllConflictKeepBinaryTest.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.client.thin;
+
+import org.apache.ignite.binary.BinaryObject;
+import org.apache.ignite.client.IgniteClient;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import
org.apache.ignite.internal.processors.cache.CacheConflictResolutionManager;
+import org.apache.ignite.internal.processors.cache.CacheObjectValueContext;
+import org.apache.ignite.internal.processors.cache.GridCacheManagerAdapter;
+import
org.apache.ignite.internal.processors.cache.version.CacheVersionConflictResolver;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import
org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext;
+import
org.apache.ignite.internal.processors.cache.version.GridCacheVersionedEntryEx;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.T3;
+import org.apache.ignite.internal.util.typedef.internal.CU;
+import org.apache.ignite.plugin.AbstractTestPluginProvider;
+import org.apache.ignite.plugin.PluginContext;
+import org.junit.Test;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
+
+/**
+ * Conflict resolver must see values of thin client {@code putAllConflict} in
binary form: the value class may be
+ * absent on the destination cluster (CDC replication).
+ */
+public class ThinClientPutAllConflictKeepBinaryTest extends
AbstractThinClientTest {
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+ cfg.setCacheConfiguration(new
CacheConfiguration<>(DEFAULT_CACHE_NAME).setAtomicityMode(TRANSACTIONAL));
+
+ cfg.setPluginProviders(new AbstractTestPluginProvider() {
+ @Override public String name() {
+ return "ConflictResolverProvider";
+ }
+
+ @Override public <T> T createComponent(PluginContext ctx, Class<T>
cls) {
+ return cls == CacheConflictResolutionManager.class ? (T)new
TestConflictResolver<>() : null;
+ }
+ });
+
+ return cfg;
+ }
+
+ /** */
+ @Test
+ public void testKeepBinary() throws Exception {
+ startGrid(0);
+
+ try (IgniteClient client = startClient(0)) {
+ TcpClientCache<Object, Object> cache =
+ (TcpClientCache<Object,
Object>)client.cache(DEFAULT_CACHE_NAME).withKeepBinary();
+
+ BinaryObject val =
client.binary().builder("org.apache.ignite.MissingOnServer").setField("f",
1).build();
+
+ cache.putAllConflict(F.asMap(1, new T3<>(val, new
GridCacheVersion(1, 1, 1, 2), CU.EXPIRE_TIME_ETERNAL)));
+ }
+
+ TestConflictResolver<?, ?> rslvr =
+ (TestConflictResolver<?,
?>)grid(0).cachex(DEFAULT_CACHE_NAME).context().conflictResolver();
+
+ assertTrue(String.valueOf(rslvr.seenVal), rslvr.seenVal instanceof
BinaryObject);
+ }
+
+ /** */
+ private static class TestConflictResolver<K, V> extends
GridCacheManagerAdapter<K, V>
+ implements CacheConflictResolutionManager<K, V>,
CacheVersionConflictResolver {
+ /** Value of the last resolved entry. */
+ private volatile Object seenVal;
+
+ /** {@inheritDoc} */
+ @Override public CacheVersionConflictResolver conflictResolver() {
+ return this;
+ }
+
+ /** {@inheritDoc} */
+ @Override public <K1, V1> GridCacheVersionConflictContext<K1, V1>
resolve(
+ CacheObjectValueContext ctx,
+ GridCacheVersionedEntryEx<K1, V1> oldEntry,
+ GridCacheVersionedEntryEx<K1, V1> newEntry,
+ boolean atomicVerComparator
+ ) {
+ seenVal = newEntry.value(ctx);
+
+ GridCacheVersionConflictContext<K1, V1> res =
+ new GridCacheVersionConflictContext<>(ctx, oldEntry, newEntry);
+
+ res.useNew();
+
+ return res;
+ }
+ }
+}
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/client/ClientTestSuite.java
b/modules/indexing/src/test/java/org/apache/ignite/client/ClientTestSuite.java
index 58264b64be7..97021b7896e 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/client/ClientTestSuite.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/client/ClientTestSuite.java
@@ -51,6 +51,7 @@ import
org.apache.ignite.internal.client.thin.ThinClientPartitionAwarenessMultiD
import
org.apache.ignite.internal.client.thin.ThinClientPartitionAwarenessResourceReleaseTest;
import
org.apache.ignite.internal.client.thin.ThinClientPartitionAwarenessStableTopologyTest;
import
org.apache.ignite.internal.client.thin.ThinClientPartitionAwarenessUnstableTopologyTest;
+import
org.apache.ignite.internal.client.thin.ThinClientPutAllConflictKeepBinaryTest;
import org.apache.ignite.internal.client.thin.TimeoutTest;
import
org.apache.ignite.internal.client.thin.events.IgniteClientConnectionEventListenerTest;
import
org.apache.ignite.internal.client.thin.events.IgniteClientLifecycleEventListenerTest;
@@ -100,6 +101,7 @@ import org.junit.runners.Suite;
BinaryConfigurationTest.class,
IgniteSetTest.class,
DataReplicationOperationsTest.class,
+ ThinClientPutAllConflictKeepBinaryTest.class,
MetadataRegistrationTest.class,
IgniteClientConnectionEventListenerTest.class,
IgniteClientRequestEventListenerTest.class,