#ignite-315: Divide ignite utils into two classes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/87c1a7df Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/87c1a7df Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/87c1a7df Branch: refs/heads/ignite-51 Commit: 87c1a7dfa802505e1810f3396ca7e35646186454 Parents: e86c69e Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Feb 24 18:35:32 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Feb 24 18:35:32 2015 +0300 ---------------------------------------------------------------------- .../processors/rest/TestBinaryClient.java | 7 +- .../processors/rest/TestMemcacheClient.java | 45 +- .../protocols/tcp/TcpRestParserSelfTest.java | 14 +- .../CacheRendezvousAffinityFunction.java | 3 +- .../IgfsByteDelimiterRecordResolver.java | 5 +- .../ignite/internal/ClusterMetricsSnapshot.java | 205 +++--- .../internal/GridEventConsumeHandler.java | 9 +- .../internal/GridMessageListenHandler.java | 9 +- .../router/impl/GridTcpRouterNioParser.java | 10 +- .../internal/direct/DirectByteBufferStream.java | 4 +- .../igfs/common/IgfsControlResponse.java | 7 +- .../internal/igfs/common/IgfsMarshaller.java | 17 +- .../affinity/GridAffinityMessage.java | 5 +- .../processors/cache/GridCacheEntryInfo.java | 13 +- .../processors/cache/GridCacheUtils.java | 8 +- .../continuous/CacheContinuousQueryEntry.java | 13 +- .../continuous/CacheContinuousQueryHandler.java | 5 +- .../cache/transactions/IgniteTxEntry.java | 21 +- .../version/GridCacheRawVersionedEntry.java | 9 +- .../processors/clock/GridClockMessage.java | 25 +- .../continuous/GridContinuousProcessor.java | 4 +- .../processors/igfs/IgfsDataManager.java | 4 +- .../internal/processors/igfs/IgfsServer.java | 5 +- .../processors/rest/GridRestResponse.java | 5 +- .../message/GridClientAbstractMessage.java | 5 +- .../message/GridClientHandshakeRequest.java | 5 +- .../protocols/tcp/GridMemcachedMessage.java | 5 +- .../rest/protocols/tcp/GridTcpRestParser.java | 44 +- .../ignite/internal/util/GridByteArrayList.java | 14 +- .../ignite/internal/util/IgniteByteUtils.java | 705 +++++++++++++++++++ .../ignite/internal/util/IgniteUtils.java | 685 +----------------- .../nio/GridConnectionBytesVerifyFilter.java | 3 +- .../util/nio/GridTcpCommunicationClient.java | 3 +- .../internal/visor/util/VisorTaskUtils.java | 3 +- .../ignite/lang/IgniteProductVersion.java | 7 +- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNode.java | 5 +- .../TcpDiscoveryMulticastIpFinder.java | 7 +- .../messages/TcpDiscoveryAuthFailedMessage.java | 5 +- .../messages/TcpDiscoveryHeartbeatMessage.java | 15 +- .../igfs/IgfsDataManagerSelfTest.java | 4 +- .../internal/util/IgniteUtilsSelfTest.java | 18 +- .../internal/util/nio/GridNioSelfTest.java | 6 +- .../internal/util/nio/GridRoundTripTest.java | 5 +- .../offheap/GridOffHeapMapAbstractSelfTest.java | 4 +- .../ignite/lang/GridByteArrayListSelfTest.java | 6 +- .../communication/GridTestMessage.java | 5 +- .../file/GridFileSwapSpaceSpiSelfTest.java | 6 +- .../internal/igfs/hadoop/IgfsHadoopIpcIo.java | 10 +- .../shuffle/GridHadoopShuffleMessage.java | 5 +- .../hadoop/v2/GridHadoopSplitWrapper.java | 6 +- .../http/jetty/GridJettyRestHandler.java | 3 +- 53 files changed, 1060 insertions(+), 995 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java index 84b1cce..b01139c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestBinaryClient.java @@ -24,7 +24,6 @@ import org.apache.ignite.internal.processors.rest.client.message.*; import org.apache.ignite.internal.processors.rest.protocols.tcp.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.logger.java.*; -import org.apache.ignite.internal.processors.rest.client.message.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -150,7 +149,7 @@ final class TestBinaryClient { if (len == 0) { if (buf.size() == 4) { - len = U.bytesToInt(buf.toByteArray(), 0); + len = IgniteByteUtils.bytesToInt(buf.toByteArray(), 0); if (log.isInfoEnabled()) log.info("Read length: " + len); @@ -280,8 +279,8 @@ final class TestBinaryClient { slice.put((byte)0x90); slice.putInt(res.remaining() - 5); slice.putLong(msg.requestId()); - slice.put(U.uuidToBytes(msg.clientId())); - slice.put(U.uuidToBytes(msg.destinationId())); + slice.put(IgniteByteUtils.uuidToBytes(msg.clientId())); + slice.put(IgniteByteUtils.uuidToBytes(msg.destinationId())); byte[] arr = new byte[res.remaining()]; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java index 98d2d23..a29c336 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TestMemcacheClient.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.rest; import org.apache.ignite.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.logger.java.*; import org.apache.ignite.marshaller.*; @@ -146,7 +147,7 @@ final class TestMemcacheClient { buf.write(b); if (i == 3) { - keyLength = U.bytesToShort(buf.toByteArray(), 0); + keyLength = IgniteByteUtils.bytesToShort(buf.toByteArray(), 0); buf.reset(); } @@ -157,7 +158,7 @@ final class TestMemcacheClient { buf.write(b); if (i == 7) { - success = U.bytesToShort(buf.toByteArray(), 0) == 0; + success = IgniteByteUtils.bytesToShort(buf.toByteArray(), 0) == 0; buf.reset(); } @@ -166,7 +167,7 @@ final class TestMemcacheClient { buf.write(b); if (i == 11) { - totalLength = U.bytesToInt(buf.toByteArray(), 0); + totalLength = IgniteByteUtils.bytesToInt(buf.toByteArray(), 0); buf.reset(); } @@ -175,7 +176,7 @@ final class TestMemcacheClient { buf.write(b); if (i == 15) { - opaque = U.bytesToInt(buf.toByteArray(), 0); + opaque = IgniteByteUtils.bytesToInt(buf.toByteArray(), 0); buf.reset(); } @@ -186,8 +187,8 @@ final class TestMemcacheClient { if (i == HDR_LEN + extrasLength - 1) { byte[] rawFlags = buf.toByteArray(); - keyFlags = U.bytesToShort(rawFlags, 0); - valFlags = U.bytesToShort(rawFlags, 2); + keyFlags = IgniteByteUtils.bytesToShort(rawFlags, 0); + valFlags = IgniteByteUtils.bytesToShort(rawFlags, 2); buf.reset(); } @@ -413,12 +414,12 @@ final class TestMemcacheClient { packet[0] = (byte)0x80; packet[1] = cmd.operationCode(); - U.shortToBytes((short)keyData.length(), packet, 2); + IgniteByteUtils.shortToBytes((short) keyData.length(), packet, 2); packet[4] = (byte)(extrasLength); - U.intToBytes(extrasLength + keyData.length() + valData.length(), packet, 8); - U.intToBytes(opaque, packet, 12); + IgniteByteUtils.intToBytes(extrasLength + keyData.length() + valData.length(), packet, 8); + IgniteByteUtils.intToBytes(opaque, packet, 12); if (extrasLength > 0) { if (extras != null) { @@ -426,14 +427,14 @@ final class TestMemcacheClient { for (Long extra : extras) { if (extra != null) - U.longToBytes(extra, packet, offset); + IgniteByteUtils.longToBytes(extra, packet, offset); offset += 8; } } else { - U.shortToBytes(keyData.getFlags(), packet, HDR_LEN); - U.shortToBytes(valData.getFlags(), packet, HDR_LEN + 2); + IgniteByteUtils.shortToBytes(keyData.getFlags(), packet, HDR_LEN); + IgniteByteUtils.shortToBytes(valData.getFlags(), packet, HDR_LEN + 2); } } @@ -643,17 +644,17 @@ final class TestMemcacheClient { flags |= BOOLEAN_FLAG; } else if (obj instanceof Integer) { - bytes = U.intToBytes((Integer)obj); + bytes = IgniteByteUtils.intToBytes((Integer) obj); flags |= INT_FLAG; } else if (obj instanceof Long) { - bytes = U.longToBytes((Long)obj); + bytes = IgniteByteUtils.longToBytes((Long) obj); flags |= LONG_FLAG; } else if (obj instanceof Date) { - bytes = U.longToBytes(((Date)obj).getTime()); + bytes = IgniteByteUtils.longToBytes(((Date) obj).getTime()); flags |= DATE_FLAG; } @@ -663,12 +664,12 @@ final class TestMemcacheClient { flags |= BYTE_FLAG; } else if (obj instanceof Float) { - bytes = U.intToBytes(Float.floatToIntBits((Float)obj)); + bytes = IgniteByteUtils.intToBytes(Float.floatToIntBits((Float) obj)); flags |= FLOAT_FLAG; } else if (obj instanceof Double) { - bytes = U.longToBytes(Double.doubleToLongBits((Double)obj)); + bytes = IgniteByteUtils.longToBytes(Double.doubleToLongBits((Double) obj)); flags |= DOUBLE_FLAG; } @@ -705,17 +706,17 @@ final class TestMemcacheClient { case BOOLEAN_FLAG: return bytes[0] == '1'; case INT_FLAG: - return U.bytesToInt(bytes, 0); + return IgniteByteUtils.bytesToInt(bytes, 0); case LONG_FLAG: - return U.bytesToLong(bytes, 0); + return IgniteByteUtils.bytesToLong(bytes, 0); case DATE_FLAG: - return new Date(U.bytesToLong(bytes, 0)); + return new Date(IgniteByteUtils.bytesToLong(bytes, 0)); case BYTE_FLAG: return bytes[0]; case FLOAT_FLAG: - return Float.intBitsToFloat(U.bytesToInt(bytes, 0)); + return Float.intBitsToFloat(IgniteByteUtils.bytesToInt(bytes, 0)); case DOUBLE_FLAG: - return Double.longBitsToDouble(U.bytesToLong(bytes, 0)); + return Double.longBitsToDouble(IgniteByteUtils.bytesToLong(bytes, 0)); case BYTE_ARR_FLAG: return bytes; default: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java index b3c5579..f6997b9 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/TcpRestParserSelfTest.java @@ -20,9 +20,9 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp; import org.apache.ignite.internal.client.marshaller.*; import org.apache.ignite.internal.client.marshaller.optimized.*; import org.apache.ignite.internal.processors.rest.client.message.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.nio.*; import org.apache.ignite.internal.util.typedef.*; -import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; @@ -121,9 +121,9 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest { ByteBuffer fake = ByteBuffer.allocate(21); fake.put(IGNITE_REQ_FLAG); - fake.put(U.intToBytes(-5)); - fake.put(U.longToBytes(0)); - fake.put(U.longToBytes(0)); + fake.put(IgniteByteUtils.intToBytes(-5)); + fake.put(IgniteByteUtils.longToBytes(0)); + fake.put(IgniteByteUtils.longToBytes(0)); fake.flip(); @@ -326,7 +326,7 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest { GridClientHandshakeRequest req = (GridClientHandshakeRequest)F.first(lst); assertNotNull(req); - assertEquals(U.bytesToShort(new byte[] {5, 0}, 0), req.version()); + assertEquals(IgniteByteUtils.bytesToShort(new byte[]{5, 0}, 0), req.version()); } } @@ -371,8 +371,8 @@ public class TcpRestParserSelfTest extends GridCommonAbstractTest { slice.put(IGNITE_REQ_FLAG); slice.putInt(res.remaining() - 5); slice.putLong(msg.requestId()); - slice.put(U.uuidToBytes(msg.clientId())); - slice.put(U.uuidToBytes(msg.destinationId())); + slice.put(IgniteByteUtils.uuidToBytes(msg.clientId())); + slice.put(IgniteByteUtils.uuidToBytes(msg.destinationId())); return res; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java index f7bc2c5..de25a50 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/CacheRendezvousAffinityFunction.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -294,7 +295,7 @@ public class CacheRendezvousAffinityFunction implements CacheAffinityFunction, E byte[] nodeHashBytes = marshaller.marshal(nodeHash); out.write(nodeHashBytes, 0, nodeHashBytes.length); // Avoid IOException. - out.write(U.intToBytes(part), 0, 4); // Avoid IOException. + out.write(IgniteByteUtils.intToBytes(part), 0, 4); // Avoid IOException. d.reset(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java index b7dab74..666f847 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java @@ -20,6 +20,7 @@ package org.apache.ignite.igfs.mapreduce.records; import org.apache.ignite.*; import org.apache.ignite.igfs.*; import org.apache.ignite.igfs.mapreduce.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -281,7 +282,7 @@ public class IgfsByteDelimiterRecordResolver implements IgfsRecordResolver, Exte out.writeInt(delims.length); for (byte[] delim : delims) - U.writeByteArray(out, delim); + IgniteByteUtils.writeByteArray(out, delim); } else out.writeBoolean(false); @@ -295,7 +296,7 @@ public class IgfsByteDelimiterRecordResolver implements IgfsRecordResolver, Exte delims = new byte[len][]; for (int i = 0; i < len; i++) - delims[i] = U.readByteArray(in); + delims[i] = IgniteByteUtils.readByteArray(in); maxDelimLen = maxDelimiterLength(delims); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java index a934d6c..db8487f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterMetricsSnapshot.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -1235,57 +1236,57 @@ public class ClusterMetricsSnapshot implements ClusterMetrics { public static int serialize(byte[] data, int off, ClusterMetrics metrics) { int start = off; - off = U.intToBytes(metrics.getMaximumActiveJobs(), data, off); - off = U.intToBytes(metrics.getCurrentActiveJobs(), data, off); - off = U.floatToBytes(metrics.getAverageActiveJobs(), data, off); - off = U.intToBytes(metrics.getMaximumWaitingJobs(), data, off); - off = U.intToBytes(metrics.getCurrentWaitingJobs(), data, off); - off = U.floatToBytes(metrics.getAverageWaitingJobs(), data, off); - off = U.intToBytes(metrics.getMaximumRejectedJobs(), data, off); - off = U.intToBytes(metrics.getCurrentRejectedJobs(), data, off); - off = U.floatToBytes(metrics.getAverageRejectedJobs(), data, off); - off = U.intToBytes(metrics.getMaximumCancelledJobs(), data, off); - off = U.intToBytes(metrics.getCurrentCancelledJobs(), data, off); - off = U.floatToBytes(metrics.getAverageCancelledJobs(), data, off); - off = U.intToBytes(metrics.getTotalRejectedJobs(), data , off); - off = U.intToBytes(metrics.getTotalCancelledJobs(), data , off); - off = U.intToBytes(metrics.getTotalExecutedJobs(), data , off); - off = U.longToBytes(metrics.getMaximumJobWaitTime(), data, off); - off = U.longToBytes(metrics.getCurrentJobWaitTime(), data, off); - off = U.doubleToBytes(metrics.getAverageJobWaitTime(), data, off); - off = U.longToBytes(metrics.getMaximumJobExecuteTime(), data, off); - off = U.longToBytes(metrics.getCurrentJobExecuteTime(), data, off); - off = U.doubleToBytes(metrics.getAverageJobExecuteTime(), data, off); - off = U.intToBytes(metrics.getTotalExecutedTasks(), data, off); - off = U.longToBytes(metrics.getCurrentIdleTime(), data, off); - off = U.longToBytes(metrics.getTotalIdleTime(), data , off); - off = U.intToBytes(metrics.getTotalCpus(), data, off); - off = U.doubleToBytes(metrics.getCurrentCpuLoad(), data, off); - off = U.doubleToBytes(metrics.getAverageCpuLoad(), data, off); - off = U.doubleToBytes(metrics.getCurrentGcCpuLoad(), data, off); - off = U.longToBytes(metrics.getHeapMemoryInitialized(), data, off); - off = U.longToBytes(metrics.getHeapMemoryUsed(), data, off); - off = U.longToBytes(metrics.getHeapMemoryCommitted(), data, off); - off = U.longToBytes(metrics.getHeapMemoryMaximum(), data, off); - off = U.longToBytes(metrics.getHeapMemoryTotal(), data, off); - off = U.longToBytes(metrics.getNonHeapMemoryInitialized(), data, off); - off = U.longToBytes(metrics.getNonHeapMemoryUsed(), data, off); - off = U.longToBytes(metrics.getNonHeapMemoryCommitted(), data, off); - off = U.longToBytes(metrics.getNonHeapMemoryMaximum(), data, off); - off = U.longToBytes(metrics.getNonHeapMemoryTotal(), data, off); - off = U.longToBytes(metrics.getStartTime(), data, off); - off = U.longToBytes(metrics.getNodeStartTime(), data, off); - off = U.longToBytes(metrics.getUpTime(), data, off); - off = U.intToBytes(metrics.getCurrentThreadCount(), data, off); - off = U.intToBytes(metrics.getMaximumThreadCount(), data, off); - off = U.longToBytes(metrics.getTotalStartedThreadCount(), data, off); - off = U.intToBytes(metrics.getCurrentDaemonThreadCount(), data, off); - off = U.longToBytes(metrics.getLastDataVersion(), data, off); - off = U.intToBytes(metrics.getSentMessagesCount(), data, off); - off = U.longToBytes(metrics.getSentBytesCount(), data, off); - off = U.intToBytes(metrics.getReceivedMessagesCount(), data, off); - off = U.longToBytes(metrics.getReceivedBytesCount(), data, off); - off = U.intToBytes(metrics.getOutboundMessagesQueueSize(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getMaximumActiveJobs(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getCurrentActiveJobs(), data, off); + off = IgniteByteUtils.floatToBytes(metrics.getAverageActiveJobs(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getMaximumWaitingJobs(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getCurrentWaitingJobs(), data, off); + off = IgniteByteUtils.floatToBytes(metrics.getAverageWaitingJobs(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getMaximumRejectedJobs(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getCurrentRejectedJobs(), data, off); + off = IgniteByteUtils.floatToBytes(metrics.getAverageRejectedJobs(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getMaximumCancelledJobs(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getCurrentCancelledJobs(), data, off); + off = IgniteByteUtils.floatToBytes(metrics.getAverageCancelledJobs(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getTotalRejectedJobs(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getTotalCancelledJobs(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getTotalExecutedJobs(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getMaximumJobWaitTime(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getCurrentJobWaitTime(), data, off); + off = IgniteByteUtils.doubleToBytes(metrics.getAverageJobWaitTime(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getMaximumJobExecuteTime(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getCurrentJobExecuteTime(), data, off); + off = IgniteByteUtils.doubleToBytes(metrics.getAverageJobExecuteTime(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getTotalExecutedTasks(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getCurrentIdleTime(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getTotalIdleTime(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getTotalCpus(), data, off); + off = IgniteByteUtils.doubleToBytes(metrics.getCurrentCpuLoad(), data, off); + off = IgniteByteUtils.doubleToBytes(metrics.getAverageCpuLoad(), data, off); + off = IgniteByteUtils.doubleToBytes(metrics.getCurrentGcCpuLoad(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getHeapMemoryInitialized(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getHeapMemoryUsed(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getHeapMemoryCommitted(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getHeapMemoryMaximum(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getHeapMemoryTotal(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getNonHeapMemoryInitialized(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getNonHeapMemoryUsed(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getNonHeapMemoryCommitted(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getNonHeapMemoryMaximum(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getNonHeapMemoryTotal(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getStartTime(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getNodeStartTime(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getUpTime(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getCurrentThreadCount(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getMaximumThreadCount(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getTotalStartedThreadCount(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getCurrentDaemonThreadCount(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getLastDataVersion(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getSentMessagesCount(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getSentBytesCount(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getReceivedMessagesCount(), data, off); + off = IgniteByteUtils.longToBytes(metrics.getReceivedBytesCount(), data, off); + off = IgniteByteUtils.intToBytes(metrics.getOutboundMessagesQueueSize(), data, off); assert off - start == METRICS_SIZE : "Invalid metrics size [expected=" + METRICS_SIZE + ", actual=" + (off - start) + ']'; @@ -1307,207 +1308,207 @@ public class ClusterMetricsSnapshot implements ClusterMetrics { metrics.setLastUpdateTime(U.currentTimeMillis()); - metrics.setMaximumActiveJobs(U.bytesToInt(data, off)); + metrics.setMaximumActiveJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setCurrentActiveJobs(U.bytesToInt(data, off)); + metrics.setCurrentActiveJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setAverageActiveJobs(U.bytesToFloat(data, off)); + metrics.setAverageActiveJobs(IgniteByteUtils.bytesToFloat(data, off)); off += 4; - metrics.setMaximumWaitingJobs(U.bytesToInt(data, off)); + metrics.setMaximumWaitingJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setCurrentWaitingJobs(U.bytesToInt(data, off)); + metrics.setCurrentWaitingJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setAverageWaitingJobs(U.bytesToFloat(data, off)); + metrics.setAverageWaitingJobs(IgniteByteUtils.bytesToFloat(data, off)); off += 4; - metrics.setMaximumRejectedJobs(U.bytesToInt(data, off)); + metrics.setMaximumRejectedJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setCurrentRejectedJobs(U.bytesToInt(data, off)); + metrics.setCurrentRejectedJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setAverageRejectedJobs(U.bytesToFloat(data, off)); + metrics.setAverageRejectedJobs(IgniteByteUtils.bytesToFloat(data, off)); off += 4; - metrics.setMaximumCancelledJobs(U.bytesToInt(data, off)); + metrics.setMaximumCancelledJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setCurrentCancelledJobs(U.bytesToInt(data, off)); + metrics.setCurrentCancelledJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setAverageCancelledJobs(U.bytesToFloat(data, off)); + metrics.setAverageCancelledJobs(IgniteByteUtils.bytesToFloat(data, off)); off += 4; - metrics.setTotalRejectedJobs(U.bytesToInt(data, off)); + metrics.setTotalRejectedJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setTotalCancelledJobs(U.bytesToInt(data, off)); + metrics.setTotalCancelledJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setTotalExecutedJobs(U.bytesToInt(data, off)); + metrics.setTotalExecutedJobs(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setMaximumJobWaitTime(U.bytesToLong(data, off)); + metrics.setMaximumJobWaitTime(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setCurrentJobWaitTime(U.bytesToLong(data, off)); + metrics.setCurrentJobWaitTime(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setAverageJobWaitTime(U.bytesToDouble(data, off)); + metrics.setAverageJobWaitTime(IgniteByteUtils.bytesToDouble(data, off)); off += 8; - metrics.setMaximumJobExecuteTime(U.bytesToLong(data, off)); + metrics.setMaximumJobExecuteTime(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setCurrentJobExecuteTime(U.bytesToLong(data, off)); + metrics.setCurrentJobExecuteTime(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setAverageJobExecuteTime(U.bytesToDouble(data, off)); + metrics.setAverageJobExecuteTime(IgniteByteUtils.bytesToDouble(data, off)); off += 8; - metrics.setTotalExecutedTasks(U.bytesToInt(data, off)); + metrics.setTotalExecutedTasks(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setCurrentIdleTime(U.bytesToLong(data, off)); + metrics.setCurrentIdleTime(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setTotalIdleTime(U.bytesToLong(data, off)); + metrics.setTotalIdleTime(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setAvailableProcessors(U.bytesToInt(data, off)); + metrics.setAvailableProcessors(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setCurrentCpuLoad(U.bytesToDouble(data, off)); + metrics.setCurrentCpuLoad(IgniteByteUtils.bytesToDouble(data, off)); off += 8; - metrics.setAverageCpuLoad(U.bytesToDouble(data, off)); + metrics.setAverageCpuLoad(IgniteByteUtils.bytesToDouble(data, off)); off += 8; - metrics.setCurrentGcCpuLoad(U.bytesToDouble(data, off)); + metrics.setCurrentGcCpuLoad(IgniteByteUtils.bytesToDouble(data, off)); off += 8; - metrics.setHeapMemoryInitialized(U.bytesToLong(data, off)); + metrics.setHeapMemoryInitialized(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setHeapMemoryUsed(U.bytesToLong(data, off)); + metrics.setHeapMemoryUsed(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setHeapMemoryCommitted(U.bytesToLong(data, off)); + metrics.setHeapMemoryCommitted(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setHeapMemoryMaximum(U.bytesToLong(data, off)); + metrics.setHeapMemoryMaximum(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setHeapMemoryTotal(U.bytesToLong(data, off)); + metrics.setHeapMemoryTotal(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setNonHeapMemoryInitialized(U.bytesToLong(data, off)); + metrics.setNonHeapMemoryInitialized(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setNonHeapMemoryUsed(U.bytesToLong(data, off)); + metrics.setNonHeapMemoryUsed(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setNonHeapMemoryCommitted(U.bytesToLong(data, off)); + metrics.setNonHeapMemoryCommitted(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setNonHeapMemoryMaximum(U.bytesToLong(data, off)); + metrics.setNonHeapMemoryMaximum(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setNonHeapMemoryTotal(U.bytesToLong(data, off)); + metrics.setNonHeapMemoryTotal(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setStartTime(U.bytesToLong(data, off)); + metrics.setStartTime(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setNodeStartTime(U.bytesToLong(data, off)); + metrics.setNodeStartTime(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setUpTime(U.bytesToLong(data, off)); + metrics.setUpTime(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setCurrentThreadCount(U.bytesToInt(data, off)); + metrics.setCurrentThreadCount(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setMaximumThreadCount(U.bytesToInt(data, off)); + metrics.setMaximumThreadCount(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setTotalStartedThreadCount(U.bytesToLong(data, off)); + metrics.setTotalStartedThreadCount(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setCurrentDaemonThreadCount(U.bytesToInt(data, off)); + metrics.setCurrentDaemonThreadCount(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setLastDataVersion(U.bytesToLong(data, off)); + metrics.setLastDataVersion(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setSentMessagesCount(U.bytesToInt(data, off)); + metrics.setSentMessagesCount(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setSentBytesCount(U.bytesToLong(data, off)); + metrics.setSentBytesCount(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setReceivedMessagesCount(U.bytesToInt(data, off)); + metrics.setReceivedMessagesCount(IgniteByteUtils.bytesToInt(data, off)); off += 4; - metrics.setReceivedBytesCount(U.bytesToLong(data, off)); + metrics.setReceivedBytesCount(IgniteByteUtils.bytesToLong(data, off)); off += 8; - metrics.setOutboundMessagesQueueSize(U.bytesToInt(data, off)); + metrics.setOutboundMessagesQueueSize(IgniteByteUtils.bytesToInt(data, off)); off += 4; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java index 8783b44..99f9f45 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java @@ -24,6 +24,7 @@ import org.apache.ignite.internal.managers.deployment.*; import org.apache.ignite.internal.managers.eventstorage.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.continuous.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -288,7 +289,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { out.writeBoolean(b); if (b) { - U.writeByteArray(out, filterBytes); + IgniteByteUtils.writeByteArray(out, filterBytes); U.writeString(out, clsName); out.writeObject(depInfo); } @@ -303,7 +304,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { boolean b = in.readBoolean(); if (b) { - filterBytes = U.readByteArray(in); + filterBytes = IgniteByteUtils.readByteArray(in); clsName = U.readString(in); depInfo = (GridDeploymentInfo)in.readObject(); } @@ -391,7 +392,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { out.writeBoolean(b); if (b) { - U.writeByteArray(out, bytes); + IgniteByteUtils.writeByteArray(out, bytes); U.writeString(out, cacheName); out.writeObject(depInfo); } @@ -404,7 +405,7 @@ class GridEventConsumeHandler implements GridContinuousHandler { boolean b = in.readBoolean(); if (b) { - bytes = U.readByteArray(in); + bytes = IgniteByteUtils.readByteArray(in); cacheName = U.readString(in); depInfo = (GridDeploymentInfo)in.readObject(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java index 40e4327..75102ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridMessageListenHandler.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal; import org.apache.ignite.*; import org.apache.ignite.internal.managers.deployment.*; import org.apache.ignite.internal.processors.continuous.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -166,8 +167,8 @@ public class GridMessageListenHandler implements GridContinuousHandler { out.writeBoolean(depEnabled); if (depEnabled) { - U.writeByteArray(out, topicBytes); - U.writeByteArray(out, predBytes); + IgniteByteUtils.writeByteArray(out, topicBytes); + IgniteByteUtils.writeByteArray(out, predBytes); U.writeString(out, clsName); out.writeObject(depInfo); } @@ -182,8 +183,8 @@ public class GridMessageListenHandler implements GridContinuousHandler { depEnabled = in.readBoolean(); if (depEnabled) { - topicBytes = U.readByteArray(in); - predBytes = U.readByteArray(in); + topicBytes = IgniteByteUtils.readByteArray(in); + predBytes = IgniteByteUtils.readByteArray(in); clsName = U.readString(in); depInfo = (GridDeploymentInfoBean)in.readObject(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java index 5111ffc..ac1ff8a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioParser.java @@ -21,8 +21,8 @@ import org.apache.ignite.*; import org.apache.ignite.internal.client.marshaller.*; import org.apache.ignite.internal.processors.rest.client.message.*; import org.apache.ignite.internal.processors.rest.protocols.tcp.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.nio.*; -import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; import java.nio.*; @@ -68,8 +68,8 @@ class GridTcpRouterNioParser extends GridTcpRestParser { res.put(IGNITE_REQ_FLAG); res.putInt(resp.body().length + 40); res.putLong(resp.requestId()); - res.put(U.uuidToBytes(resp.clientId())); - res.put(U.uuidToBytes(resp.destinationId())); + res.put(IgniteByteUtils.uuidToBytes(resp.clientId())); + res.put(IgniteByteUtils.uuidToBytes(resp.destinationId())); res.put(resp.body()); res.flip(); @@ -88,8 +88,8 @@ class GridTcpRouterNioParser extends GridTcpRestParser { slice.put(IGNITE_REQ_FLAG); slice.putInt(res.remaining() - 5); slice.putLong(clientMsg.requestId()); - slice.put(U.uuidToBytes(clientMsg.clientId())); - slice.put(U.uuidToBytes(clientMsg.destinationId())); + slice.put(IgniteByteUtils.uuidToBytes(clientMsg.clientId())); + slice.put(IgniteByteUtils.uuidToBytes(clientMsg.destinationId())); return res; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java index a594eb9..4ad78f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectByteBufferStream.java @@ -524,7 +524,7 @@ public class DirectByteBufferStream { * @param val Value */ public void writeUuid(UUID val) { - writeByteArray(val != null ? U.uuidToBytes(val) : null); + writeByteArray(val != null ? IgniteByteUtils.uuidToBytes(val) : null); } /** @@ -892,7 +892,7 @@ public class DirectByteBufferStream { public UUID readUuid() { byte[] arr = readByteArray(); - return arr != null ? U.bytesToUuid(arr, 0) : null; + return arr != null ? IgniteByteUtils.bytesToUuid(arr, 0) : null; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java index 7295bda..83417ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.igfs.common; import org.apache.ignite.*; import org.apache.ignite.igfs.*; import org.apache.ignite.internal.processors.igfs.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -361,14 +362,14 @@ public class IgfsControlResponse extends IgfsMessage { public void writeExternal(ObjectOutput out) throws IOException { byte[] hdr = new byte[RES_HEADER_SIZE]; - U.intToBytes(resType, hdr, 0); + IgniteByteUtils.intToBytes(resType, hdr, 0); int off = 4; hdr[off++] = err != null ? (byte)1 : (byte)0; if (resType == RES_TYPE_BYTE_ARRAY) - U.intToBytes(len, hdr, off); + IgniteByteUtils.intToBytes(len, hdr, off); out.write(hdr); @@ -446,7 +447,7 @@ public class IgfsControlResponse extends IgfsMessage { in.readFully(hdr); - resType = U.bytesToInt(hdr, 0); + resType = IgniteByteUtils.bytesToInt(hdr, 0); boolean hasErr = hdr[4] != 0; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java index 11af716..cf5a956 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsMarshaller.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.igfs.common; import org.apache.ignite.*; import org.apache.ignite.igfs.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -46,9 +47,9 @@ public class IgfsMarshaller { byte[] hdr = new byte[HEADER_SIZE]; - U.longToBytes(reqId, hdr, 0); + IgniteByteUtils.longToBytes(reqId, hdr, 0); - U.intToBytes(cmd.ordinal(), hdr, 8); + IgniteByteUtils.intToBytes(cmd.ordinal(), hdr, 8); return hdr; } @@ -65,9 +66,9 @@ public class IgfsMarshaller { Arrays.fill(hdr, (byte)0); - U.longToBytes(reqId, hdr, 0); + IgniteByteUtils.longToBytes(reqId, hdr, 0); - U.intToBytes(cmd.ordinal(), hdr, 8); + IgniteByteUtils.intToBytes(cmd.ordinal(), hdr, 8); return hdr; } @@ -151,10 +152,10 @@ public class IgfsMarshaller { IgfsStreamControlRequest req = (IgfsStreamControlRequest)msg; - U.longToBytes(req.streamId(), hdr, 12); + IgniteByteUtils.longToBytes(req.streamId(), hdr, 12); if (msg.command() == READ_BLOCK) - U.intToBytes(req.length(), hdr, 20); + IgniteByteUtils.intToBytes(req.length(), hdr, 20); out.write(hdr); @@ -268,10 +269,10 @@ public class IgfsMarshaller { case WRITE_BLOCK: { IgfsStreamControlRequest req = new IgfsStreamControlRequest(); - long streamId = U.bytesToLong(hdr, 12); + long streamId = IgniteByteUtils.bytesToLong(hdr, 12); req.streamId(streamId); - req.length(U.bytesToInt(hdr, 20)); + req.length(IgniteByteUtils.bytesToInt(hdr, 20)); if (cmd == READ_BLOCK) req.position(in.readLong()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java index 2bb8b69..3fbd23c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityMessage.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.affinity; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -135,7 +136,7 @@ class GridAffinityMessage implements Externalizable, OptimizedMarshallable { /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { - U.writeByteArray(out, src); + IgniteByteUtils.writeByteArray(out, src); out.writeInt(depMode.ordinal()); @@ -147,7 +148,7 @@ class GridAffinityMessage implements Externalizable, OptimizedMarshallable { /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - src = U.readByteArray(in); + src = IgniteByteUtils.readByteArray(in); depMode = DeploymentMode.fromOrdinal(in.readInt()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java index b35ae98..c8e563b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryInfo.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.version.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.marshaller.*; @@ -266,17 +267,17 @@ public class GridCacheEntryInfo<K, V> implements Externalizable { out.writeBoolean(valBytesSent); if (keyBytesSent) - U.writeByteArray(out, keyBytes); + IgniteByteUtils.writeByteArray(out, keyBytes); else out.writeObject(key); if (valBytesSent) - U.writeByteArray(out, valBytes); + IgniteByteUtils.writeByteArray(out, valBytes); else { if (val != null && val instanceof byte[]) { out.writeBoolean(true); - U.writeByteArray(out, (byte[])val); + IgniteByteUtils.writeByteArray(out, (byte[]) val); } else { out.writeBoolean(false); @@ -312,14 +313,14 @@ public class GridCacheEntryInfo<K, V> implements Externalizable { valBytesSent = in.readBoolean(); if (keyBytesSent) - keyBytes = U.readByteArray(in); + keyBytes = IgniteByteUtils.readByteArray(in); else key = (K)in.readObject(); if (valBytesSent) - valBytes = U.readByteArray(in); + valBytes = IgniteByteUtils.readByteArray(in); else - val = in.readBoolean() ? (V)U.readByteArray(in) : (V)in.readObject(); + val = in.readBoolean() ? (V) IgniteByteUtils.readByteArray(in) : (V)in.readObject(); ttl = in.readLong(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 7cd13df..f4d801d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -1332,10 +1332,10 @@ public class GridCacheUtils { byte[] bytes = new byte[28]; - U.intToBytes(ver.topologyVersion(), bytes, 0); - U.longToBytes(ver.globalTime(), bytes, 4); - U.longToBytes(ver.order(), bytes, 12); - U.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20); + IgniteByteUtils.intToBytes(ver.topologyVersion(), bytes, 0); + IgniteByteUtils.longToBytes(ver.globalTime(), bytes, 4); + IgniteByteUtils.longToBytes(ver.order(), bytes, 12); + IgniteByteUtils.intToBytes(ver.nodeOrderAndDrIdRaw(), bytes, 20); return bytes; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java index aa4ce54..2ce417d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import org.apache.ignite.*; import org.apache.ignite.internal.managers.deployment.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.marshaller.*; @@ -175,12 +176,12 @@ class CacheContinuousQueryEntry<K, V> implements GridCacheDeployable, Externaliz out.writeBoolean(b); if (b) { - U.writeByteArray(out, keyBytes); + IgniteByteUtils.writeByteArray(out, keyBytes); if (newValBytes != null && !newValBytes.isNull()) { out.writeBoolean(true); out.writeBoolean(newValBytes.isPlain()); - U.writeByteArray(out, newValBytes.get()); + IgniteByteUtils.writeByteArray(out, newValBytes.get()); } else out.writeBoolean(false); @@ -188,7 +189,7 @@ class CacheContinuousQueryEntry<K, V> implements GridCacheDeployable, Externaliz if (oldValBytes != null && !oldValBytes.isNull()) { out.writeBoolean(true); out.writeBoolean(oldValBytes.isPlain()); - U.writeByteArray(out, oldValBytes.get()); + IgniteByteUtils.writeByteArray(out, oldValBytes.get()); } else out.writeBoolean(false); @@ -209,13 +210,13 @@ class CacheContinuousQueryEntry<K, V> implements GridCacheDeployable, Externaliz boolean b = in.readBoolean(); if (b) { - keyBytes = U.readByteArray(in); + keyBytes = IgniteByteUtils.readByteArray(in); if (in.readBoolean()) - newValBytes = in.readBoolean() ? plain(U.readByteArray(in)) : marshaled(U.readByteArray(in)); + newValBytes = in.readBoolean() ? plain(IgniteByteUtils.readByteArray(in)) : marshaled(IgniteByteUtils.readByteArray(in)); if (in.readBoolean()) - oldValBytes = in.readBoolean() ? plain(U.readByteArray(in)) : marshaled(U.readByteArray(in)); + oldValBytes = in.readBoolean() ? plain(IgniteByteUtils.readByteArray(in)) : marshaled(IgniteByteUtils.readByteArray(in)); cacheName = U.readString(in); depInfo = (GridDeploymentInfo)in.readObject(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java index 82b28cb..d5aa6b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java @@ -25,6 +25,7 @@ import org.apache.ignite.internal.managers.deployment.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.query.*; import org.apache.ignite.internal.processors.continuous.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -487,14 +488,14 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { - U.writeByteArray(out, bytes); + IgniteByteUtils.writeByteArray(out, bytes); U.writeString(out, clsName); out.writeObject(depInfo); } /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - bytes = U.readByteArray(in); + bytes = IgniteByteUtils.readByteArray(in); clsName = U.readString(in); depInfo = (GridDeploymentInfo)in.readObject(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java index 1416d8c..5f51fa8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.version.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.*; @@ -837,9 +838,9 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, out.writeBoolean(depEnabled); if (depEnabled) { - U.writeByteArray(out, keyBytes); - U.writeByteArray(out, transformClosBytes); - U.writeByteArray(out, filterBytes); + IgniteByteUtils.writeByteArray(out, keyBytes); + IgniteByteUtils.writeByteArray(out, transformClosBytes); + IgniteByteUtils.writeByteArray(out, filterBytes); } else { out.writeObject(key); @@ -867,9 +868,9 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, depEnabled = in.readBoolean(); if (depEnabled) { - keyBytes = U.readByteArray(in); - transformClosBytes = U.readByteArray(in); - filterBytes = U.readByteArray(in); + keyBytes = IgniteByteUtils.readByteArray(in); + transformClosBytes = IgniteByteUtils.readByteArray(in); + filterBytes = IgniteByteUtils.readByteArray(in); } else { key = (K)in.readObject(); @@ -1083,12 +1084,12 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, if (hasWriteVal) { if (valBytesSent) - U.writeByteArray(out, valBytes); + IgniteByteUtils.writeByteArray(out, valBytes); else { if (val != null && val instanceof byte[]) { out.writeBoolean(true); - U.writeByteArray(out, (byte[])val); + IgniteByteUtils.writeByteArray(out, (byte[]) val); } else { out.writeBoolean(false); @@ -1113,9 +1114,9 @@ public class IgniteTxEntry<K, V> implements GridPeerDeployAware, Externalizable, if (hasWriteVal) { if (valBytesSent) - valBytes = U.readByteArray(in); + valBytes = IgniteByteUtils.readByteArray(in); else - val = in.readBoolean() ? (V)U.readByteArray(in) : (V)in.readObject(); + val = in.readBoolean() ? (V) IgniteByteUtils.readByteArray(in) : (V)in.readObject(); } op = fromOrdinal(in.readInt()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java index 50321f5..a8fc95f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache.version; import org.apache.ignite.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.marshaller.*; import org.jetbrains.annotations.*; @@ -188,8 +189,8 @@ public class GridCacheRawVersionedEntry<K, V> implements GridCacheVersionedEntry @Override public void writeExternal(ObjectOutput out) throws IOException { assert keyBytes != null; - U.writeByteArray(out, keyBytes); - U.writeByteArray(out, valBytes); + IgniteByteUtils.writeByteArray(out, keyBytes); + IgniteByteUtils.writeByteArray(out, valBytes); out.writeLong(ttl); @@ -201,8 +202,8 @@ public class GridCacheRawVersionedEntry<K, V> implements GridCacheVersionedEntry /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - keyBytes = U.readByteArray(in); - valBytes = U.readByteArray(in); + keyBytes = IgniteByteUtils.readByteArray(in); + valBytes = IgniteByteUtils.readByteArray(in); ttl = in.readLong(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java index 90b8000..d858b22 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockMessage.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.clock; import org.apache.ignite.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.util.*; @@ -120,15 +121,15 @@ public class GridClockMessage { int off = 0; - off = U.longToBytes(origNodeId.getLeastSignificantBits(), buf, off); - off = U.longToBytes(origNodeId.getMostSignificantBits(), buf, off); + off = IgniteByteUtils.longToBytes(origNodeId.getLeastSignificantBits(), buf, off); + off = IgniteByteUtils.longToBytes(origNodeId.getMostSignificantBits(), buf, off); - off = U.longToBytes(targetNodeId.getLeastSignificantBits(), buf, off); - off = U.longToBytes(targetNodeId.getMostSignificantBits(), buf, off); + off = IgniteByteUtils.longToBytes(targetNodeId.getLeastSignificantBits(), buf, off); + off = IgniteByteUtils.longToBytes(targetNodeId.getMostSignificantBits(), buf, off); - off = U.longToBytes(origTs, buf, off); + off = IgniteByteUtils.longToBytes(origTs, buf, off); - off = U.longToBytes(replyTs, buf, off); + off = IgniteByteUtils.longToBytes(replyTs, buf, off); assert off == PACKET_SIZE; @@ -148,18 +149,18 @@ public class GridClockMessage { if (len < PACKET_SIZE) throw new IgniteCheckedException("Failed to assemble time server packet (message is too short)."); - long lsb = U.bytesToLong(buf, off); - long msb = U.bytesToLong(buf, off + 8); + long lsb = IgniteByteUtils.bytesToLong(buf, off); + long msb = IgniteByteUtils.bytesToLong(buf, off + 8); UUID origNodeId = new UUID(msb, lsb); - lsb = U.bytesToLong(buf, off + 16); - msb = U.bytesToLong(buf, off + 24); + lsb = IgniteByteUtils.bytesToLong(buf, off + 16); + msb = IgniteByteUtils.bytesToLong(buf, off + 24); UUID targetNodeId = new UUID(msb, lsb); - long origTs = U.bytesToLong(buf, off + 32); - long replyTs = U.bytesToLong(buf, off + 40); + long origTs = IgniteByteUtils.bytesToLong(buf, off + 32); + long replyTs = IgniteByteUtils.bytesToLong(buf, off + 40); return new GridClockMessage(origNodeId, targetNodeId, origTs, replyTs); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index eed273d..478ae09 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -1435,7 +1435,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { out.writeBoolean(b); if (b) { - U.writeByteArray(out, prjPredBytes); + IgniteByteUtils.writeByteArray(out, prjPredBytes); U.writeString(out, clsName); out.writeObject(depInfo); } @@ -1454,7 +1454,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { boolean b = in.readBoolean(); if (b) { - prjPredBytes = U.readByteArray(in); + prjPredBytes = IgniteByteUtils.readByteArray(in); clsName = U.readString(in); depInfo = (GridDeploymentInfo)in.readObject(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java index d2f4f23..75738bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java @@ -1637,13 +1637,13 @@ public class IgfsDataManager extends IgfsManager { /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeInt(start); - U.writeByteArray(out, data); + IgniteByteUtils.writeByteArray(out, data); } /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException { start = in.readInt(); - data = U.readByteArray(in); + data = IgniteByteUtils.readByteArray(in); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java index 0ff2f3a..4e5eb36 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsServer.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.igfs; import org.apache.ignite.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.igfs.common.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.ipc.*; import org.apache.ignite.internal.util.ipc.loopback.*; import org.apache.ignite.internal.util.ipc.shmem.*; @@ -238,9 +239,9 @@ public class IgfsServer { while (!Thread.currentThread().isInterrupted()) { dis.readFully(hdr); - final long reqId = U.bytesToLong(hdr, 0); + final long reqId = IgniteByteUtils.bytesToLong(hdr, 0); - int ordinal = U.bytesToInt(hdr, 8); + int ordinal = IgniteByteUtils.bytesToInt(hdr, 8); if (first) { // First message must be HANDSHAKE. if (reqId != 0 || ordinal != IgfsIpcCommand.HANDSHAKE.ordinal()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java index 83c987f..e2e04e9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestResponse.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.rest; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -160,7 +161,7 @@ public class GridRestResponse implements Externalizable { /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { out.writeInt(successStatus); - U.writeByteArray(out, sesTokBytes); + IgniteByteUtils.writeByteArray(out, sesTokBytes); U.writeString(out, sesTokStr); U.writeString(out, err); out.writeObject(obj); @@ -169,7 +170,7 @@ public class GridRestResponse implements Externalizable { /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { successStatus = in.readInt(); - sesTokBytes = U.readByteArray(in); + sesTokBytes = IgniteByteUtils.readByteArray(in); sesTokStr = U.readString(in); err = U.readString(in); obj = in.readObject(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java index c6557bc..30678e0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientAbstractMessage.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.rest.client.message; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; @@ -87,12 +88,12 @@ public abstract class GridClientAbstractMessage implements GridClientMessage, Ex /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { - U.writeByteArray(out, sesTok); + IgniteByteUtils.writeByteArray(out, sesTok); } /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - sesTok = U.readByteArray(in); + sesTok = IgniteByteUtils.readByteArray(in); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java index b3dd30c..0079b10 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/client/message/GridClientHandshakeRequest.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.rest.client.message; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.util.*; @@ -53,7 +54,7 @@ public class GridClientHandshakeRequest extends GridClientAbstractMessage { * @return Protocol version. */ public short version() { - return U.bytesToShort(arr, 0); + return IgniteByteUtils.bytesToShort(arr, 0); } /** @@ -92,7 +93,7 @@ public class GridClientHandshakeRequest extends GridClientAbstractMessage { public byte[] rawBytes() { byte[] ret = new byte[PACKET_SIZE]; - U.shortToBytes(PROTO_VER, ret, 0); + IgniteByteUtils.shortToBytes(PROTO_VER, ret, 0); ret[2] = (byte)(marshId << 6); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java index a42fb57..f9095b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridMemcachedMessage.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.rest.protocols.tcp; import org.apache.ignite.internal.processors.rest.client.message.*; +import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -155,12 +156,12 @@ public class GridMemcachedMessage implements GridClientMessage { /** {@inheritDoc} */ @Override public long requestId() { - return U.bytesToInt(opaque, 0); + return IgniteByteUtils.bytesToInt(opaque, 0); } /** {@inheritDoc} */ @Override public void requestId(long reqId) { - U.intToBytes((int)reqId, opaque, 0); + IgniteByteUtils.intToBytes((int) reqId, opaque, 0); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java index 1de9e36..91a22b3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java @@ -171,8 +171,8 @@ public class GridTcpRestParser implements GridNioParser { buf.put(IGNITE_REQ_FLAG); buf.putInt(40 + body.length); buf.putLong(msg.requestId()); - buf.put(U.uuidToBytes(msg.clientId())); - buf.put(U.uuidToBytes(msg.destinationId())); + buf.put(IgniteByteUtils.uuidToBytes(msg.clientId())); + buf.put(IgniteByteUtils.uuidToBytes(msg.destinationId())); buf.put(body); buf.flip(); @@ -189,8 +189,8 @@ public class GridTcpRestParser implements GridNioParser { slice.put(IGNITE_REQ_FLAG); slice.putInt(res.remaining() - 5); slice.putLong(msg.requestId()); - slice.put(U.uuidToBytes(msg.clientId())); - slice.put(U.uuidToBytes(msg.destinationId())); + slice.put(IgniteByteUtils.uuidToBytes(msg.clientId())); + slice.put(IgniteByteUtils.uuidToBytes(msg.destinationId())); return res; } @@ -227,7 +227,7 @@ public class GridTcpRestParser implements GridNioParser { tmp.write(b); if (i == 3) { - req.keyLength(U.bytesToShort(tmp.toByteArray(), 0)); + req.keyLength(IgniteByteUtils.bytesToShort(tmp.toByteArray(), 0)); tmp.reset(); } @@ -238,7 +238,7 @@ public class GridTcpRestParser implements GridNioParser { tmp.write(b); if (i == 11) { - req.totalLength(U.bytesToInt(tmp.toByteArray(), 0)); + req.totalLength(IgniteByteUtils.bytesToInt(tmp.toByteArray(), 0)); tmp.reset(); } @@ -370,7 +370,7 @@ public class GridTcpRestParser implements GridNioParser { byte[] lenBytes = statefulRead(buf, tmp, 4); if (lenBytes != null) { - len = U.bytesToInt(lenBytes, 0); + len = IgniteByteUtils.bytesToInt(lenBytes, 0); if (len == 0) return GridClientPingPacket.PING_MESSAGE; @@ -609,8 +609,8 @@ public class GridTcpRestParser implements GridNioParser { throw new IOException("Failed to parse incoming packet (flags required for command) [ses=" + ses + ", opCode=" + Integer.toHexString(req.operationCode() & 0xFF) + ']'); - keyFlags = U.bytesToShort(extras, 0); - valFlags = U.bytesToShort(extras, 2); + keyFlags = IgniteByteUtils.bytesToShort(extras, 0); + valFlags = IgniteByteUtils.bytesToShort(extras, 2); } if (req.key() != null) { @@ -636,7 +636,7 @@ public class GridTcpRestParser implements GridNioParser { throw new IOException("Failed to parse incoming packet (expiration value required for command) [ses=" + ses + ", opCode=" + Integer.toHexString(req.operationCode() & 0xFF) + ']'); - req.expiration(U.bytesToInt(extras, 4) & 0xFFFFFFFFL); + req.expiration(IgniteByteUtils.bytesToInt(extras, 4) & 0xFFFFFFFFL); } if (req.hasInitial()) { @@ -644,7 +644,7 @@ public class GridTcpRestParser implements GridNioParser { throw new IOException("Failed to parse incoming packet (initial value required for command) [ses=" + ses + ", opCode=" + Integer.toHexString(req.operationCode() & 0xFF) + ']'); - req.initial(U.bytesToLong(extras, 8)); + req.initial(IgniteByteUtils.bytesToLong(extras, 8)); } if (req.hasDelta()) { @@ -652,7 +652,7 @@ public class GridTcpRestParser implements GridNioParser { throw new IOException("Failed to parse incoming packet (delta value required for command) [ses=" + ses + ", opCode=" + Integer.toHexString(req.operationCode() & 0xFF) + ']'); - req.delta(U.bytesToLong(extras, 0)); + req.delta(IgniteByteUtils.bytesToLong(extras, 0)); } if (extras != null) { @@ -700,17 +700,17 @@ public class GridTcpRestParser implements GridNioParser { case BOOLEAN_FLAG: return bytes[0] == '1'; case INT_FLAG: - return U.bytesToInt(bytes, 0); + return IgniteByteUtils.bytesToInt(bytes, 0); case LONG_FLAG: - return U.bytesToLong(bytes, 0); + return IgniteByteUtils.bytesToLong(bytes, 0); case DATE_FLAG: - return new Date(U.bytesToLong(bytes, 0)); + return new Date(IgniteByteUtils.bytesToLong(bytes, 0)); case BYTE_FLAG: return bytes[0]; case FLOAT_FLAG: - return Float.intBitsToFloat(U.bytesToInt(bytes, 0)); + return Float.intBitsToFloat(IgniteByteUtils.bytesToInt(bytes, 0)); case DOUBLE_FLAG: - return Double.longBitsToDouble(U.bytesToLong(bytes, 0)); + return Double.longBitsToDouble(IgniteByteUtils.bytesToLong(bytes, 0)); case BYTE_ARR_FLAG: return bytes; default: @@ -739,17 +739,17 @@ public class GridTcpRestParser implements GridNioParser { flags |= BOOLEAN_FLAG; } else if (obj instanceof Integer) { - data = U.intToBytes((Integer)obj); + data = IgniteByteUtils.intToBytes((Integer) obj); flags |= INT_FLAG; } else if (obj instanceof Long) { - data = U.longToBytes((Long)obj); + data = IgniteByteUtils.longToBytes((Long) obj); flags |= LONG_FLAG; } else if (obj instanceof Date) { - data = U.longToBytes(((Date)obj).getTime()); + data = IgniteByteUtils.longToBytes(((Date) obj).getTime()); flags |= DATE_FLAG; } @@ -759,12 +759,12 @@ public class GridTcpRestParser implements GridNioParser { flags |= BYTE_FLAG; } else if (obj instanceof Float) { - data = U.intToBytes(Float.floatToIntBits((Float)obj)); + data = IgniteByteUtils.intToBytes(Float.floatToIntBits((Float) obj)); flags |= FLOAT_FLAG; } else if (obj instanceof Double) { - data = U.longToBytes(Double.doubleToLongBits((Double)obj)); + data = IgniteByteUtils.longToBytes(Double.doubleToLongBits((Double) obj)); flags |= DOUBLE_FLAG; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c1a7df/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java index de5dd47..5c75806 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridByteArrayList.java @@ -218,7 +218,7 @@ public class GridByteArrayList implements Message, Externalizable { public void add(int i) { requestFreeSize(4); - U.intToBytes(i, data, size); + IgniteByteUtils.intToBytes(i, data, size); size += 4; } @@ -231,7 +231,7 @@ public class GridByteArrayList implements Message, Externalizable { public void add(short i) { requestFreeSize(2); - U.shortToBytes(i, data, size); + IgniteByteUtils.shortToBytes(i, data, size); size += 2; } @@ -246,7 +246,7 @@ public class GridByteArrayList implements Message, Externalizable { assert pos >= 0; assert pos + 2 <= size; - U.shortToBytes(i, data, pos); + IgniteByteUtils.shortToBytes(i, data, pos); } /** @@ -259,7 +259,7 @@ public class GridByteArrayList implements Message, Externalizable { assert pos >= 0; assert pos + 4 <= size; - U.intToBytes(i, data, pos); + IgniteByteUtils.intToBytes(i, data, pos); } /** @@ -270,7 +270,7 @@ public class GridByteArrayList implements Message, Externalizable { public void add(long l) { requestFreeSize(8); - U.longToBytes(l, data, size); + IgniteByteUtils.longToBytes(l, data, size); size += 8; } @@ -285,7 +285,7 @@ public class GridByteArrayList implements Message, Externalizable { assert pos >= 0; assert pos + 8 <= size; - U.longToBytes(l, data, pos); + IgniteByteUtils.longToBytes(l, data, pos); } /** @@ -336,7 +336,7 @@ public class GridByteArrayList implements Message, Externalizable { public int getInt(int i) { assert i + 4 <= size; - return U.bytesToInt(data, i); + return IgniteByteUtils.bytesToInt(data, i); } /**
