You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/04/26 13:25:26 UTC
[15/50] [abbrv] ignite git commit: Fixed failures in
IgniteCacheJoinQueryWithAffinityKeyTest.
Fixed failures in IgniteCacheJoinQueryWithAffinityKeyTest.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d0da14c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d0da14c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d0da14c
Branch: refs/heads/master
Commit: 8d0da14c547022f8c9cc429531faee59a812f9a5
Parents: 234bb5a
Author: devozerov <vo...@gridgain.com>
Authored: Tue Apr 25 11:02:31 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Apr 25 11:02:31 2017 +0300
----------------------------------------------------------------------
...IgniteCacheJoinQueryWithAffinityKeyTest.java | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8d0da14c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
index e08fa55..de81da3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
@@ -23,9 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.Callable;
import java.util.concurrent.ThreadLocalRandom;
-import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheKeyConfiguration;
@@ -42,7 +40,6 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -181,22 +178,11 @@ public class IgniteCacheJoinQueryWithAffinityKeyTest extends GridCommonAbstractT
for (int i = 0; i < NODES; i++) {
log.info("Test node: " + i);
- final IgniteCache cache0 = ignite(i).cache(ccfg.getName());
+ IgniteCache cache0 = ignite(i).cache(ccfg.getName());
- if (cacheMode == REPLICATED && !ignite(i).configuration().isClientMode()) {
- GridTestUtils.assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- checkPersonAccountsJoin(cache0, putData.personAccounts, affKey);
+ checkPersonAccountsJoin(cache0, putData.personAccounts, affKey);
- return null;
- }
- }, CacheException.class, "Queries using distributed JOINs have to be run on partitioned cache");
- }
- else {
- checkPersonAccountsJoin(cache0, putData.personAccounts, affKey);
-
- checkOrganizationPersonsJoin(cache0, putData.orgPersons);
- }
+ checkOrganizationPersonsJoin(cache0, putData.orgPersons);
}
}
finally {