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 577E9200CCD for ; Fri, 16 Jun 2017 11:42:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 565AD160BF8; Fri, 16 Jun 2017 09:42:01 +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 C7A9C160BFD for ; Fri, 16 Jun 2017 11:41:59 +0200 (CEST) Received: (qmail 70342 invoked by uid 500); 16 Jun 2017 09:41:59 -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 70145 invoked by uid 99); 16 Jun 2017 09:41:58 -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; Fri, 16 Jun 2017 09:41:58 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 767FBF468E; Fri, 16 Jun 2017 09:41:57 +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: Fri, 16 Jun 2017 09:42:12 -0000 Message-Id: <70a6d95fcf04473fb46216aacb2d301d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/50] ignite git commit: Fixed JavaDoc warnings. archived-at: Fri, 16 Jun 2017 09:42:01 -0000 Fixed JavaDoc warnings. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40223ae1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40223ae1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/40223ae1 Branch: refs/heads/ignite-5267-1 Commit: 40223ae120afe2efc225939dc6c0b27360272e35 Parents: b7107f7 Author: devozerov Authored: Thu Jun 15 17:44:31 2017 +0300 Committer: devozerov Committed: Thu Jun 15 17:44:31 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheSharedContext.java | 4 +++- .../cache/IgniteCacheOffheapManagerImpl.java | 16 ++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/40223ae1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index 0ee0020..6ba8c20 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -35,11 +35,13 @@ import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.managers.communication.GridIoManager; import org.apache.ignite.internal.managers.deployment.GridDeploymentManager; +import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; import org.apache.ignite.internal.pagemem.store.IgnitePageStoreManager; import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture; import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheSnapshotManager; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology; @@ -734,7 +736,7 @@ public class GridCacheSharedContext { /** * Captures all ongoing operations that we need to wait before we can proceed to the next topology version. * This method must be called only after - * {@link GridDhtPartitionTopology#updateTopologyVersion(GridDhtPartitionExchangeId, GridDhtPartitionsExchangeFuture, long, boolean)} + * {@link GridDhtPartitionTopology#updateTopologyVersion(GridDhtTopologyFuture, DiscoCache, long, boolean)} * method is called so that all new updates will wait to switch to the new version. * This method will capture: *
    http://git-wip-us.apache.org/repos/asf/ignite/blob/40223ae1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index b9afad8..74863f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -2168,7 +2168,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager super(T_DATA_REF_INNER, ver, true, 12); } - /** {@inheritDoc} */ + @Override public int getCacheId(long pageAddr, int idx) { return UNDEFINED_CACHE_ID; } @@ -2195,7 +2195,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager super(T_DATA_REF_LEAF, ver, 12); } - /** {@inheritDoc} */ + @Override public int getCacheId(long pageAddr, int idx) { return UNDEFINED_CACHE_ID; } @@ -2222,7 +2222,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager super(T_CACHE_ID_AWARE_DATA_REF_INNER, ver, true, 16); } - /** {@inheritDoc} */ + @Override public int getCacheId(long pageAddr, int idx) { return PageUtils.getInt(pageAddr, offset(idx) + 12); } @@ -2249,7 +2249,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager super(T_CACHE_ID_AWARE_DATA_REF_LEAF, ver, 16); } - /** {@inheritDoc} */ + @Override public int getCacheId(long pageAddr, int idx) { return PageUtils.getInt(pageAddr, offset(idx) + 12); } @@ -2600,7 +2600,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager super(T_PENDING_REF_INNER, ver, true, 16); } - /** {@inheritDoc} */ + @Override public int getCacheId(long pageAddr, int idx) { return UNDEFINED_CACHE_ID; } @@ -2627,7 +2627,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager super(T_PENDING_REF_LEAF, ver, 16); } - /** {@inheritDoc} */ + @Override public int getCacheId(long pageAddr, int idx) { return UNDEFINED_CACHE_ID; } @@ -2654,7 +2654,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager super(T_CACHE_ID_AWARE_PENDING_REF_INNER, ver, true, 20); } - /** {@inheritDoc} */ + @Override public int getCacheId(long pageAddr, int idx) { return PageUtils.getInt(pageAddr, offset(idx) + 16); } @@ -2681,7 +2681,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager super(T_CACHE_ID_AWARE_PENDING_REF_LEAF, ver, 20); } - /** {@inheritDoc} */ + @Override public int getCacheId(long pageAddr, int idx) { return PageUtils.getInt(pageAddr, offset(idx) + 16); }