[IGNITE-1058]: GridIoPolicy: Switch from enum to collection of byte constants.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b437ec73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b437ec73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b437ec73 Branch: refs/heads/ignite-1056 Commit: b437ec73dbc15388d1a9a526dc43e7a74abdc288 Parents: 91e1cb2 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Thu Jul 2 13:26:22 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Thu Jul 2 13:26:22 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 1 - .../managers/communication/GridIoManager.java | 124 +++++++++++++++---- .../managers/communication/GridIoMessage.java | 15 ++- .../managers/communication/GridIoPolicy.java | 32 ++--- .../eventstorage/GridEventStorageManager.java | 2 +- .../internal/processors/cache/CacheType.java | 8 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheIoManager.java | 12 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java | 9 +- .../GridDistributedTxRemoteAdapter.java | 3 +- .../distributed/dht/GridDhtTxFinishRequest.java | 3 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../cache/distributed/dht/GridDhtTxRemote.java | 5 +- .../near/GridNearTxFinishRequest.java | 3 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../distributed/near/GridNearTxRemote.java | 5 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 3 +- .../internal/processors/igfs/IgfsContext.java | 5 +- .../plugin/IgnitePluginProcessor.java | 3 +- .../plugin/extensions/communication/IoPool.java | 42 +++++++ .../communication/GridIoManagerSelfTest.java | 2 +- .../cache/IgniteInternalCacheTypesTest.java | 3 +- 26 files changed, 202 insertions(+), 116 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/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 e19d3d3..30931fa 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 @@ -77,7 +77,6 @@ import javax.management.*; import java.io.*; import java.lang.management.*; import java.lang.reflect.*; -import java.security.*; import java.text.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index d8dcc2c..c1fb79a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -69,6 +69,9 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa /** Disconnect listeners. */ private final Collection<GridDisconnectListener> disconnectLsnrs = new ConcurrentLinkedQueue<>(); + /** Map of {@link IoPool}-s injected by Ignite plugins. */ + private final IoPool[] ioPools = new IoPool[128]; + /** Public pool. */ private ExecutorService pubPool; @@ -255,6 +258,41 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa if (log.isDebugEnabled()) log.debug(startInfo()); + + registerIoPoolExtensions(); + } + + /** + * Processes IO messaging pool extensions. + * @throws IgniteCheckedException On error. + */ + private void registerIoPoolExtensions() throws IgniteCheckedException { + // Process custom IO messaging pool extensions: + final IoPool[] executorExtensions = ctx.plugins().extensions(IoPool.class); + + if (executorExtensions != null) { + // Store it into the map and check for duplicates: + for (IoPool ex : executorExtensions) { + final byte id = ex.id(); + + // 1. Check the pool id is non-negative: + if (id < 0) + throw new IgniteCheckedException("Failed to register IO executor pool because its Id is negative " + + "[id=" + id + ']'); + + // 2. Check the pool id is in allowed range: + if (isReservedGridIoPolicy(id)) + throw new IgniteCheckedException("Failed to register IO executor pool because its Id in in the " + + "reserved range (0-31) [id=" + id + ']'); + + // 3. Check the pool for duplicates: + if (ioPools[id] != null) + throw new IgniteCheckedException("Failed to register IO executor pool because its " + + "Id as already used [id=" + id + ']'); + + ioPools[id] = ex; + } + } } /** {@inheritDoc} */ @@ -451,6 +489,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa if (log.isDebugEnabled()) log.debug(stopInfo()); + + Arrays.fill(ioPools, null); } /** @@ -518,7 +558,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa // If message is P2P, then process in P2P service. // This is done to avoid extra waiting and potential deadlocks // as thread pool may not have any available threads to give. - GridIoPolicy plc = msg.policy(); + byte plc = msg.policy(); switch (plc) { case P2P_POOL: { @@ -532,7 +572,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa case MANAGEMENT_POOL: case AFFINITY_POOL: case UTILITY_CACHE_POOL: - case MARSH_CACHE_POOL: { + case MARSH_CACHE_POOL: + { if (msg.isOrdered()) processOrderedMessage(nodeId, msg, plc, msgC); else @@ -540,6 +581,18 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa break; } + + default: + assert plc >= 0 : "Negative policy: " + plc; + + if (isReservedGridIoPolicy(plc)) + throw new IgniteCheckedException("Failed to process message with policy of reserved range. " + + "[policy=" + plc + ']'); + + if (msg.isOrdered()) + processOrderedMessage(nodeId, msg, plc, msgC); + else + processRegularMessage(nodeId, msg, plc, msgC); } } catch (IgniteCheckedException e) { @@ -556,7 +609,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa * @param plc Policy. * @return Execution pool. */ - private Executor pool(GridIoPolicy plc) { + private Executor pool(byte plc) throws IgniteCheckedException { switch (plc) { case P2P_POOL: return p2pPool; @@ -580,10 +633,27 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa return marshCachePool; default: { - assert false : "Invalid communication policy: " + plc; + assert plc >= 0 : "Negative policy: " + plc; + + if (isReservedGridIoPolicy(plc)) + throw new IgniteCheckedException("Failed to process message with policy of reserved" + + " range (0-31), [policy=" + plc + ']'); + + IoPool pool = ioPools[plc]; + + if (pool == null) + throw new IgniteCheckedException("Failed to process message because no pool is registered " + + "for policy. [policy=" + plc + ']'); + + assert plc == pool.id(); + + Executor ex = pool.executor(); - // Never reached. - return null; + if (ex == null) + throw new IgniteCheckedException("Failed to process message because corresponding executor " + + "is null. [id=" + plc + ']'); + + return ex; } } } @@ -643,9 +713,9 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa private void processRegularMessage( final UUID nodeId, final GridIoMessage msg, - GridIoPolicy plc, + byte plc, final IgniteRunnable msgC - ) { + ) throws IgniteCheckedException { Runnable c = new Runnable() { @Override public void run() { try { @@ -701,9 +771,9 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa private void processOrderedMessage( final UUID nodeId, final GridIoMessage msg, - final GridIoPolicy plc, + final byte plc, @Nullable final IgniteRunnable msgC - ) { + ) throws IgniteCheckedException { assert msg != null; long timeout = msg.timeout(); @@ -908,7 +978,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa Object topic, int topicOrd, Message msg, - GridIoPolicy plc, + byte plc, boolean ordered, long timeout, boolean skipOnTimeout @@ -916,7 +986,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa assert node != null; assert topic != null; assert msg != null; - assert plc != null; GridIoMessage ioMsg = new GridIoMessage(plc, topic, topicOrd, msg, ordered, timeout, skipOnTimeout); @@ -956,7 +1025,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa * @param plc Type of processing. * @throws IgniteCheckedException Thrown in case of any errors. */ - public void send(UUID nodeId, Object topic, Message msg, GridIoPolicy plc) + public void send(UUID nodeId, Object topic, Message msg, byte plc) throws IgniteCheckedException { ClusterNode node = ctx.discovery().node(nodeId); @@ -974,7 +1043,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa * @throws IgniteCheckedException Thrown in case of any errors. */ @SuppressWarnings("TypeMayBeWeakened") - public void send(UUID nodeId, GridTopic topic, Message msg, GridIoPolicy plc) + public void send(UUID nodeId, GridTopic topic, Message msg, byte plc) throws IgniteCheckedException { ClusterNode node = ctx.discovery().node(nodeId); @@ -991,7 +1060,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa * @param plc Type of processing. * @throws IgniteCheckedException Thrown in case of any errors. */ - public void send(ClusterNode node, Object topic, Message msg, GridIoPolicy plc) + public void send(ClusterNode node, Object topic, Message msg, byte plc) throws IgniteCheckedException { send(node, topic, -1, msg, plc, false, 0, false); } @@ -1003,7 +1072,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa * @param plc Type of processing. * @throws IgniteCheckedException Thrown in case of any errors. */ - public void send(ClusterNode node, GridTopic topic, Message msg, GridIoPolicy plc) + public void send(ClusterNode node, GridTopic topic, Message msg, byte plc) throws IgniteCheckedException { send(node, topic, topic.ordinal(), msg, plc, false, 0, false); } @@ -1021,7 +1090,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa ClusterNode node, Object topic, Message msg, - GridIoPolicy plc, + byte plc, long timeout, boolean skipOnTimeout ) throws IgniteCheckedException { @@ -1043,7 +1112,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa UUID nodeId, Object topic, Message msg, - GridIoPolicy plc, + byte plc, long timeout, boolean skipOnTimeout ) throws IgniteCheckedException { @@ -1070,7 +1139,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa Collection<? extends ClusterNode> nodes, Object topic, Message msg, - GridIoPolicy plc, + byte plc, long timeout, boolean skipOnTimeout ) @@ -1091,7 +1160,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa Collection<? extends ClusterNode> nodes, Object topic, Message msg, - GridIoPolicy plc + byte plc ) throws IgniteCheckedException { send(nodes, topic, -1, msg, plc, false, 0, false); } @@ -1107,7 +1176,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa Collection<? extends ClusterNode> nodes, GridTopic topic, Message msg, - GridIoPolicy plc + byte plc ) throws IgniteCheckedException { send(nodes, topic, topic.ordinal(), msg, plc, false, 0, false); } @@ -1247,7 +1316,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa Object topic, int topicOrd, Message msg, - GridIoPolicy plc, + byte plc, boolean ordered, long timeout, boolean skipOnTimeout @@ -1255,7 +1324,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa assert nodes != null; assert topic != null; assert msg != null; - assert plc != null; if (!ordered) assert F.find(nodes, null, F.localNode(locNodeId)) == null : @@ -1371,6 +1439,9 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa for (GridCommunicationMessageSet msgSet : msgSets) unwindMessageSet(msgSet, lsnr); } + catch (IgniteCheckedException ice) { + throw new IgniteException(ice); + } } } @@ -1840,7 +1911,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa private final Object topic; /** */ - private final GridIoPolicy plc; + private final byte plc; /** */ @GridToStringInclude @@ -1868,7 +1939,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa * @param msgC Message closure (may be {@code null}). */ GridCommunicationMessageSet( - GridIoPolicy plc, + byte plc, Object topic, UUID nodeId, long timeout, @@ -1878,7 +1949,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa ) { assert nodeId != null; assert topic != null; - assert plc != null; assert msg != null; this.plc = plc; @@ -1971,7 +2041,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa /** * @return Communication policy. */ - GridIoPolicy policy() { + byte policy() { return plc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java index 5c1122b..6cf1ae5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessage.java @@ -33,7 +33,7 @@ public class GridIoMessage implements Message { private static final long serialVersionUID = 0L; /** Policy. */ - private GridIoPolicy plc; + private byte plc; /** Message topic. */ @GridToStringInclude @@ -76,7 +76,7 @@ public class GridIoMessage implements Message { * @param skipOnTimeout Whether message can be skipped on timeout. */ public GridIoMessage( - GridIoPolicy plc, + byte plc, Object topic, int topicOrd, Message msg, @@ -84,7 +84,6 @@ public class GridIoMessage implements Message { long timeout, boolean skipOnTimeout ) { - assert plc != null; assert topic != null; assert topicOrd <= Byte.MAX_VALUE; assert msg != null; @@ -101,7 +100,7 @@ public class GridIoMessage implements Message { /** * @return Policy. */ - GridIoPolicy policy() { + byte policy() { return plc; } @@ -203,7 +202,7 @@ public class GridIoMessage implements Message { writer.incrementState(); case 2: - if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1)) + if (!writer.writeByte("plc", plc)) return false; writer.incrementState(); @@ -262,14 +261,14 @@ public class GridIoMessage implements Message { reader.incrementState(); case 2: - byte plcOrd; + byte plc0; - plcOrd = reader.readByte("plc"); + plc0 = reader.readByte("plc"); if (!reader.isLastRead()) return false; - plc = GridIoPolicy.fromOrdinal(plcOrd); + plc = plc0; reader.incrementState(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java index 6e45043..b091d44 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java @@ -17,44 +17,38 @@ package org.apache.ignite.internal.managers.communication; -import org.jetbrains.annotations.*; - /** * This enumeration defines different types of communication * message processing by the communication manager. */ -public enum GridIoPolicy { +public class GridIoPolicy { /** Public execution pool. */ - PUBLIC_POOL, + public static final byte PUBLIC_POOL = 0; /** P2P execution pool. */ - P2P_POOL, + public static final byte P2P_POOL = 1; /** System execution pool. */ - SYSTEM_POOL, + public static final byte SYSTEM_POOL = 2; /** Management execution pool. */ - MANAGEMENT_POOL, + public static final byte MANAGEMENT_POOL = 3; /** Affinity fetch pool. */ - AFFINITY_POOL, + public static final byte AFFINITY_POOL = 4; /** Utility cache execution pool. */ - UTILITY_CACHE_POOL, + public static final byte UTILITY_CACHE_POOL = 5; /** Marshaller cache execution pool. */ - MARSH_CACHE_POOL; - - /** Enum values. */ - private static final GridIoPolicy[] VALS = values(); + public static final byte MARSH_CACHE_POOL = 6; /** - * Efficiently gets enumerated value from its ordinal. - * - * @param ord Ordinal value. - * @return Enumerated value. + * Defines the range of reserved pools that are not available for plugins. + * @param key The key. + * @return If the key corresponds to reserved pool range. */ - @Nullable public static GridIoPolicy fromOrdinal(int ord) { - return ord >= 0 && ord < VALS.length ? VALS[ord] : null; + public static boolean isReservedGridIoPolicy(byte key) { + return key >= 0 && key <= 31; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java index 95c5eb1..365076b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java @@ -986,7 +986,7 @@ public class GridEventStorageManager extends GridManagerAdapter<EventStorageSpi> * @throws IgniteCheckedException If sending failed. */ private void sendMessage(Collection<? extends ClusterNode> nodes, GridTopic topic, - GridEventStorageMessage msg, GridIoPolicy plc) throws IgniteCheckedException { + GridEventStorageMessage msg, byte plc) throws IgniteCheckedException { ClusterNode locNode = F.find(nodes, null, F.localNode(ctx.localNodeId())); Collection<? extends ClusterNode> rmtNodes = F.view(nodes, F.remoteNodes(ctx.localNodeId())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheType.java index e0747b9..954bfe5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheType.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheType.java @@ -17,8 +17,6 @@ package org.apache.ignite.internal.processors.cache; -import org.apache.ignite.internal.managers.communication.*; - import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; /** @@ -49,13 +47,13 @@ public enum CacheType { private final boolean userCache; /** */ - private final GridIoPolicy ioPlc; + private final byte ioPlc; /** * @param userCache {@code True} if cache created by user. * @param ioPlc Cache IO policy. */ - CacheType(boolean userCache, GridIoPolicy ioPlc) { + CacheType(boolean userCache, byte ioPlc) { this.userCache = userCache; this.ioPlc = ioPlc; } @@ -63,7 +61,7 @@ public enum CacheType { /** * @return Cache IO policy. */ - public GridIoPolicy ioPolicy() { + public byte ioPolicy() { return ioPlc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 9b7801c..580e452 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -170,7 +170,7 @@ public class GridCacheContext<K, V> implements Externalizable { private CacheType cacheType; /** IO policy. */ - private GridIoPolicy plc; + private byte plc; /** Default expiry policy. */ private ExpiryPolicy expiryPlc; @@ -459,7 +459,7 @@ public class GridCacheContext<K, V> implements Externalizable { /** * @return IO policy for the given cache. */ - public GridIoPolicy ioPolicy() { + public byte ioPolicy() { return plc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 74a4512..0707096 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -309,7 +309,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { * @param plc grid io policy. */ private void sendResponseOnFailedMessage(UUID nodeId, GridCacheMessage res, GridCacheSharedContext cctx, - GridIoPolicy plc) { + byte plc) { try { cctx.io().send(nodeId, res, plc); } @@ -580,7 +580,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { * @throws ClusterTopologyCheckedException If receiver left. */ @SuppressWarnings("unchecked") - public void send(ClusterNode node, GridCacheMessage msg, GridIoPolicy plc) throws IgniteCheckedException { + public void send(ClusterNode node, GridCacheMessage msg, byte plc) throws IgniteCheckedException { assert !node.isLocal(); onSend(msg, node.id()); @@ -627,7 +627,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { * @throws IgniteCheckedException If send failed. */ @SuppressWarnings({"BusyWait", "unchecked"}) - public boolean safeSend(Collection<? extends ClusterNode> nodes, GridCacheMessage msg, GridIoPolicy plc, + public boolean safeSend(Collection<? extends ClusterNode> nodes, GridCacheMessage msg, byte plc, @Nullable IgnitePredicate<ClusterNode> fallback) throws IgniteCheckedException { assert nodes != null; assert msg != null; @@ -739,7 +739,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { * @param plc IO policy. * @throws IgniteCheckedException If sending failed. */ - public void send(UUID nodeId, GridCacheMessage msg, GridIoPolicy plc) throws IgniteCheckedException { + public void send(UUID nodeId, GridCacheMessage msg, byte plc) throws IgniteCheckedException { ClusterNode n = cctx.discovery().node(nodeId); if (n == null) @@ -757,7 +757,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { * @param timeout Timeout to keep a message on receiving queue. * @throws IgniteCheckedException Thrown in case of any errors. */ - public void sendOrderedMessage(ClusterNode node, Object topic, GridCacheMessage msg, GridIoPolicy plc, + public void sendOrderedMessage(ClusterNode node, Object topic, GridCacheMessage msg, byte plc, long timeout) throws IgniteCheckedException { onSend(msg, node.id()); @@ -807,7 +807,7 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { */ public void sendNoRetry(ClusterNode node, GridCacheMessage msg, - GridIoPolicy plc) + byte plc) throws IgniteCheckedException { assert node != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java index 986e211..7a84f9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.tostring.*; @@ -68,7 +67,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { private boolean sys; /** IO policy. */ - private GridIoPolicy plc; + private byte plc; /** * Empty constructor required by {@link Externalizable}. @@ -99,7 +98,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { boolean commit, boolean invalidate, boolean sys, - GridIoPolicy plc, + byte plc, boolean syncCommit, boolean syncRollback, GridCacheVersion baseVer, @@ -135,7 +134,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { /** * @return IO policy. */ - public GridIoPolicy policy() { + public byte policy() { return plc; } @@ -268,7 +267,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { writer.incrementState(); case 12: - if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1)) + if (!writer.writeByte("plc", plc)) return false; writer.incrementState(); @@ -367,7 +366,7 @@ public class GridDistributedTxFinishRequest extends GridDistributedBaseMessage { if (!reader.isLastRead()) return false; - plc = GridIoPolicy.fromOrdinal(plcOrd); + plc = plcOrd; reader.incrementState(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java index 3078277..20aa833 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; @@ -105,7 +104,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage private boolean sys; /** IO policy. */ - private GridIoPolicy plc; + private byte plc; /** * Required by {@link Externalizable}. @@ -163,7 +162,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage /** * @return IO policy. */ - public GridIoPolicy policy() { + public byte policy() { return plc; } @@ -377,7 +376,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage writer.incrementState(); case 13: - if (!writer.writeByte("plc", plc != null ? (byte)plc.ordinal() : -1)) + if (!writer.writeByte("plc", plc)) return false; writer.incrementState(); @@ -510,7 +509,7 @@ public class GridDistributedTxPrepareRequest extends GridDistributedBaseMessage if (!reader.isLastRead()) return false; - plc = GridIoPolicy.fromOrdinal(plcOrd); + plc = plcOrd; reader.incrementState(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java index ac5395d..ef5d3d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed; import org.apache.ignite.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.internal.processors.cache.transactions.*; @@ -105,7 +104,7 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter GridCacheVersion xidVer, GridCacheVersion commitVer, boolean sys, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, boolean invalidate, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java index a493ebb..fe72b24 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.tostring.*; @@ -111,7 +110,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { boolean commit, boolean invalidate, boolean sys, - GridIoPolicy plc, + byte plc, boolean sysInvalidate, boolean syncCommit, boolean syncRollback, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java index 841cac8..6a72c89 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; @@ -106,7 +105,7 @@ public class GridDhtTxLocal extends GridDhtTxLocalAdapter implements GridCacheMa boolean implicitSingle, boolean sys, boolean explicitLock, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java index 90edb0f..b50a010 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocalAdapter.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; @@ -100,7 +99,7 @@ public abstract class GridDhtTxLocalAdapter extends IgniteTxLocalAdapter { boolean implicitSingle, boolean sys, boolean explicitLock, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java index 0a69910..ae13a10 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.dht; import org.apache.ignite.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; @@ -90,7 +89,7 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter { GridCacheVersion xidVer, GridCacheVersion commitVer, boolean sys, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, boolean invalidate, @@ -149,7 +148,7 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter { GridCacheVersion xidVer, GridCacheVersion commitVer, boolean sys, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, boolean invalidate, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java index 15f42ff..26e4bdc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.internal.processors.affinity.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.util.tostring.*; @@ -84,7 +83,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { boolean commit, boolean invalidate, boolean sys, - GridIoPolicy plc, + byte plc, boolean syncCommit, boolean syncRollback, boolean explicitLock, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java index fa8877a..cb391e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; @@ -111,7 +110,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter { boolean implicit, boolean implicitSingle, boolean sys, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java index 49283cb..4ac81f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache.distributed.near; import org.apache.ignite.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.internal.processors.cache.transactions.*; @@ -86,7 +85,7 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter { GridCacheVersion xidVer, GridCacheVersion commitVer, boolean sys, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, boolean invalidate, @@ -143,7 +142,7 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter { GridCacheVersion xidVer, GridCacheVersion commitVer, boolean sys, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, boolean invalidate, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java index cb86e0d..b16e950 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java @@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.cache.transactions; import org.apache.ignite.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; @@ -246,7 +245,7 @@ public interface IgniteInternalTx extends AutoCloseable, GridTimeoutObject { /** * @return Pool where message for the given transaction must be processed. */ - public GridIoPolicy ioPolicy(); + public byte ioPolicy(); /** * @return Last recorded topology version. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index 9e8950f..709c208 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.transactions; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; @@ -136,7 +135,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter private boolean sys; /** IO policy. */ - private GridIoPolicy plc; + private byte plc; /** */ protected boolean onePhaseCommit; @@ -238,7 +237,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter boolean implicitSingle, boolean loc, boolean sys, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, @@ -296,7 +295,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter GridCacheVersion startVer, long threadId, boolean sys, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, @@ -399,7 +398,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter } /** {@inheritDoc} */ - @Override public GridIoPolicy ioPolicy() { + @Override public byte ioPolicy() { return plc; } @@ -1716,7 +1715,7 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter throw new IllegalStateException("Deserialized transaction can only be used as read-only."); } - @Override public GridIoPolicy ioPolicy() { + @Override public byte ioPolicy() { throw new IllegalStateException("Deserialized transaction can only be used as read-only."); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 7bc9042..0a61b1a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache.transactions; import org.apache.ignite.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; @@ -128,7 +127,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter boolean implicit, boolean implicitSingle, boolean sys, - GridIoPolicy plc, + byte plc, TransactionConcurrency concurrency, TransactionIsolation isolation, long timeout, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java index 475a7fc..24b56d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.util.typedef.*; import org.jetbrains.annotations.*; @@ -148,7 +147,7 @@ public class IgfsContext { * @param plc Policy. * @throws IgniteCheckedException In case of error. */ - public void send(UUID nodeId, Object topic, IgfsCommunicationMessage msg, GridIoPolicy plc) + public void send(UUID nodeId, Object topic, IgfsCommunicationMessage msg, byte plc) throws IgniteCheckedException { if (!kernalContext().localNodeId().equals(nodeId)) msg.prepareMarshal(kernalContext().config().getMarshaller()); @@ -163,7 +162,7 @@ public class IgfsContext { * @param plc Policy. * @throws IgniteCheckedException In case of error. */ - public void send(ClusterNode node, Object topic, IgfsCommunicationMessage msg, GridIoPolicy plc) + public void send(ClusterNode node, Object topic, IgfsCommunicationMessage msg, byte plc) throws IgniteCheckedException { if (!kernalContext().localNodeId().equals(node.id())) msg.prepareMarshal(kernalContext().config().getMarshaller()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java index ecc6924..5e24b4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java @@ -28,7 +28,6 @@ import org.jetbrains.annotations.*; import java.io.*; import java.lang.reflect.*; -import java.security.*; import java.util.*; /** @@ -176,7 +175,7 @@ public class IgnitePluginProcessor extends GridProcessorAdapter { } /** - * Print plugin information. + * Print plugins information. */ private void ackPluginsInfo() { U.quietAndInfo(log, "Configured plugins:"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java new file mode 100644 index 0000000..e87b82c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/IoPool.java @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.plugin.extensions.communication; + +import org.apache.ignite.plugin.*; + +import java.util.concurrent.*; + +/** + * The interface of IO Messaging Pool Extension. + */ +public interface IoPool extends Extension { + /** + * Gets the numeric identifier of the pool. This identifier is to be taken from serialized + * message and used to find the appropriate executor pool to process it. + * + * @return The id. + */ + public byte id(); + + /** + * Gets the Executor for this Pool. Cannot be null. + * + * @return The executor. + */ + public Executor executor(); +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java index 3890716..eb1fd88 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/GridIoManagerSelfTest.java @@ -189,7 +189,7 @@ public class GridIoManagerSelfTest extends GridCommonAbstractTest { } /** {@inheritDoc} */ - @Override public void send(ClusterNode node, GridTopic topic, Message msg, GridIoPolicy plc) + @Override public void send(ClusterNode node, GridTopic topic, Message msg, byte plc) throws IgniteCheckedException { // No-op. } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b437ec73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java index c9da7c5..8c2a0f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java @@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; -import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -146,7 +145,7 @@ public class IgniteInternalCacheTypesTest extends GridCommonAbstractTest { private void checkCache( Ignite ignite, String name, - GridIoPolicy plc, + byte plc, boolean user, boolean sysTx) { GridCacheAdapter cache = ((IgniteKernal)ignite).context().cache().internalCache(name);
