ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [14/50] [abbrv] incubator-ignite git commit: # ignite-42
Date Fri, 23 Jan 2015 11:55:04 GMT
# ignite-42


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/792a8b55
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/792a8b55
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/792a8b55

Branch: refs/heads/ignite-94
Commit: 792a8b553a1ba9239142d262898ca2eb464c5fcb
Parents: cd78b9c 3c948be
Author: sboikov <semen.boikov@inria.fr>
Authored: Wed Jan 21 23:28:08 2015 +0300
Committer: sboikov <semen.boikov@inria.fr>
Committed: Wed Jan 21 23:28:08 2015 +0300

----------------------------------------------------------------------
 docs/core-site.gridgain.xml                     |  21 +++
 .../java/org/apache/ignite/cache/CacheLock.java |  25 ++--
 .../processors/cache/CacheLockAsyncImpl.java    | 141 -----------------
 .../processors/cache/CacheLockImpl.java         |  31 +---
 .../org/gridgain/grid/cache/GridCacheFlag.java  |   3 -
 .../processors/cache/GridCacheAdapter.java      |   8 +-
 .../cache/IgniteCacheExpiryPolicy.java          |  22 ++-
 .../distributed/GridCacheTtlUpdateRequest.java  |  22 ++-
 .../IgniteExternalizableExpiryPolicy.java       |  22 ++-
 .../cache/IgniteCacheAbstractTest.java          |  22 ++-
 .../cache/IgniteCacheAtomicInvokeTest.java      |  22 ++-
 .../cache/IgniteCacheAtomicLocalInvokeTest.java |  22 ++-
 ...niteCacheAtomicLocalWithStoreInvokeTest.java |  22 ++-
 .../IgniteCacheAtomicNearEnabledInvokeTest.java |  22 ++-
 ...eCacheAtomicPrimaryWriteOrderInvokeTest.java |  22 ++-
 ...micPrimaryWriteOrderWithStoreInvokeTest.java |  22 ++-
 .../cache/IgniteCacheInvokeAbstractTest.java    |  22 ++-
 .../cache/IgniteCacheInvokeReadThroughTest.java | 121 +++++++++++++++
 .../cache/IgniteCacheTxInvokeTest.java          |  22 ++-
 .../cache/IgniteCacheTxLocalInvokeTest.java     |  22 ++-
 .../IgniteCacheTxNearEnabledInvokeTest.java     |  22 ++-
 .../IgniteCacheAtomicExpiryPolicyTest.java      |  22 ++-
 .../IgniteCacheAtomicLocalExpiryPolicyTest.java |  22 ++-
 ...AtomicPrimaryWriteOrderExpiryPolicyTest.java |  22 ++-
 ...maryWriteOrderWithStoreExpiryPolicyTest.java |  22 ++-
 ...teCacheAtomicReplicatedExpiryPolicyTest.java |  22 ++-
 ...iteCacheAtomicWithStoreExpiryPolicyTest.java |  22 ++-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  22 ++-
 .../IgniteCacheExpiryPolicyTestSuite.java       |  22 ++-
 .../expiry/IgniteCacheTxExpiryPolicyTest.java   |  22 ++-
 .../IgniteCacheTxLocalExpiryPolicyTest.java     |  22 ++-
 ...IgniteCacheTxReplicatedExpiryPolicyTest.java |  22 ++-
 .../IgniteCacheTxWithStoreExpiryPolicyTest.java |  22 ++-
 .../cache/GridCacheAbstractFullApiSelfTest.java |  23 +--
 .../GridCacheMultiNodeLockAbstractTest.java     | 150 +------------------
 .../dht/GridCacheColocatedDebugTest.java        |   9 +-
 .../dht/GridCacheGlobalLoadTest.java            |  22 ++-
 .../near/GridCachePartitionedLockSelfTest.java  |  18 +--
 ...idCachePartitionedMultiNodeLockSelfTest.java |  10 --
 .../GridCacheLocalMultithreadedSelfTest.java    | 119 ---------------
 ...heGgfsPerBlockLruEvictionPolicySelfTest.java |  15 +-
 .../ggfs/GridGgfsAbstractSelfTest.java          |  20 ++-
 .../ggfs/GridGgfsMetricsSelfTest.java           |  10 +-
 .../processors/ggfs/GridGgfsModesSelfTest.java  |   6 +-
 ...IpcEndpointRegistrationAbstractSelfTest.java |  33 ++--
 ...dpointRegistrationOnLinuxAndMacSelfTest.java |   6 +-
 ...pcEndpointRegistrationOnWindowsSelfTest.java |   4 +-
 ...idIpcServerEndpointDeserializerSelfTest.java |  76 +++++-----
 .../testframework/GridGgfsTestUtils.java        |  55 -------
 .../bamboo/GridDataGridTestSuite.java           |   3 +
 .../counter/GridHadoopFSCounterWriter.java      |   4 +-
 .../counter/GridHadoopPerformanceCounter.java   |  18 ++-
 .../v2/GridHadoopV2JobResourceManager.java      |  13 +-
 .../grid/ggfs/GridGgfsEventsTestSuite.java      |  26 +++-
 ...dGgfsHadoop20FileSystemAbstractSelfTest.java |   8 +-
 ...doop20FileSystemLoopbackPrimarySelfTest.java |  11 +-
 ...sHadoop20FileSystemShmemPrimarySelfTest.java |  11 +-
 .../GridGgfsHadoopDualAbstractSelfTest.java     |  19 ++-
 ...ridGgfsHadoopFileSystemAbstractSelfTest.java |  15 +-
 .../GridGgfsHadoopFileSystemClientSelfTest.java |   5 +-
 ...idGgfsHadoopFileSystemHandshakeSelfTest.java |   7 +-
 ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java |   7 +-
 ...GgfsHadoopFileSystemLoggerStateSelfTest.java |   7 +-
 ...adoopFileSystemLoopbackAbstractSelfTest.java |   9 +-
 ...fsHadoopFileSystemSecondaryModeSelfTest.java |  12 +-
 ...fsHadoopFileSystemShmemAbstractSelfTest.java |   7 +-
 .../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java |   7 +-
 .../grid/hadoop/GridHadoopTestUtils.java        |  20 ++-
 .../hadoop/GridHadoopCommandLineTest.java       |   2 +-
 .../hadoop/GridHadoopMapReduceTest.java         |   5 +-
 70 files changed, 824 insertions(+), 890 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheFlag.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index 1f91190,af8899f..e355cf6
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@@ -4699,14 -4579,8 +4699,14 @@@ public abstract class GridCacheAdapter<
              });
          }
  
 -        return getAllAsync(keys, !ctx.config().isReadFromBackup(), /*skip tx*/false, null,
null, taskName,
 -            deserializePortable, filter);
 +        return getAllAsync(keys,
-             ctx.hasFlag(GET_PRIMARY),
++            !ctx.config().isReadFromBackup(),
 +            /*skip tx*/false,
 +            null,
 +            null,
 +            taskName,
 +            deserializePortable,
 +            filter);
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicLocalWithStoreInvokeTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPrimaryWriteOrderWithStoreInvokeTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicPrimaryWriteOrderWithStoreExpiryPolicyTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheAtomicWithStoreExpiryPolicyTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheTxWithStoreExpiryPolicyTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheGlobalLoadTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
index 01b5443,7db1221..20b71c8
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java
@@@ -18,9 -18,7 +18,8 @@@
  package org.gridgain.grid.kernal.processors.cache.distributed.near;
  
  import org.apache.ignite.*;
 +import org.apache.ignite.cache.*;
  import org.apache.ignite.configuration.*;
