Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 68C7A200B7E for ; Tue, 6 Sep 2016 16:39:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 679AD160AD2; Tue, 6 Sep 2016 14:39:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CB247160AD8 for ; Tue, 6 Sep 2016 16:39:26 +0200 (CEST) Received: (qmail 5069 invoked by uid 500); 6 Sep 2016 14:39:26 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 3942 invoked by uid 99); 6 Sep 2016 14:39:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Sep 2016 14:39:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 21652E058E; Tue, 6 Sep 2016 14:39:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Tue, 06 Sep 2016 14:39:54 -0000 Message-Id: <805b44088b1946a792dacd041bb28ec3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [32/50] [abbrv] ignite git commit: IGNITE-3455: Entry placed on C++ side is not found on Java side archived-at: Tue, 06 Sep 2016 14:39:28 -0000 IGNITE-3455: Entry placed on C++ side is not found on Java side Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84e83c96 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84e83c96 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84e83c96 Branch: refs/heads/ignite-1.5.31-1 Commit: 84e83c96127a06f9d6b2ccc68d23db8f6dc089b1 Parents: 4897315 Author: Denis Magda Authored: Mon Jul 18 15:21:46 2016 +0300 Committer: Denis Magda Committed: Mon Jul 18 15:21:46 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/binary/BinaryContext.java | 6 ++- .../binary/BinaryMarshallerSelfTest.java | 41 ++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/84e83c96/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java ---------------------------------------------------------------------- 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 27e9440..d78c126 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 @@ -1127,13 +1127,17 @@ public class BinaryContext { mapper, serializer, true, - false + true ); fieldsMeta = desc.fieldsMeta(); schemas = desc.schema() != null ? Collections.singleton(desc.schema()) : null; descByCls.put(cls, desc); + + // Registering in order to support the interoperability between Java, C++ and .Net. + // https://issues.apache.org/jira/browse/IGNITE-3455 + predefinedTypes.put(id, desc); } metaHnd.addMeta(id, new BinaryMetadata(id, typeName, fieldsMeta, affKeyFieldName, schemas, isEnum).wrap(this)); http://git-wip-us.apache.org/repos/asf/ignite/blob/84e83c96/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java index a504650..b3058de 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java @@ -1798,6 +1798,47 @@ public class BinaryMarshallerSelfTest extends GridCommonAbstractTest { /** * @throws Exception If failed. */ + public void testCustomTypeRegistration() throws Exception { + BinaryTypeConfiguration customType = new BinaryTypeConfiguration(Value.class.getName()); + + BinaryMarshaller marsh = binaryMarshaller(Arrays.asList(customType)); + + BinaryContext ctx = binaryContext(marsh); + + int typeId = ctx.typeId(Value.class.getName()); + + BinaryClassDescriptor descriptor = ctx.descriptorForTypeId(true, typeId, null, false); + + assertEquals(Value.class, descriptor.describedClass()); + assertEquals(true, descriptor.registered()); + assertEquals(true, descriptor.userType()); + + // Custom explicit types must be registered in 'predefinedTypes' in order not to break the interoperability. + Field field = ctx.getClass().getDeclaredField("predefinedTypes"); + + field.setAccessible(true); + + Map map = (Map)field.get(ctx); + + assertTrue(map.size() > 0); + + assertNotNull(map.get(typeId)); + + // Custom explicit types must NOT be registered in 'predefinedTypeNames'. + field = ctx.getClass().getDeclaredField("predefinedTypeNames"); + + field.setAccessible(true); + + Map map2 = (Map)field.get(ctx); + + assertTrue(map2.size() > 0); + + assertNull(map2.get(ctx.userTypeName(Value.class.getName()))); + } + + /** + * @throws Exception If failed. + */ public void testFieldIdMapping() throws Exception { BinaryTypeConfiguration customType1 = new BinaryTypeConfiguration(Value.class.getName());