Repository: ignite Updated Branches: refs/heads/master dc780268d -> 958909305
IGNITE-5124 MemoryMetrics API Improvements: fix seconds-milliseconds conversion for .NET Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/95890930 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/95890930 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/95890930 Branch: refs/heads/master Commit: 9589093059270691549f7e42796da0d2a25a4083 Parents: dc78026 Author: Pavel Tupitsyn <[email protected]> Authored: Thu Jun 1 15:08:51 2017 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Thu Jun 1 15:08:51 2017 +0300 ---------------------------------------------------------------------- .../utils/PlatformConfigurationUtils.java | 40 +------------------- 1 file changed, 2 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/95890930/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java index dca6960..7f23b85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java @@ -59,8 +59,6 @@ import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.configuration.TransactionConfiguration; -import org.apache.ignite.internal.binary.BinaryArrayIdentityResolver; -import org.apache.ignite.internal.binary.BinaryIdentityResolver; import org.apache.ignite.internal.binary.BinaryRawReaderEx; import org.apache.ignite.internal.binary.BinaryRawWriterEx; import org.apache.ignite.internal.processors.platform.cache.affinity.PlatformAffinityFunction; @@ -1197,40 +1195,6 @@ public class PlatformConfigurationUtils { } /** - * Reads resolver - * - * @param r Reader. - * @return Resolver. - */ - private static BinaryIdentityResolver readBinaryIdentityResolver(BinaryRawReader r) { - int type = r.readByte(); - - switch (type) { - case 0: - return null; - - case 1: - return new BinaryArrayIdentityResolver(); - default: - assert false; - return null; - } - } - - /** - * Writes the resolver. - * - * @param w Writer. - * @param resolver Resolver. - */ - private static void writeBinaryIdentityResolver(BinaryRawWriter w, BinaryIdentityResolver resolver) { - if (resolver instanceof BinaryArrayIdentityResolver) - w.writeByte((byte)1); - else - w.writeByte((byte)0); - } - - /** * Reads the plugin configuration. * * @param cfg Ignite configuration to update. @@ -1353,7 +1317,7 @@ public class PlatformConfigurationUtils { .setEmptyPagesPoolSize(in.readInt()) .setMetricsEnabled(in.readBoolean()) .setSubIntervals(in.readInt()) - .setRateTimeInterval((int) (in.readLong() / 1000)); + .setRateTimeInterval(in.readLong()); plcs[i] = cfg; } @@ -1399,7 +1363,7 @@ public class PlatformConfigurationUtils { w.writeInt(plc.getEmptyPagesPoolSize()); w.writeBoolean(plc.isMetricsEnabled()); w.writeInt(plc.getSubIntervals()); - w.writeLong(plc.getRateTimeInterval() * 1000); + w.writeLong(plc.getRateTimeInterval()); } } else {
