IGNITE-426 Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ef4a8ac2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ef4a8ac2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ef4a8ac2 Branch: refs/heads/ignite-426-2-reb Commit: ef4a8ac2ff57912ed583f1968fbd6ee9d61d4102 Parents: 461c55a Author: nikolay_tikhonov <[email protected]> Authored: Fri Oct 23 13:20:00 2015 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Wed Oct 28 15:24:35 2015 +0300 ---------------------------------------------------------------------- .../GridDistributedTxRemoteAdapter.java | 2 ++ .../cache/distributed/near/GridNearTxRemote.java | 7 +++++++ .../continuous/CacheContinuousQueryEntry.java | 19 +------------------ 3 files changed, 10 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ef4a8ac2/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 c972f43..d824805 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 @@ -286,6 +286,8 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter if (writeMap != null && !writeMap.isEmpty() && idxs != null && idxs.length > 0) { int i = 0; + assert writeMap.size() == idxs.length : "Map size: " + writeMap.size() + ", idxs size: " + idxs.length; + for (IgniteTxEntry txEntry : writeMap.values()) { txEntry.partIdx(idxs[i]); http://git-wip-us.apache.org/repos/asf/ignite/blob/ef4a8ac2/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 87c68b2..50cbf4b 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 @@ -230,6 +230,13 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter { } /** + * @param idxs Partition indexes. + */ + @Override public void setPartitionUpdateIdx(long[] idxs) { + // No-op. + } + + /** * Adds owned versions to map. * * @param vers Map of owned versions. http://git-wip-us.apache.org/repos/asf/ignite/blob/ef4a8ac2/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 d96c824..896751e 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 @@ -46,10 +46,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { private static final byte BACKUP_ENTRY = 0b0001; /** */ - private static final byte ORDERED_ENTRY = 0b0010; - - /** */ - private static final byte FILTERED_ENTRY = 0b0100; + private static final byte FILTERED_ENTRY = 0b0010; /** */ private static final EventType[] EVT_TYPE_VALS = EventType.values(); @@ -178,13 +175,6 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { } /** - * Mark that entry ordered. - */ - void markOrdered() { - flags |= ORDERED_ENTRY; - } - - /** * Mark that entry filtered. */ void markFiltered() { @@ -199,13 +189,6 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { } /** - * @return {@code True} . - */ - boolean isOrdered() { - return (flags & ORDERED_ENTRY) != 0; - } - - /** * @return {@code True} if entry was filtered. */ boolean filtered() {
