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 91DF8200CEC for ; Mon, 21 Aug 2017 10:40:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 909C81649DF; Mon, 21 Aug 2017 08:40:14 +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 58B3A1649F3 for ; Mon, 21 Aug 2017 10:40:13 +0200 (CEST) Received: (qmail 47141 invoked by uid 500); 21 Aug 2017 08:40:12 -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 46308 invoked by uid 99); 21 Aug 2017 08:40:11 -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; Mon, 21 Aug 2017 08:40:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A2ADDF5EEA; Mon, 21 Aug 2017 08:40:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 21 Aug 2017 08:40:24 -0000 Message-Id: In-Reply-To: <797ca5b90420447582a4ed139fb80aae@git.apache.org> References: <797ca5b90420447582a4ed139fb80aae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/50] [abbrv] ignite git commit: IGNITE-6073 Handy API to add binary metadata locally archived-at: Mon, 21 Aug 2017 08:40:14 -0000 IGNITE-6073 Handy API to add binary metadata locally Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bfb4c21d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bfb4c21d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bfb4c21d Branch: refs/heads/ignite-5578 Commit: bfb4c21de992af5f8975d0f3d8f97cf4d5c93bed Parents: df2fb8c Author: Sergey Chugunov Authored: Wed Aug 16 17:12:27 2017 +0300 Committer: Alexey Goncharuk Committed: Wed Aug 16 17:12:27 2017 +0300 ---------------------------------------------------------------------- .../binary/CacheObjectBinaryProcessor.java | 20 ++++++++++++++++---- .../binary/CacheObjectBinaryProcessorImpl.java | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/bfb4c21d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java index 4d285ab..14dd5cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessor.java @@ -19,13 +19,13 @@ package org.apache.ignite.internal.processors.cache.binary; import java.util.Collection; import java.util.Map; -import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteBinary; -import org.apache.ignite.internal.binary.BinaryFieldMetadata; -import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; +import org.apache.ignite.IgniteException; +import org.apache.ignite.binary.BinaryObject; import org.apache.ignite.binary.BinaryObjectBuilder; import org.apache.ignite.binary.BinaryType; -import org.apache.ignite.binary.BinaryObject; +import org.apache.ignite.internal.binary.BinaryFieldMetadata; +import org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessor; import org.jetbrains.annotations.Nullable; /** @@ -54,6 +54,18 @@ public interface CacheObjectBinaryProcessor extends IgniteCacheObjectProcessor { public void addMeta(int typeId, final BinaryType newMeta) throws IgniteException; /** + * Adds metadata locally without triggering discovery exchange. + * + * Must be used only during startup and only if it is guaranteed that all nodes have the same copy + * of BinaryType. + * + * @param typeId Type ID. + * @param newMeta New meta data. + * @throws IgniteException In case of error. + */ + public void addMetaLocally(int typeId, final BinaryType newMeta) throws IgniteException; + + /** * @param typeId Type ID. * @param typeName Type name. * @param affKeyFieldName Affinity key field name. http://git-wip-us.apache.org/repos/asf/ignite/blob/bfb4c21d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index 6a1b6dc..16d9fd0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.binary; import java.io.Serializable; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -443,6 +442,22 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm } /** {@inheritDoc} */ + @Override public void addMetaLocally(int typeId, BinaryType newMeta) throws BinaryObjectException { + assert newMeta != null; + assert newMeta instanceof BinaryTypeImpl; + + BinaryMetadata newMeta0 = ((BinaryTypeImpl)newMeta).metadata(); + + BinaryMetadataHolder metaHolder = metadataLocCache.get(typeId); + + BinaryMetadata oldMeta = metaHolder != null ? metaHolder.metadata() : null; + + BinaryMetadata mergedMeta = BinaryUtils.mergeMetadata(oldMeta, newMeta0); + + metadataLocCache.put(typeId, new BinaryMetadataHolder(mergedMeta, 0, 0)); + } + + /** {@inheritDoc} */ @Nullable @Override public BinaryType metadata(final int typeId) { BinaryMetadata meta = metadata0(typeId);