http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java index 63b6c1e..c21cfe7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java @@ -46,17 +46,17 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); /** GGFS. */ - protected static IgniteFs ggfs; + protected static IgniteFs igfs; /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { - IgfsConfiguration ggfsCfg = new IgfsConfiguration(); + IgfsConfiguration igfsCfg = new IgfsConfiguration(); - ggfsCfg.setDataCacheName("dataCache"); - ggfsCfg.setMetaCacheName("metaCache"); - ggfsCfg.setName("igfs"); - ggfsCfg.setBlockSize(512); - ggfsCfg.setDefaultMode(PRIMARY); + igfsCfg.setDataCacheName("dataCache"); + igfsCfg.setMetaCacheName("metaCache"); + igfsCfg.setName("igfs"); + igfsCfg.setBlockSize(512); + igfsCfg.setDefaultMode(PRIMARY); CacheConfiguration dataCacheCfg = new CacheConfiguration(); @@ -87,11 +87,11 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); - cfg.setIgfsConfiguration(ggfsCfg); + cfg.setIgfsConfiguration(igfsCfg); Ignite g = G.start(cfg); - ggfs = g.fileSystem("igfs"); + igfs = g.fileSystem("igfs"); } /** {@inheritDoc} */ @@ -101,7 +101,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - ggfs.format(); + igfs.format(); } /** @@ -153,7 +153,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { * @throws Exception In case of exception. */ protected IgfsInputStream read() throws Exception { - return ggfs.open(FILE); + return igfs.open(FILE); } /** @@ -163,7 +163,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { * @throws Exception In case of exception. */ protected void write(byte[]... chunks) throws Exception { - IgfsOutputStream os = ggfs.create(FILE, true); + IgfsOutputStream os = igfs.create(FILE, true); if (chunks != null) { for (byte[] chunk : chunks)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsByteDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsByteDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsByteDelimiterRecordResolverSelfTest.java index 5fb19dc..b5e6e3e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsByteDelimiterRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsByteDelimiterRecordResolverSelfTest.java @@ -291,7 +291,7 @@ public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordR IgfsFileRange split; try (IgfsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); + split = rslvr.resolveRecords(igfs, is, split(suggestedStart, suggestedLen)); } assert split != null : "Split is null."; @@ -317,7 +317,7 @@ public class IgfsByteDelimiterRecordResolverSelfTest extends IgfsAbstractRecordR IgfsFileRange split; try (IgfsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); + split = rslvr.resolveRecords(igfs, is, split(suggestedStart, suggestedLen)); } assert split == null : "Split is not null."; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsFixedLengthRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsFixedLengthRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsFixedLengthRecordResolverSelfTest.java index 03ac32c..a498a9b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsFixedLengthRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsFixedLengthRecordResolverSelfTest.java @@ -103,7 +103,7 @@ public class IgfsFixedLengthRecordResolverSelfTest extends IgfsAbstractRecordRes IgfsFileRange split; try (IgfsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); + split = rslvr.resolveRecords(igfs, is, split(suggestedStart, suggestedLen)); } assert split != null : "Split is null."; @@ -129,7 +129,7 @@ public class IgfsFixedLengthRecordResolverSelfTest extends IgfsAbstractRecordRes IgfsFileRange split; try (IgfsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); + split = rslvr.resolveRecords(igfs, is, split(suggestedStart, suggestedLen)); } assert split == null : "Split is not null."; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java index 66cdbd5..48088f9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java @@ -87,7 +87,7 @@ public class IgfsNewLineDelimiterRecordResolverSelfTest extends IgfsAbstractReco IgfsFileRange split; try (IgfsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); + split = rslvr.resolveRecords(igfs, is, split(suggestedStart, suggestedLen)); } assert split != null : "Split is null."; @@ -112,7 +112,7 @@ public class IgfsNewLineDelimiterRecordResolverSelfTest extends IgfsAbstractReco IgfsFileRange split; try (IgfsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); + split = rslvr.resolveRecords(igfs, is, split(suggestedStart, suggestedLen)); } assert split == null : "Split is not null."; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java index 94a1b30..263bc0c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java @@ -93,7 +93,7 @@ public class IgfsStringDelimiterRecordResolverSelfTest extends IgfsAbstractRecor IgfsFileRange split; try (IgfsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); + split = rslvr.resolveRecords(igfs, is, split(suggestedStart, suggestedLen)); } assert split != null : "Split is null."; @@ -119,7 +119,7 @@ public class IgfsStringDelimiterRecordResolverSelfTest extends IgfsAbstractRecor IgfsFileRange split; try (IgfsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); + split = rslvr.resolveRecords(igfs, is, split(suggestedStart, suggestedLen)); } assert split == null : "Split is not null."; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java index f8420c4..0199198 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java @@ -261,7 +261,7 @@ public class IgfsHadoopFileSystem extends FileSystem { Integer batchSize = parameter(cfg, PARAM_GGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_IGFS_LOG_BATCH_SIZE); - clientLog = IgfsLogger.logger(uriAuthority, handshake.ggfsName(), logDir, batchSize); + clientLog = IgfsLogger.logger(uriAuthority, handshake.igfsName(), logDir, batchSize); } else clientLog = IgfsLogger.disabledLogger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java index 768234a..d7791d3 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java @@ -256,7 +256,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl Integer batchSize = parameter(cfg, PARAM_GGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_IGFS_LOG_BATCH_SIZE); - clientLog = IgfsLogger.logger(uriAuthority, handshake.ggfsName(), logDir, batchSize); + clientLog = IgfsLogger.logger(uriAuthority, handshake.igfsName(), logDir, batchSize); } else clientLog = IgfsLogger.disabledLogger(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutProc.java index a71b7bf..0e36e78 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutProc.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutProc.java @@ -146,7 +146,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener final IgfsHandshakeRequest req = new IgfsHandshakeRequest(); req.gridName(grid); - req.ggfsName(ggfs); + req.igfsName(ggfs); req.logDirectory(logDir); return io.send(req).chain(HANDSHAKE_RES).get(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5443bb38/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java index a887a9b..994a5bd 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java @@ -163,7 +163,7 @@ public class IgfsHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest { */ @SuppressWarnings("ConstantConditions") private void switchHandlerErrorFlag(boolean flag) throws Exception { - IgfsProcessorAdapter ggfsProc = ((IgniteKernal)grid(0)).context().ggfs(); + IgfsProcessorAdapter ggfsProc = ((IgniteKernal)grid(0)).context().igfs(); Map<String, IgfsContext> ggfsMap = getField(ggfsProc, "ggfsCache");
