Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4A0CD18E2F for ; Mon, 30 Nov 2015 13:33:48 +0000 (UTC) Received: (qmail 30459 invoked by uid 500); 30 Nov 2015 13:33:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 30363 invoked by uid 500); 30 Nov 2015 13:33:48 -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 29187 invoked by uid 99); 30 Nov 2015 13:33:47 -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, 30 Nov 2015 13:33:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7BCF0E0985; Mon, 30 Nov 2015 13:33:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: raulk@apache.org To: commits@ignite.apache.org Date: Mon, 30 Nov 2015 13:34:18 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [32/50] [abbrv] ignite git commit: marshaller perf suggestion fixed marshaller perf suggestion fixed Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0c03b916 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0c03b916 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0c03b916 Branch: refs/heads/master Commit: 0c03b916a4608e35993eeff276e2e12638930d52 Parents: fb5d54a Author: Yakov Zhdanov Authored: Fri Nov 27 20:27:29 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Nov 27 20:27:29 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/IgniteKernal.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0c03b916/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 305769b..68d48c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -53,21 +53,21 @@ import org.apache.ignite.IgniteAtomicLong; import org.apache.ignite.IgniteAtomicReference; import org.apache.ignite.IgniteAtomicSequence; import org.apache.ignite.IgniteAtomicStamped; +import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteClientDisconnectedException; import org.apache.ignite.IgniteCompute; import org.apache.ignite.IgniteCountDownLatch; -import org.apache.ignite.IgniteSemaphore; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.IgniteEvents; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteFileSystem; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteMessaging; -import org.apache.ignite.IgniteBinary; import org.apache.ignite.IgniteQueue; import org.apache.ignite.IgniteScheduler; +import org.apache.ignite.IgniteSemaphore; import org.apache.ignite.IgniteServices; import org.apache.ignite.IgniteSet; import org.apache.ignite.IgniteSystemProperties; @@ -96,6 +96,8 @@ import org.apache.ignite.internal.managers.failover.GridFailoverManager; import org.apache.ignite.internal.managers.indexing.GridIndexingManager; import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager; import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager; +import org.apache.ignite.internal.portable.BinaryEnumCache; +import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.internal.processors.GridProcessor; import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; @@ -133,7 +135,6 @@ import org.apache.ignite.internal.processors.service.GridServiceProcessor; import org.apache.ignite.internal.processors.session.GridTaskSessionProcessor; import org.apache.ignite.internal.processors.task.GridTaskProcessor; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; -import org.apache.ignite.internal.portable.BinaryEnumCache; import org.apache.ignite.internal.util.GridTimerTask; import org.apache.ignite.internal.util.future.GridFinishedFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; @@ -158,7 +159,6 @@ import org.apache.ignite.lifecycle.LifecycleBean; import org.apache.ignite.lifecycle.LifecycleEventType; import org.apache.ignite.marshaller.MarshallerExclusions; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; -import org.apache.ignite.internal.portable.BinaryMarshaller; import org.apache.ignite.mxbean.ClusterLocalNodeMetricsMXBean; import org.apache.ignite.mxbean.IgniteMXBean; import org.apache.ignite.mxbean.ThreadPoolMXBean; @@ -1192,9 +1192,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { if (cfg.getIncludeEventTypes() != null && cfg.getIncludeEventTypes().length != 0) perf.add("Disable grid events (remove 'includeEventTypes' from configuration)"); - if (OptimizedMarshaller.available() && !(cfg.getMarshaller() instanceof OptimizedMarshaller)) - perf.add("Enable optimized marshaller (set 'marshaller' to " + - OptimizedMarshaller.class.getSimpleName() + ')'); + if (BinaryMarshaller.available() && !(cfg.getMarshaller() instanceof BinaryMarshaller)) + perf.add("Enable binary marshaller (set 'marshaller' to " + + BinaryMarshaller.class.getSimpleName() + ')'); } /**