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 BD847200CC5 for ; Tue, 11 Jul 2017 11:03:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BBFBE165740; Tue, 11 Jul 2017 09:03:03 +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 CB968165714 for ; Tue, 11 Jul 2017 11:03:01 +0200 (CEST) Received: (qmail 99585 invoked by uid 500); 11 Jul 2017 09:03:01 -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 99496 invoked by uid 99); 11 Jul 2017 09:03:00 -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, 11 Jul 2017 09:03:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C2083F552D; Tue, 11 Jul 2017 09:02:59 +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, 11 Jul 2017 09:03:20 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [22/49] ignite git commit: ignite-2.1 Minor. archived-at: Tue, 11 Jul 2017 09:03:03 -0000 ignite-2.1 Minor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5c2ec5a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5c2ec5a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5c2ec5a Branch: refs/heads/ignite-2.1 Commit: e5c2ec5a62c0d5fc268275ea9277f6933a582966 Parents: 993f7fb Author: Alexey Kuznetsov Authored: Fri Jul 7 23:06:52 2017 +0700 Committer: Alexey Kuznetsov Committed: Fri Jul 7 23:06:52 2017 +0700 ---------------------------------------------------------------------- .../ignite/internal/visor/cache/VisorCacheMetrics.java | 12 ++---------- .../visor/node/VisorMemoryPolicyConfiguration.java | 11 ++--------- .../src/main/resources/META-INF/classnames.properties | 11 +++++++++-- 3 files changed, 13 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c2ec5a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java index d99e0c9..5d8bc81 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetrics.java @@ -639,11 +639,6 @@ public class VisorCacheMetrics extends VisorDataTransferObject { } /** {@inheritDoc} */ - @Override public byte getProtocolVersion() { - return V2; - } - - /** {@inheritDoc} */ @Override protected void writeExternalData(ObjectOutput out) throws IOException { U.writeString(out, name); U.writeEnum(out, mode); @@ -690,6 +685,7 @@ public class VisorCacheMetrics extends VisorDataTransferObject { out.writeLong(heapEntriesCnt); out.writeLong(offHeapAllocatedSize); out.writeLong(offHeapEntriesCnt); + out.writeLong(offHeapPrimaryEntriesCnt); out.writeInt(totalPartsCnt); out.writeInt(rebalancingPartsCnt); @@ -698,8 +694,6 @@ public class VisorCacheMetrics extends VisorDataTransferObject { out.writeLong(rebalancingBytesRate); out.writeObject(qryMetrics); - - out.writeLong(offHeapPrimaryEntriesCnt); } /** {@inheritDoc} */ @@ -748,6 +742,7 @@ public class VisorCacheMetrics extends VisorDataTransferObject { heapEntriesCnt = in.readLong(); offHeapAllocatedSize = in.readLong(); offHeapEntriesCnt = in.readLong(); + offHeapPrimaryEntriesCnt = in.readLong(); totalPartsCnt = in.readInt(); rebalancingPartsCnt = in.readInt(); @@ -756,9 +751,6 @@ public class VisorCacheMetrics extends VisorDataTransferObject { rebalancingBytesRate = in.readLong(); qryMetrics = (VisorQueryMetrics)in.readObject(); - - if (protoVer >= V2) - offHeapPrimaryEntriesCnt = in.readLong(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c2ec5a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java index d3153a6..bed4c4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMemoryPolicyConfiguration.java @@ -131,32 +131,25 @@ public class VisorMemoryPolicyConfiguration extends VisorDataTransferObject { } /** {@inheritDoc} */ - @Override public byte getProtocolVersion() { - return V2; - } - - /** {@inheritDoc} */ @Override protected void writeExternalData(ObjectOutput out) throws IOException { U.writeString(out, name); + out.writeLong(initSize); out.writeLong(maxSize); U.writeString(out, swapFilePath); U.writeEnum(out, pageEvictionMode); out.writeDouble(evictionThreshold); out.writeInt(emptyPagesPoolSize); - out.writeLong(initSize); } /** {@inheritDoc} */ @Override protected void readExternalData(byte protoVer, ObjectInput in) throws IOException, ClassNotFoundException { name = U.readString(in); + initSize = in.readLong(); maxSize = in.readLong(); swapFilePath = U.readString(in); pageEvictionMode = DataPageEvictionMode.fromOrdinal(in.readByte()); evictionThreshold = in.readDouble(); emptyPagesPoolSize = in.readInt(); - - if (protoVer >= V2) - initSize = in.readLong(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/e5c2ec5a/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index 1528040..e34a772 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -155,6 +155,7 @@ org.apache.ignite.events.EventAdapter org.apache.ignite.events.IgfsEvent org.apache.ignite.events.JobEvent org.apache.ignite.events.TaskEvent +org.apache.ignite.events.WalSegmentArchivedEvent org.apache.ignite.hadoop.HadoopInputSplit org.apache.ignite.hadoop.HadoopMapReducePlan org.apache.ignite.igfs.IgfsConcurrentModificationException @@ -337,6 +338,7 @@ org.apache.ignite.internal.marshaller.optimized.OptimizedFieldType org.apache.ignite.internal.mem.IgniteOutOfMemoryException org.apache.ignite.internal.pagemem.impl.PageMemoryNoStoreImpl$Segment org.apache.ignite.internal.pagemem.snapshot.FinishSnapshotOperationAckDiscoveryMessage +org.apache.ignite.internal.pagemem.snapshot.SnapshotCheckParameters org.apache.ignite.internal.pagemem.snapshot.SnapshotOperation org.apache.ignite.internal.pagemem.snapshot.SnapshotOperationType org.apache.ignite.internal.pagemem.snapshot.StartSnapshotOperationAckDiscoveryMessage @@ -407,11 +409,9 @@ org.apache.ignite.internal.processors.cache.CacheType org.apache.ignite.internal.processors.cache.CacheWeakQueryIteratorsHolder$WeakQueryCloseableIterator org.apache.ignite.internal.processors.cache.CacheWeakQueryIteratorsHolder$WeakQueryFutureIterator org.apache.ignite.internal.processors.cache.CacheWeakQueryIteratorsHolder$WeakReferenceCloseableIterator -org.apache.ignite.internal.processors.cache.ChangeGlobalStateMessage org.apache.ignite.internal.processors.cache.ClientCacheChangeDiscoveryMessage org.apache.ignite.internal.processors.cache.ClientCacheChangeDummyDiscoveryMessage org.apache.ignite.internal.processors.cache.ClusterCachesInfo$1$1 -org.apache.ignite.internal.processors.cache.ClusterState org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch org.apache.ignite.internal.processors.cache.DynamicCacheChangeRequest org.apache.ignite.internal.processors.cache.EntryProcessorResourceInjectorProxy @@ -880,10 +880,12 @@ org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree$Bool org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree$DestroyBag org.apache.ignite.internal.processors.cache.persistence.tree.BPlusTree$Result org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO$EntryPart +org.apache.ignite.internal.processors.cache.persistence.wal.AbstractWalRecordsIterator org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager$FileArchiver$1 org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager$RecordsIterator org.apache.ignite.internal.processors.cache.persistence.wal.SegmentEofException org.apache.ignite.internal.processors.cache.persistence.wal.crc.IgniteDataIntegrityViolationException +org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneWalRecordsIterator org.apache.ignite.internal.processors.cache.query.CacheQueryType org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$1 org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryManager$1 @@ -1032,9 +1034,13 @@ org.apache.ignite.internal.processors.closure.GridClosureProcessor$T8 org.apache.ignite.internal.processors.closure.GridClosureProcessor$T9 org.apache.ignite.internal.processors.closure.GridClosureProcessor$TaskNoReduceAdapter org.apache.ignite.internal.processors.closure.GridPeerDeployAwareTaskAdapter +org.apache.ignite.internal.processors.cluster.ChangeGlobalStateFinishMessage +org.apache.ignite.internal.processors.cluster.ChangeGlobalStateMessage org.apache.ignite.internal.processors.cluster.ClusterProcessor$3 org.apache.ignite.internal.processors.cluster.ClusterProcessor$3$1 +org.apache.ignite.internal.processors.cluster.DiscoveryDataClusterState org.apache.ignite.internal.processors.cluster.GridClusterStateProcessor$1$1 +org.apache.ignite.internal.processors.cluster.GridClusterStateProcessor$2 org.apache.ignite.internal.processors.cluster.GridClusterStateProcessor$3 org.apache.ignite.internal.processors.cluster.GridClusterStateProcessor$4 org.apache.ignite.internal.processors.cluster.GridClusterStateProcessor$6 @@ -1876,6 +1882,7 @@ org.apache.ignite.internal.visor.node.VisorNodeSuppressedErrorsTask org.apache.ignite.internal.visor.node.VisorNodeSuppressedErrorsTask$VisorNodeSuppressedErrorsJob org.apache.ignite.internal.visor.node.VisorNodeSuppressedErrorsTaskArg org.apache.ignite.internal.visor.node.VisorPeerToPeerConfiguration +org.apache.ignite.internal.visor.node.VisorPersistenceMetrics org.apache.ignite.internal.visor.node.VisorPersistentStoreConfiguration org.apache.ignite.internal.visor.node.VisorRestConfiguration org.apache.ignite.internal.visor.node.VisorSegmentationConfiguration