Repository: incubator-ignite Updated Branches: refs/heads/ignite-386 e1ffc10f6 -> 50487c00f
# IGNITE-386: Compilation fixes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/50487c00 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/50487c00 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/50487c00 Branch: refs/heads/ignite-386 Commit: 50487c00fc9b9e4fc725dd33049e9d1159428b12 Parents: e1ffc10 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Mar 3 16:34:27 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Mar 3 16:34:27 2015 +0300 ---------------------------------------------------------------------- .../igfs/IgniteHadoopFileSystemAbstractSelfTest.java | 12 ++++++------ .../igfs/IgniteHadoopFileSystemClientSelfTest.java | 4 ++-- .../igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50487c00/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java index 98817ee..3d6fe4a 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemAbstractSelfTest.java @@ -412,15 +412,15 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA public void testIpcCache() throws Exception { HadoopIgfsEx hadoop = GridTestUtils.getFieldValue(fs, "rmtClient", "delegateRef", "value", "hadoop"); - if (hadoop instanceof HadoopOutProcIgfs) { + if (hadoop instanceof HadoopIgfsOutProc) { FileSystem fsOther = null; try { - Field field = HadoopIpcIgfsIo.class.getDeclaredField("ipcCache"); + Field field = HadoopIgfsIpcIo.class.getDeclaredField("ipcCache"); field.setAccessible(true); - Map<String, HadoopIpcIgfsIo> cache = (Map<String, HadoopIpcIgfsIo>)field.get(null); + Map<String, HadoopIgfsIpcIo> cache = (Map<String, HadoopIgfsIpcIo>)field.get(null); Configuration cfg = configuration(PRIMARY_AUTHORITY, skipEmbed, skipLocShmem); @@ -441,13 +441,13 @@ public abstract class IgniteHadoopFileSystemAbstractSelfTest extends IgfsCommonA assertEquals(initSize, cache.size()); - Field stopField = HadoopIpcIgfsIo.class.getDeclaredField("stopping"); + Field stopField = HadoopIgfsIpcIo.class.getDeclaredField("stopping"); stopField.setAccessible(true); - HadoopIpcIgfsIo io = null; + HadoopIgfsIpcIo io = null; - for (Map.Entry<String, HadoopIpcIgfsIo> ioEntry : cache.entrySet()) { + for (Map.Entry<String, HadoopIgfsIpcIo> ioEntry : cache.entrySet()) { if (endpoint.contains(ioEntry.getKey())) { io = ioEntry.getValue(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50487c00/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemClientSelfTest.java index 0025da3..7f9aace 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemClientSelfTest.java @@ -125,7 +125,7 @@ public class IgniteHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest try { switchHandlerErrorFlag(true); - HadoopIgfs client = new HadoopOutProcIgfs("127.0.0.1", 10500, getTestGridName(0), "igfs", LOG); + HadoopIgfs client = new HadoopIgfsOutProc("127.0.0.1", 10500, getTestGridName(0), "igfs", LOG); client.handshake(null); @@ -133,7 +133,7 @@ public class IgniteHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest HadoopIgfsStreamDelegate delegate = client.create(path, true, false, 1, 1024, null); - final HadoopOutputIgfsStream igfsOut = new HadoopOutputIgfsStream(delegate, LOG, + final HadoopIgfsOutputStream igfsOut = new HadoopIgfsOutputStream(delegate, LOG, IgfsLogger.disabledLogger(), 0); // This call should return fine as exception is thrown for the first time. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50487c00/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java index 8172935..464f87f 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemIpcCacheSelfTest.java @@ -141,15 +141,15 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTe */ @SuppressWarnings("unchecked") public void testIpcCache() throws Exception { - Field cacheField = HadoopIpcIgfsIo.class.getDeclaredField("ipcCache"); + Field cacheField = HadoopIgfsIpcIo.class.getDeclaredField("ipcCache"); cacheField.setAccessible(true); - Field activeCntField = HadoopIpcIgfsIo.class.getDeclaredField("activeCnt"); + Field activeCntField = HadoopIgfsIpcIo.class.getDeclaredField("activeCnt"); activeCntField.setAccessible(true); - Map<String, HadoopIpcIgfsIo> cache = (Map<String, HadoopIpcIgfsIo>)cacheField.get(null); + Map<String, HadoopIgfsIpcIo> cache = (Map<String, HadoopIgfsIpcIo>)cacheField.get(null); String name = "igfs:" + getTestGridName(0) + "@"; @@ -164,7 +164,7 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTe assertEquals(1, cache.size()); - HadoopIpcIgfsIo io = null; + HadoopIgfsIpcIo io = null; System.out.println("CACHE: " + cache); @@ -191,7 +191,7 @@ public class IgniteHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTe assertEquals(1, cache.size()); assertEquals(1, ((AtomicInteger)activeCntField.get(io)).get()); - Field stopField = HadoopIpcIgfsIo.class.getDeclaredField("stopping"); + Field stopField = HadoopIgfsIpcIo.class.getDeclaredField("stopping"); stopField.setAccessible(true);