- import org.apache.ignite.lang.*;
  import org.apache.log4j.*;
  import org.gridgain.grid.cache.*;
  import org.gridgain.grid.kernal.processors.cache.*;
@@@ -66,15 -64,15 +65,16 @@@ public class GridCachePartitionedLockSe
          IgniteConfiguration cfg = new IgniteConfiguration();
  
          cfg.setGridName(getTestGridName(0));
-         cfg.setRestEnabled(false);
+         cfg.setClientConnectionConfiguration(null);
 -        cfg.setCacheConfiguration(new GridCacheConfiguration());
 +        cfg.setCacheConfiguration(new CacheConfiguration());
  
          final Ignite g0 = G.start(cfg);
  
          final IgniteCache<Object, Object> cache = g0.jcache(null);
  
          GridTestUtils.assertThrows(log, new Callable<Object>() {
--            @Override public Object call() throws Exception {
++            @Override
++            public Object call() throws Exception {
                  return cache.lock(1).tryLock(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
              }
          }, CacheException.class, "Locks are not supported");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedMultiNodeLockSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
index b29790e,9a87319..0a8d621
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
@@@ -160,9 -156,9 +157,9 @@@ public class GridCacheGgfsPerBlockLruEv
          ggfsCfg.setName(GGFS_SECONDARY);
          ggfsCfg.setBlockSize(512);
          ggfsCfg.setDefaultMode(PRIMARY);
-         ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap(SECONDARY_REST_CFG));
+         ggfsCfg.setIpcEndpointConfiguration(SECONDARY_REST_CFG);
  
 -        GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
 +        CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
  
          dataCacheCfg.setName("dataCache");
          dataCacheCfg.setCacheMode(PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
index 6decd26,22bd798..4fb0ead
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java
@@@ -165,9 -166,9 +167,9 @@@ public class GridGgfsMetricsSelfTest ex
          ggfsCfg.setName(GGFS_SECONDARY);
          ggfsCfg.setBlockSize(SECONDARY_BLOCK_SIZE);
          ggfsCfg.setDefaultMode(PRIMARY);
-         ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap(SECONDARY_REST_CFG));
+         ggfsCfg.setIpcEndpointConfiguration(SECONDARY_REST_CFG);
  
 -        GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
 +        CacheConfiguration dataCacheCfg = defaultCacheConfiguration();
  
          dataCacheCfg.setName("dataCache");
          dataCacheCfg.setCacheMode(PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
index 4880e78,e1f9aec..e0f6349
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java
@@@ -153,9 -151,12 +152,12 @@@ public class GridGgfsModesSelfTest exte
          ggfsCfg.setName("ggfs-secondary");
          ggfsCfg.setBlockSize(512 * 1024);
          ggfsCfg.setDefaultMode(PRIMARY);
-         ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap("{type:'tcp', port:11500}"));
+         ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
+             put("type", "tcp");
+             put("port", "11500");
+         }});
  
 -        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
 +        CacheConfiguration cacheCfg = defaultCacheConfiguration();
  
          cacheCfg.setName("partitioned");
          cacheCfg.setCacheMode(PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
index 677f13c,51da16f..a4de1f9
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
@@@ -336,37 -335,9 +336,40 @@@ public class GridDataGridTestSuite exte
          suite.addTestSuite(GridCacheMultinodeUpdateAtomicSelfTest.class);
          suite.addTestSuite(GridCacheMultinodeUpdateAtomicNearEnabledSelfTest.class);
  
 +        suite.addTestSuite(IgniteCacheAtomicLoadAllTest.class);
 +        suite.addTestSuite(IgniteCacheAtomicLocalLoadAllTest.class);
 +        suite.addTestSuite(IgniteCacheTxLoadAllTest.class);
 +        suite.addTestSuite(IgniteCacheTxLocalLoadAllTest.class);
 +
 +        suite.addTestSuite(IgniteCacheAtomicLoaderWriterTest.class);
 +        suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class);
 +        suite.addTestSuite(IgniteCacheAtomicStoreSessionTest.class);
 +        suite.addTestSuite(IgniteCacheTxStoreSessionTest.class);
 +
 +        suite.addTestSuite(IgniteCacheAtomicNoReadThroughTest.class);
 +        suite.addTestSuite(IgniteCacheAtomicNearEnabledNoReadThroughTest.class);
 +        suite.addTestSuite(IgniteCacheAtomicLocalNoReadThroughTest.class);
 +        suite.addTestSuite(IgniteCacheTxNoReadThroughTest.class);
 +        suite.addTestSuite(IgniteCacheTxNearEnabledNoReadThroughTest.class);
 +        suite.addTestSuite(IgniteCacheTxLocalNoReadThroughTest.class);
 +
 +        suite.addTestSuite(IgniteCacheAtomicNoLoadPreviousValueTest.class);
 +        suite.addTestSuite(IgniteCacheAtomicNearEnabledNoLoadPreviousValueTest.class);
 +        suite.addTestSuite(IgniteCacheAtomicLocalNoLoadPreviousValueTest.class);
 +        suite.addTestSuite(IgniteCacheTxNoLoadPreviousValueTest.class);
 +        suite.addTestSuite(IgniteCacheTxNearEnabledNoLoadPreviousValueTest.class);
 +        suite.addTestSuite(IgniteCacheTxLocalNoLoadPreviousValueTest.class);
 +
 +        suite.addTestSuite(IgniteCacheAtomicNoWriteThroughTest.class);
 +        suite.addTestSuite(IgniteCacheAtomicNearEnabledNoWriteThroughTest.class);
 +        suite.addTestSuite(IgniteCacheAtomicLocalNoWriteThroughTest.class);
 +        suite.addTestSuite(IgniteCacheTxNoWriteThroughTest.class);
 +        suite.addTestSuite(IgniteCacheTxNearEnabledNoWriteThroughTest.class);
 +        suite.addTestSuite(IgniteCacheTxLocalNoWriteThroughTest.class);
 +
