[ignite] branch master updated: IGNITE-13135 Fix CacheRegisterMetadataLocallyTest.testClientFindsValueByAffinityKeyStaticCacheWithoutExtraRequest - Fixes #7914.

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alexpl 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 35feee3  IGNITE-13135 Fix CacheRegisterMetadataLocallyTest.testClientFindsValueByAffinityKeyStaticCacheWithoutExtraRequest - Fixes #7914.
35feee3 is described below

commit 35feee3a34bb9da807456eefba9b3ca7ab965766
Author: Aleksey Plekhanov <pl...@gmail.com>
AuthorDate: Tue Jun 16 16:21:53 2020 +0500

    IGNITE-13135 Fix CacheRegisterMetadataLocallyTest.testClientFindsValueByAffinityKeyStaticCacheWithoutExtraRequest - Fixes #7914.
    
    Signed-off-by: Aleksey Plekhanov <pl...@gmail.com>
---
 .../java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java | 4 ++--
 .../main/java/org/apache/ignite/internal/binary/BinaryContext.java    | 4 ++--
 .../internal/processors/cache/CacheRegisterMetadataLocallyTest.java   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index 2cacd66..732c4c5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -950,13 +950,13 @@ public class BinaryClassDescriptor {
     /**
      * @return Instance of {@link BinaryMetadata} for this type.
      */
-    BinaryMetadata metadata() {
+    BinaryMetadata metadata(boolean includeSchema) {
         return new BinaryMetadata(
             typeId,
             typeName,
             stableFieldsMeta,
             affKeyFieldName,
-            stableSchema == null ? null : Collections.singleton(stableSchema),
+            includeSchema ? (stableSchema == null ? null : Collections.singleton(stableSchema)) : null,
             isEnum(),
             cls.isEnum() ? enumMap(cls) : null);
     }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 90ab4a8..6379174 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -838,9 +838,9 @@ public class BinaryContext {
 
             if (registerMeta) {
                 if (onlyLocReg)
-                    metaHnd.addMetaLocally(typeId, regDesc.metadata().wrap(this), false);
+                    metaHnd.addMetaLocally(typeId, regDesc.metadata(false).wrap(this), false);
                 else
-                    metaHnd.addMeta(typeId, regDesc.metadata().wrap(this), false);
+                    metaHnd.addMeta(typeId, regDesc.metadata(true).wrap(this), false);
             }
 
             descByCls.put(cls, regDesc);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java
index f254497..65d6a75 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRegisterMetadataLocallyTest.java
@@ -238,7 +238,7 @@ public class CacheRegisterMetadataLocallyTest extends GridCommonAbstractTest {
      */
     private void assertCommunicationMessages() {
         communicationMessages.forEach(cm ->
-            assertFalse(cm.toString(), cm instanceof MetadataRequestMessage || cm instanceof MetadataResponseMessage)
+            assertFalse(cm.getClass().getName(), cm instanceof MetadataRequestMessage || cm instanceof MetadataResponseMessage)
         );
     }