+         // TODO: IGNITE-114.
+         // suite.addTestSuite(IgniteCacheInvokeReadThroughTest.class);
+ 
          return suite;
      }
  }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
----------------------------------------------------------------------
diff --cc modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
index a030640,948f19f..83332b8
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java
@@@ -84,9 -83,12 +84,12 @@@ public class GridGgfsHadoopFileSystemLo
          ggfsCfg.setName("ggfs");
          ggfsCfg.setBlockSize(512 * 1024);
          ggfsCfg.setDefaultMode(PRIMARY);
-         ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap("{type:'tcp', port:10500}"));
+         ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
+             put("type", "tcp");
+             put("port", "10500");
+         }});
  
 -        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
 +        CacheConfiguration cacheCfg = defaultCacheConfiguration();
  
          cacheCfg.setName("partitioned");
          cacheCfg.setCacheMode(PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
----------------------------------------------------------------------
diff --cc modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
index c9d836f,63b2dc5..ee0f886
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java
@@@ -157,9 -159,12 +160,12 @@@ public class GridGgfsHadoopFileSystemSe
          ggfsCfg.setName("ggfs-secondary");
          ggfsCfg.setBlockSize(512 * 1024);
          ggfsCfg.setDefaultMode(PRIMARY);
-         ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap("{type:'tcp', port:11500}"));
+         ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{
+             put("type", "tcp");
+             put("port", "11500");
+         }});
  
 -        GridCacheConfiguration cacheCfg = defaultCacheConfiguration();
 +        CacheConfiguration cacheCfg = defaultCacheConfiguration();
  
          cacheCfg.setName("partitioned");
          cacheCfg.setCacheMode(PARTITIONED);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/792a8b55/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java
----------------------------------------------------------------------


Mime
View raw message