http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java index 3b8515a..0a23357 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorValidationSelfTest.java @@ -60,10 +60,10 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { /** Meta cache 2 name. */ private static final String metaCache2Name = "metaCache2"; - /** First GGFS config in grid #1. */ + /** First IGFS config in grid #1. */ private IgfsConfiguration g1GgfsCfg1 = new IgfsConfiguration(); - /** Second GGFS config in grid#1. */ + /** Second IGFS config in grid#1. */ private IgfsConfiguration g1GgfsCfg2 = new IgfsConfiguration(); /** {@inheritDoc} */ @@ -123,7 +123,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { * @throws Exception If failed. */ public void testLocalIfNoCacheIsConfigured() throws Exception { - checkGridStartFails(g1Cfg, "Data cache is not configured locally for GGFS", true); + checkGridStartFails(g1Cfg, "Data cache is not configured locally for IGFS", true); } /** @@ -137,7 +137,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g1Cfg.setCacheConfiguration(cc); - checkGridStartFails(g1Cfg, "Data cache is not configured locally for GGFS", true); + checkGridStartFails(g1Cfg, "Data cache is not configured locally for IGFS", true); } /** @@ -151,7 +151,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g1Cfg.setCacheConfiguration(cc); - checkGridStartFails(g1Cfg, "Metadata cache is not configured locally for GGFS", true); + checkGridStartFails(g1Cfg, "Metadata cache is not configured locally for IGFS", true); } /** @@ -163,7 +163,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { for (CacheConfiguration cc : g1Cfg.getCacheConfiguration()) cc.setAffinityMapper(new GridCacheDefaultAffinityKeyMapper()); - checkGridStartFails(g1Cfg, "Invalid GGFS data cache configuration (key affinity mapper class should be", true); + checkGridStartFails(g1Cfg, "Invalid IGFS data cache configuration (key affinity mapper class should be", true); } /** @@ -177,7 +177,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g1GgfsCfg1.setName(ggfsCfgName); g1GgfsCfg2.setName(ggfsCfgName); - checkGridStartFails(g1Cfg, "Duplicate GGFS name found (check configuration and assign unique name", true); + checkGridStartFails(g1Cfg, "Duplicate IGFS name found (check configuration and assign unique name", true); } /** @@ -190,7 +190,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g1Cfg.setCacheConfiguration(concat(dataCaches, metaCaches(), CacheConfiguration.class)); - checkGridStartFails(g1Cfg, "GGFS data cache cannot start with enabled query indexing", true); + checkGridStartFails(g1Cfg, "IGFS data cache cannot start with enabled query indexing", true); } /** @@ -203,7 +203,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g1Cfg.setCacheConfiguration(concat(dataCaches(1024), metaCaches, CacheConfiguration.class)); - checkGridStartFails(g1Cfg, "GGFS metadata cache cannot start with enabled query indexing", true); + checkGridStartFails(g1Cfg, "IGFS metadata cache cannot start with enabled query indexing", true); } /** @@ -226,7 +226,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g1GgfsCfg2.setMaxSpaceSize(999999999999999999L); - checkGridStartFails(g1Cfg, "Maximum GGFS space size cannot be greater that size of available heap", true); + checkGridStartFails(g1Cfg, "Maximum IGFS space size cannot be greater that size of available heap", true); } /** @@ -241,7 +241,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { g1GgfsCfg2.setMaxSpaceSize(999999999999999999L); checkGridStartFails(g1Cfg, - "Maximum GGFS space size cannot be greater than size of available heap memory and offheap storage", true); + "Maximum IGFS space size cannot be greater than size of available heap memory and offheap storage", true); } /** @@ -255,7 +255,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { cc.setBackups(1); } - checkGridStartFails(g1Cfg, "GGFS data cache cannot be used with backups", true); + checkGridStartFails(g1Cfg, "IGFS data cache cannot be used with backups", true); } /** @@ -286,7 +286,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { G.start(g1Cfg); - checkGridStartFails(g2Cfg, "Data block size should be the same on all nodes in grid for GGFS", false); + checkGridStartFails(g2Cfg, "Data block size should be the same on all nodes in grid for IGFS", false); } /** @@ -300,7 +300,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { G.start(g1Cfg); - checkGridStartFails(g2Cfg, "Affinity mapper group size should be the same on all nodes in grid for GGFS", + checkGridStartFails(g2Cfg, "Affinity mapper group size should be the same on all nodes in grid for IGFS", false); } @@ -324,7 +324,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { G.start(g1Cfg); - checkGridStartFails(g2Cfg, "Meta cache name should be the same on all nodes in grid for GGFS", false); + checkGridStartFails(g2Cfg, "Meta cache name should be the same on all nodes in grid for IGFS", false); } /** @@ -350,7 +350,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { G.start(g1Cfg); - checkGridStartFails(g2Cfg, "Meta cache names should be different for different GGFS instances", false); + checkGridStartFails(g2Cfg, "Meta cache names should be different for different IGFS instances", false); } /** @@ -373,7 +373,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { G.start(g1Cfg); - checkGridStartFails(g2Cfg, "Data cache name should be the same on all nodes in grid for GGFS", false); + checkGridStartFails(g2Cfg, "Data cache name should be the same on all nodes in grid for IGFS", false); } /** @@ -399,7 +399,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { G.start(g1Cfg); - checkGridStartFails(g2Cfg, "Data cache names should be different for different GGFS instances", false); + checkGridStartFails(g2Cfg, "Data cache names should be different for different IGFS instances", false); } /** @@ -424,7 +424,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { G.start(g1Cfg); - checkGridStartFails(g2Cfg, "Default mode should be the same on all nodes in grid for GGFS", false); + checkGridStartFails(g2Cfg, "Default mode should be the same on all nodes in grid for IGFS", false); } /** @@ -446,7 +446,7 @@ public class IgfsProcessorValidationSelfTest extends IgfsCommonAbstractTest { G.start(g1Cfg); - checkGridStartFails(g2Cfg, "Path modes should be the same on all nodes in grid for GGFS", false); + checkGridStartFails(g2Cfg, "Path modes should be the same on all nodes in grid for IGFS", false); } /**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java index e4c104f..8ec07ab 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java @@ -71,13 +71,13 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { /** Cache name. */ private static final String META_CACHE_NAME = "metaCache"; - /** GGFS name. */ + /** IGFS name. */ private static final String IGFS_NAME = "igfs"; /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); - /** GGFS management port */ + /** IGFS management port */ private static int mgmtPort; /** Data cache mode. */ @@ -86,7 +86,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { /** Whether near cache is enabled (applicable for PARTITIONED cache only). */ private boolean nearEnabled; - /** GGFS maximum space. */ + /** IGFS maximum space. */ private long ggfsMaxData; /** Trash purge timeout. */ @@ -274,7 +274,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that GGFS size is correctly updated in case of preloading for PARTITIONED cache. + * Ensure that IGFS size is correctly updated in case of preloading for PARTITIONED cache. * * @throws Exception If failed. */ @@ -286,7 +286,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that GGFS size is correctly updated in case of preloading for co-located cache. + * Ensure that IGFS size is correctly updated in case of preloading for co-located cache. * * @throws Exception If failed. */ @@ -298,14 +298,14 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that GGFS cache size is calculated correctly. + * Ensure that IGFS cache size is calculated correctly. * * @throws Exception If failed. */ private void check() throws Exception { startUp(); - // Ensure that cache was marked as GGFS data cache. + // Ensure that cache was marked as IGFS data cache. for (int i = 0; i < GRID_CNT; i++) { IgniteEx g = grid(i); @@ -418,7 +418,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that an exception is thrown in case of GGFS oversize. + * Ensure that an exception is thrown in case of IGFS oversize. * * @throws Exception If failed. */ @@ -462,7 +462,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { U.closeQuiet(osErr); } } - }, IgfsOutOfSpaceException.class, "Failed to write data block (GGFS maximum data size exceeded) [used=" + + }, IgfsOutOfSpaceException.class, "Failed to write data block (IGFS maximum data size exceeded) [used=" + ggfsMaxData + ", allowed=" + ggfsMaxData + ']'); } @@ -557,7 +557,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { } /** - * Ensure that GGFS size is correctly updated in case of preloading. + * Ensure that IGFS size is correctly updated in case of preloading. * * @throws Exception If failed. */ @@ -721,7 +721,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { * Get GGfs of a node with the given index. * * @param idx Node index. - * @return GGFS. + * @return IGFS. * @throws Exception If failed. */ private IgfsImpl ggfs(int idx) throws Exception { @@ -732,7 +732,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { * Get GGfs of the given node. * * @param ignite Node; - * @return GGFS. + * @return IGFS. * @throws Exception If failed. */ private IgfsImpl ggfs(Ignite ignite) throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java index db93385..efd578e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java @@ -40,7 +40,7 @@ import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.testframework.GridTestUtils.*; /** - * Tests for GGFS streams content. + * Tests for IGFS streams content. */ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { /** Test IP finder. */ @@ -147,7 +147,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { } /** - * Test GGFS construction. + * Test IGFS construction. * * @throws IgniteCheckedException In case of exception. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java index 7c3a8ef..4d441ed 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java @@ -67,7 +67,7 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest { /** Repeat count. */ private static final int REPEAT_CNT = 10; - /** GGFS. */ + /** IGFS. */ private static IgniteFs ggfs; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 c21cfe7..05de61a 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 @@ -45,7 +45,7 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest { /** Shared IP finder. */ private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - /** GGFS. */ + /** IGFS. */ protected static IgniteFs igfs; /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/readme.txt ---------------------------------------------------------------------- diff --git a/modules/hadoop/readme.txt b/modules/hadoop/readme.txt index 37b7a65..ecd47e0 100644 --- a/modules/hadoop/readme.txt +++ b/modules/hadoop/readme.txt @@ -1,7 +1,7 @@ Apache Ignite Hadoop Module --------------------------- -Apache Ignite Hadoop module provides In-Memory MapReduce engine and driver to use GGFS as Hadoop file system +Apache Ignite Hadoop module provides In-Memory MapReduce engine and driver to use IGFS as Hadoop file system which are 100% compatible with HDFS and YARN. To enable Hadoop module when starting a standalone node, move 'optional/ignite-hadoop' folder to http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopParameters.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopParameters.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopParameters.java index 78614ad..6237dd4 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopParameters.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/IgfsHadoopParameters.java @@ -20,15 +20,15 @@ package org.apache.ignite.igfs.hadoop; /** * This class lists parameters that can be specified in Hadoop configuration. * Hadoop configuration can be specified in {@code core-site.xml} file - * or passed to map-reduce task directly when using Hadoop driver for GGFS file system: + * or passed to map-reduce task directly when using Hadoop driver for IGFS file system: * <ul> * <li> * {@code fs.igfs.[name].open.sequential_reads_before_prefetch} - this parameter overrides * the one specified in {@link org.apache.ignite.configuration.IgfsConfiguration#getSequentialReadsBeforePrefetch()} - * GGFS data node configuration property. + * IGFS data node configuration property. * </li> * <li> - * {@code fs.igfs.[name].log.enabled} - specifies whether GGFS sampling logger is enabled. If + * {@code fs.igfs.[name].log.enabled} - specifies whether IGFS sampling logger is enabled. If * {@code true}, then all file system operations will be logged to a file. * </li> * <li>{@code fs.igfs.[name].log.dir} - specifies log directory where sampling log files should be placed.</li> @@ -70,7 +70,7 @@ package org.apache.ignite.igfs.hadoop; * hadoop jar myjarfile.jar MyMapReduceJob -Dfs.igfs.open.sequential_reads_before_prefetch=4 * </pre> * If you want to use these parameters in code, then you have to substitute you file system name in it. The easiest - * way to do that is {@code String.format(PARAM_GGFS_COLOCATED_WRITES, [name])}. + * way to do that is {@code String.format(PARAM_IGFS_COLOCATED_WRITES, [name])}. */ public class IgfsHadoopParameters { /** Parameter name for control over file colocation write mode. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 7e94ca2..42f5c5f 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 @@ -45,8 +45,8 @@ import static org.apache.ignite.igfs.hadoop.IgfsHadoopParameters.*; import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopUtils.*; /** - * {@code GGFS} Hadoop 1.x file system driver over file system API. To use - * {@code GGFS} as Hadoop file system, you should configure this class + * {@code IGFS} Hadoop 1.x file system driver over file system API. To use + * {@code IGFS} as Hadoop file system, you should configure this class * in Hadoop's {@code core-site.xml} as follows: * <pre name="code" class="xml"> * <property> @@ -128,7 +128,7 @@ public class IgfsHadoopFileSystem extends FileSystem { /** Secondary URI string. */ private URI secondaryUri; - /** GGFS mode resolver. */ + /** IGFS mode resolver. */ private IgfsModeResolver modeRslvr; /** Secondary file system instance. */ @@ -140,7 +140,7 @@ public class IgfsHadoopFileSystem extends FileSystem { /** Whether custom sequential reads before prefetch value is provided. */ private boolean seqReadsBeforePrefetchOverride; - /** GGFS group block size. */ + /** IGFS group block size. */ private long ggfsGrpBlockSize; /** Flag that controls whether file writes should be colocated. */ @@ -722,7 +722,7 @@ public class IgfsHadoopFileSystem extends FileSystem { } } catch (IOException e) { - // Intentionally ignore GGFS exceptions here to follow Hadoop contract. + // Intentionally ignore IGFS exceptions here to follow Hadoop contract. if (F.eq(IOException.class, e.getClass()) && (e.getCause() == null || !X.hasCause(e.getCause(), IgfsException.class))) throw e; @@ -773,7 +773,7 @@ public class IgfsHadoopFileSystem extends FileSystem { } } catch (IOException e) { - // Intentionally ignore GGFS exceptions here to follow Hadoop contract. + // Intentionally ignore IGFS exceptions here to follow Hadoop contract. if (F.eq(IOException.class, e.getClass()) && (e.getCause() == null || !X.hasCause(e.getCause(), IgfsException.class))) throw e; @@ -931,7 +931,7 @@ public class IgfsHadoopFileSystem extends FileSystem { } } catch (IOException e) { - // Intentionally ignore GGFS exceptions here to follow Hadoop contract. + // Intentionally ignore IGFS exceptions here to follow Hadoop contract. if (F.eq(IOException.class, e.getClass()) && (e.getCause() == null || !X.hasCause(e.getCause(), IgfsException.class))) throw e; @@ -1066,7 +1066,7 @@ public class IgfsHadoopFileSystem extends FileSystem { /** * Resolve path mode. * - * @param path GGFS path. + * @param path IGFS path. * @return Path mode. */ public IgfsMode mode(IgfsPath path) { @@ -1136,9 +1136,9 @@ public class IgfsHadoopFileSystem extends FileSystem { } /** - * Convert GGFS path into Hadoop path. + * Convert IGFS path into Hadoop path. * - * @param path GGFS path. + * @param path IGFS path. * @return Hadoop path. */ private Path convert(IgfsPath path) { @@ -1146,10 +1146,10 @@ public class IgfsHadoopFileSystem extends FileSystem { } /** - * Convert Hadoop path into GGFS path. + * Convert Hadoop path into IGFS path. * * @param path Hadoop path. - * @return GGFS path. + * @return IGFS path. */ @Nullable private IgfsPath convert(@Nullable Path path) { if (path == null) @@ -1160,9 +1160,9 @@ public class IgfsHadoopFileSystem extends FileSystem { } /** - * Convert GGFS affinity block location into Hadoop affinity block location. + * Convert IGFS affinity block location into Hadoop affinity block location. * - * @param block GGFS affinity block location. + * @param block IGFS affinity block location. * @return Hadoop affinity block location. */ private BlockLocation convert(IgfsBlockLocation block) { @@ -1187,9 +1187,9 @@ public class IgfsHadoopFileSystem extends FileSystem { } /** - * Convert GGFS file information into Hadoop file status. + * Convert IGFS file information into Hadoop file status. * - * @param file GGFS file information. + * @param file IGFS file information. * @return Hadoop file status. */ @SuppressWarnings("deprecation") @@ -1206,10 +1206,10 @@ public class IgfsHadoopFileSystem extends FileSystem { } /** - * Convert Hadoop permission into GGFS file attribute. + * Convert Hadoop permission into IGFS file attribute. * * @param perm Hadoop permission. - * @return GGFS attributes. + * @return IGFS attributes. */ private Map<String, String> permission(FsPermission perm) { if (perm == null) @@ -1227,7 +1227,7 @@ public class IgfsHadoopFileSystem extends FileSystem { } /** - * Convert GGFS file attributes into Hadoop permission. + * Convert IGFS file attributes into Hadoop permission. * * @param file File info. * @return Hadoop permission. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 713fc94..856505b 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 @@ -45,8 +45,8 @@ import static org.apache.ignite.igfs.hadoop.IgfsHadoopParameters.*; import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopUtils.*; /** - * {@code GGFS} Hadoop 2.x file system driver over file system API. To use - * {@code GGFS} as Hadoop file system, you should configure this class + * {@code IGFS} Hadoop 2.x file system driver over file system API. To use + * {@code IGFS} as Hadoop file system, you should configure this class * in Hadoop's {@code core-site.xml} as follows: * <pre name="code" class="xml"> * <property> @@ -885,9 +885,9 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl } /** - * Convert GGFS path into Hadoop path. + * Convert IGFS path into Hadoop path. * - * @param path GGFS path. + * @param path IGFS path. * @return Hadoop path. */ private Path convert(IgfsPath path) { @@ -895,10 +895,10 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl } /** - * Convert Hadoop path into GGFS path. + * Convert Hadoop path into IGFS path. * * @param path Hadoop path. - * @return GGFS path. + * @return IGFS path. */ @Nullable private IgfsPath convert(Path path) { if (path == null) @@ -909,9 +909,9 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl } /** - * Convert GGFS affinity block location into Hadoop affinity block location. + * Convert IGFS affinity block location into Hadoop affinity block location. * - * @param block GGFS affinity block location. + * @param block IGFS affinity block location. * @return Hadoop affinity block location. */ private BlockLocation convert(IgfsBlockLocation block) { @@ -936,9 +936,9 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl } /** - * Convert GGFS file information into Hadoop file status. + * Convert IGFS file information into Hadoop file status. * - * @param file GGFS file information. + * @param file IGFS file information. * @return Hadoop file status. */ private FileStatus convert(IgfsFile file) { @@ -960,10 +960,10 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl } /** - * Convert Hadoop permission into GGFS file attribute. + * Convert Hadoop permission into IGFS file attribute. * * @param perm Hadoop permission. - * @return GGFS attributes. + * @return IGFS attributes. */ private Map<String, String> permission(FsPermission perm) { if (perm == null) @@ -981,7 +981,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl } /** - * Convert GGFS file attributes into Hadoop permission. + * Convert IGFS file attributes into Hadoop permission. * * @param file File info. * @return Hadoop permission. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoop.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoop.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoop.java index 9f17965..27d6e33 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoop.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoop.java @@ -46,7 +46,7 @@ public interface IgfsHadoop { public void close(boolean force); /** - * Command to retrieve file info for some GGFS path. + * Command to retrieve file info for some IGFS path. * * @param path Path to get file info for. * @return Future for info operation. @@ -57,7 +57,7 @@ public interface IgfsHadoop { /** * Command to update file properties. * - * @param path GGFS path to update properties. + * @param path IGFS path to update properties. * @param props Properties to update. * @return Future for update operation. * @throws IgniteCheckedException If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopCommunicationException.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopCommunicationException.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopCommunicationException.java index f892fb1..03bf733 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopCommunicationException.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopCommunicationException.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.igfs.hadoop; import org.apache.ignite.*; /** - * Communication exception indicating a problem between file system and GGFS instance. + * Communication exception indicating a problem between file system and IGFS instance. */ public class IgfsHadoopCommunicationException extends IgniteCheckedException { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEndpoint.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEndpoint.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEndpoint.java index 5117ab3..2855c10 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEndpoint.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEndpoint.java @@ -29,13 +29,13 @@ import java.net.*; import static org.apache.ignite.configuration.IgfsConfiguration.*; /** - * GGFS endpoint abstraction. + * IGFS endpoint abstraction. */ public class IgfsHadoopEndpoint { /** Localhost. */ public static final String LOCALHOST = "127.0.0.1"; - /** GGFS name. */ + /** IGFS name. */ private final String ggfsName; /** Grid name. */ @@ -48,7 +48,7 @@ public class IgfsHadoopEndpoint { private final int port; /** - * Normalize GGFS URI. + * Normalize IGFS URI. * * @param uri URI. * @return Normalized URI. @@ -57,7 +57,7 @@ public class IgfsHadoopEndpoint { public static URI normalize(URI uri) throws IOException { try { if (!F.eq(IgniteFs.IGFS_SCHEME, uri.getScheme())) - throw new IOException("Failed to normalize UIR because it has non GGFS scheme: " + uri); + throw new IOException("Failed to normalize UIR because it has non IGFS scheme: " + uri); IgfsHadoopEndpoint endpoint = new IgfsHadoopEndpoint(uri.getAuthority()); @@ -169,7 +169,7 @@ public class IgfsHadoopEndpoint { } /** - * @return GGFS name. + * @return IGFS name. */ @Nullable public String ggfs() { return ggfsName; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEx.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEx.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEx.java index aa9de45..da86e37 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEx.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopEx.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.*; import java.io.*; /** - * Extended GGFS server interface. + * Extended IGFS server interface. */ public interface IgfsHadoopEx extends IgfsHadoop { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java index d67ee83..eb41de0 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java @@ -79,9 +79,9 @@ public class IgfsHadoopFileSystemWrapper implements Igfs, AutoCloseable { } /** - * Convert GGFS path into Hadoop path. + * Convert IGFS path into Hadoop path. * - * @param path GGFS path. + * @param path IGFS path. * @return Hadoop path. */ private Path convert(IgfsPath path) { @@ -111,10 +111,10 @@ public class IgfsHadoopFileSystemWrapper implements Igfs, AutoCloseable { } /** - * Cast IO exception to GGFS exception. + * Cast IO exception to IGFS exception. * * @param e IO exception. - * @return GGFS exception. + * @return IGFS exception. */ public static IgfsException cast(String msg, IOException e) { if (e instanceof FileNotFoundException) @@ -133,7 +133,7 @@ public class IgfsHadoopFileSystemWrapper implements Igfs, AutoCloseable { * Convert Hadoop FileStatus properties to map. * * @param status File status. - * @return GGFS attributes. + * @return IGFS attributes. */ private static Map<String, String> properties(FileStatus status) { FsPermission perm = status.getPermission(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFuture.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFuture.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFuture.java index 3d4bda8..476641c 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFuture.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFuture.java @@ -21,7 +21,7 @@ import org.apache.ignite.internal.util.lang.*; import org.jetbrains.annotations.*; /** - * GGFS client future that holds response parse closure. + * IGFS client future that holds response parse closure. */ public class IgfsHadoopFuture<T> extends GridPlainFutureAdapter<T> { /** Output buffer. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInProc.java index a2c168f..5c5a61e 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInProc.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInProc.java @@ -32,7 +32,7 @@ import java.util.concurrent.*; * Communication with grid in the same process. */ public class IgfsHadoopInProc implements IgfsHadoopEx { - /** Target GGFS. */ + /** Target IGFS. */ private final IgfsEx ggfs; /** Buffer size. */ @@ -48,7 +48,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx { /** * Constructor. * - * @param ggfs Target GGFS. + * @param ggfs Target IGFS. * @param log Log. */ public IgfsHadoopInProc(IgfsEx ggfs, Log log) { @@ -350,7 +350,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx { lsnr.onError(e.getMessage()); if (e instanceof IllegalStateException) - throw new IOException("Failed to write data to GGFS stream because Grid is stopping.", e); + throw new IOException("Failed to write data to IGFS stream because Grid is stopping.", e); else throw e; } @@ -370,7 +370,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx { lsnr.onError(e.getMessage()); if (e instanceof IllegalStateException) - throw new IOException("Failed to flush data to GGFS stream because Grid is stopping.", e); + throw new IOException("Failed to flush data to IGFS stream because Grid is stopping.", e); else throw e; } @@ -384,7 +384,7 @@ public class IgfsHadoopInProc implements IgfsHadoopEx { closeable.close(); } catch (IllegalStateException e) { - throw new IOException("Failed to close GGFS stream because Grid is stopping.", e); + throw new IOException("Failed to close IGFS stream because Grid is stopping.", e); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInputStream.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInputStream.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInputStream.java index 3a369ef..efc5264 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInputStream.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInputStream.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.*; import java.io.*; /** - * GGFS input stream wrapper for hadoop interfaces. + * IGFS input stream wrapper for hadoop interfaces. */ @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized") public final class IgfsHadoopInputStream extends InputStream implements Seekable, PositionedReadable, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopIo.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopIo.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopIo.java index 7f87e10..46f5a6c 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopIo.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopIo.java @@ -23,12 +23,12 @@ import org.apache.ignite.internal.util.lang.*; import org.jetbrains.annotations.*; /** - * IO abstraction layer for GGFS client. Two kind of messages are expected to be sent: requests with response + * IO abstraction layer for IGFS client. Two kind of messages are expected to be sent: requests with response * and request without response. */ public interface IgfsHadoopIo { /** - * Sends given GGFS client message and asynchronously awaits for response. + * Sends given IGFS client message and asynchronously awaits for response. * * @param msg Message to send. * @return Future that will be completed. @@ -37,7 +37,7 @@ public interface IgfsHadoopIo { public GridPlainFuture<IgfsMessage> send(IgfsMessage msg) throws IgniteCheckedException; /** - * Sends given GGFS client message and asynchronously awaits for response. When IO detects response + * Sends given IGFS client message and asynchronously awaits for response. When IO detects response * beginning for given message it stops reading data and passes input stream to closure which can read * response in a specific way. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopIpcIo.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopIpcIo.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopIpcIo.java index 5e2d03b..d07f34d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopIpcIo.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopIpcIo.java @@ -348,7 +348,7 @@ public class IgfsHadoopIpcIo implements IgfsHadoopIo { assert oldFut == null; if (log.isDebugEnabled()) - log.debug("Sending GGFS message [reqId=" + reqId + ", msg=" + msg + ']'); + log.debug("Sending IGFS message [reqId=" + reqId + ", msg=" + msg + ']'); byte[] hdr = IgfsMarshaller.createHeader(reqId, msg.command()); @@ -516,7 +516,7 @@ public class IgfsHadoopIpcIo implements IgfsHadoopIo { IgfsIpcCommand cmd = IgfsIpcCommand.valueOf(U.bytesToInt(hdr, 8)); if (log.isDebugEnabled()) - log.debug("Received GGFS response [reqId=" + reqId + ", cmd=" + cmd + ']'); + log.debug("Received IGFS response [reqId=" + reqId + ", cmd=" + cmd + ']'); Object res = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 0e36e78..b66bdd1 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 @@ -75,7 +75,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener /** Grid name. */ private final String grid; - /** GGFS name. */ + /** IGFS name. */ private final String ggfs; /** Client log. */ @@ -93,7 +93,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener * @param host Host. * @param port Port. * @param grid Grid name. - * @param ggfs GGFS name. + * @param ggfs IGFS name. * @param log Client logger. * @throws IOException If failed. */ @@ -106,7 +106,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener * * @param port Port. * @param grid Grid name. - * @param ggfs GGFS name. + * @param ggfs IGFS name. * @param log Client logger. * @throws IOException If failed. */ @@ -120,7 +120,7 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener * @param host Host. * @param port Port. * @param grid Grid name. - * @param ggfs GGFS name. + * @param ggfs IGFS name. * @param shmem Shared memory flag. * @param log Client logger. * @throws IOException If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutputStream.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutputStream.java index 6a5bcf1..ae5f980 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutputStream.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutputStream.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.*; import java.io.*; /** - * GGFS Hadoop output stream implementation. + * IGFS Hadoop output stream implementation. */ public class IgfsHadoopOutputStream extends OutputStream implements IgfsHadoopStreamEventListener { /** Log instance. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopStreamDelegate.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopStreamDelegate.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopStreamDelegate.java index fdf5a0a..9aaab4c 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopStreamDelegate.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopStreamDelegate.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.igfs.hadoop; import org.apache.ignite.internal.util.typedef.internal.*; /** - * GGFS Hadoop stream descriptor. + * IGFS Hadoop stream descriptor. */ public class IgfsHadoopStreamDelegate { /** RPC handler. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopStreamEventListener.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopStreamEventListener.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopStreamEventListener.java index 4137685..20d7f2a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopStreamEventListener.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopStreamEventListener.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.igfs.hadoop; import org.apache.ignite.*; /** - * GGFS input stream event listener. + * IGFS input stream event listener. */ public interface IgfsHadoopStreamEventListener { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java index 58549ef..f8bf1ae 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.*; import java.io.*; /** - * Utility constants and methods for GGFS Hadoop file system. + * Utility constants and methods for IGFS Hadoop file system. */ public class IgfsHadoopUtils { /** Parameter name for endpoint no embed mode flag. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopWrapper.java index b9f28e1..8ba369a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopWrapper.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopWrapper.java @@ -34,7 +34,7 @@ import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopEndpoint.*; import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopUtils.*; /** - * Wrapper for GGFS server. + * Wrapper for IGFS server. */ public class IgfsHadoopWrapper implements IgfsHadoop { /** Delegate. */ @@ -314,7 +314,7 @@ public class IgfsHadoopWrapper implements IgfsHadoop { } } - throw new IOException("Failed to communicate with GGFS.", err); + throw new IOException("Failed to communicate with IGFS.", err); } /** @@ -371,7 +371,7 @@ public class IgfsHadoopWrapper implements IgfsHadoop { hadoop.close(true); if (log.isDebugEnabled()) - log.debug("Failed to connect to in-proc GGFS, fallback to IPC mode.", e); + log.debug("Failed to connect to in-proc IGFS, fallback to IPC mode.", e); err = e; } @@ -393,7 +393,7 @@ public class IgfsHadoopWrapper implements IgfsHadoop { hadoop.close(true); if (log.isDebugEnabled()) - log.debug("Failed to connect to out-proc local GGFS using shmem.", e); + log.debug("Failed to connect to out-proc local IGFS using shmem.", e); err = e; } @@ -418,7 +418,7 @@ public class IgfsHadoopWrapper implements IgfsHadoop { hadoop.close(true); if (log.isDebugEnabled()) - log.debug("Failed to connect to out-proc local GGFS using TCP.", e); + log.debug("Failed to connect to out-proc local IGFS using TCP.", e); err = e; } @@ -439,7 +439,7 @@ public class IgfsHadoopWrapper implements IgfsHadoop { hadoop.close(true); if (log.isDebugEnabled()) - log.debug("Failed to connect to out-proc remote GGFS using TCP.", e); + log.debug("Failed to connect to out-proc remote IGFS using TCP.", e); err = e; } @@ -452,7 +452,7 @@ public class IgfsHadoopWrapper implements IgfsHadoop { return curDelegate; } else - throw new IgfsHadoopCommunicationException("Failed to connect to GGFS: " + endpoint, err); + throw new IgfsHadoopCommunicationException("Failed to connect to IGFS: " + endpoint, err); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/package.html ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/package.html b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/package.html index 4520df8..ec380f2 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/package.html +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/package.html @@ -19,6 +19,6 @@ <html> <body> <!-- Package description. --> - Contains GGFS client classes. + Contains IGFS client classes. </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/package.html ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/package.html b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/package.html index 4f47151..4b070d3 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/package.html +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/package.html @@ -19,6 +19,6 @@ <html> <body> <!-- Package description. --> - Contains GGFS client and common classes. + Contains IGFS client and common classes. </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java index 9d386b1..1f347c8 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/GridHadoopClassLoader.java @@ -68,7 +68,7 @@ public class GridHadoopClassLoader extends URLClassLoader { } /** - * Need to parse only Ignite Hadoop and GGFS classes. + * Need to parse only Ignite Hadoop and IGFS classes. * * @param cls Class name. * @return {@code true} if we need to check this class. @@ -100,7 +100,7 @@ public class GridHadoopClassLoader extends URLClassLoader { return loadClassExplicitly(name, resolve); } - if (isGgfsOrGgHadoop(name)) { // For GG Hadoop and GGFS classes we have to check if they depend on Hadoop. + if (isGgfsOrGgHadoop(name)) { // For GG Hadoop and IGFS classes we have to check if they depend on Hadoop. Boolean hasDeps = cache.get(name); if (hasDeps == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java index d001248..44eb404 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java @@ -173,10 +173,10 @@ public class GridHadoopDefaultMapReducePlanner implements GridHadoopMapReducePla assert blocks != null; if (blocks.size() == 1) - // Fast-path, split consists of one GGFS block (as in most cases). + // Fast-path, split consists of one IGFS block (as in most cases). return bestNode(blocks.iterator().next().nodeIds(), topIds, nodeLoads, false); else { - // Slow-path, file consists of multiple GGFS blocks. First, find the most co-located nodes. + // Slow-path, file consists of multiple IGFS blocks. First, find the most co-located nodes. Map<UUID, Long> nodeMap = new HashMap<>(); List<UUID> bestNodeIds = null; @@ -215,7 +215,7 @@ public class GridHadoopDefaultMapReducePlanner implements GridHadoopMapReducePla } } - // Cannot use local GGFS for some reason, try selecting the node by host. + // Cannot use local IGFS for some reason, try selecting the node by host. Collection<UUID> blockNodes = null; for (String host : split.hosts()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java index 7f10214..a96eb82 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/client/hadoop/GridHadoopClientProtocolSelfTest.java @@ -393,9 +393,9 @@ public class GridHadoopClientProtocolSelfTest extends GridHadoopAbstractSelfTest } /** - * Dump GGFS content. + * Dump IGFS content. * - * @param ggfs GGFS. + * @param ggfs IGFS. * @param path Path. * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java index 92ea777..a685091 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsEventsTestSuite.java @@ -31,7 +31,7 @@ import java.util.*; import static org.apache.ignite.igfs.IgfsMode.*; /** - * Test suite for GGFS event tests. + * Test suite for IGFS event tests. */ @SuppressWarnings("PublicInnerClass") public class IgfsEventsTestSuite extends TestSuite { @@ -62,7 +62,7 @@ public class IgfsEventsTestSuite extends TestSuite { public static TestSuite suiteNoarchOnly() throws Exception { GridHadoopClassLoader ldr = new GridHadoopClassLoader(null); - TestSuite suite = new TestSuite("Ignite GGFS Events Test Suite Noarch Only"); + TestSuite suite = new TestSuite("Ignite IGFS Events Test Suite Noarch Only"); suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrivate.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualSync.class.getName()))); @@ -106,7 +106,7 @@ public class IgfsEventsTestSuite extends TestSuite { } /** - * Base class for all GGFS tests with primary and secondary file system. + * Base class for all IGFS tests with primary and secondary file system. */ public abstract static class PrimarySecondaryTest extends IgfsEventsAbstractSelfTest { /** Secondary file system. */ @@ -124,7 +124,7 @@ public class IgfsEventsTestSuite extends TestSuite { } /** - * @return GGFS configuration for secondary file system. + * @return IGFS configuration for secondary file system. */ protected IgfsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException { IgfsConfiguration ggfsCfg = super.getIgfsConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java index a90a6d4..fc1dab0 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java @@ -69,7 +69,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA /** File system. */ private static AbstractFileSystem fs; - /** Default GGFS mode. */ + /** Default IGFS mode. */ protected IgfsMode mode; /** Primary file system URI. */ @@ -81,7 +81,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA /** * Constructor. * - * @param mode Default GGFS mode. + * @param mode Default IGFS mode. */ protected IgfsHadoop20FileSystemAbstractSelfTest(IgfsMode mode) { this.mode = mode; @@ -142,7 +142,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA */ private void startNodes() throws Exception { if (mode != PRIMARY) { - // Start secondary GGFS. + // Start secondary IGFS. IgfsConfiguration ggfsCfg = new IgfsConfiguration(); ggfsCfg.setDataCacheName("partitioned"); @@ -246,10 +246,10 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA } /** - * Gets GGFS configuration. + * Gets IGFS configuration. * * @param gridName Grid name. - * @return GGFS configuration. + * @return IGFS configuration. */ protected IgfsConfiguration ggfsConfiguration(String gridName) throws IgniteCheckedException { IgfsConfiguration cfg = new IgfsConfiguration(); @@ -1726,7 +1726,7 @@ public abstract class IgfsHadoop20FileSystemAbstractSelfTest extends IgfsCommonA final Path filePath = new Path(ggfsHome, "someFile"); final FSDataOutputStream s = fs.create(filePath, EnumSet.noneOf(CreateFlag.class), - Options.CreateOpts.perms(FsPermission.getDefault())); // Open stream before stopping GGFS. + Options.CreateOpts.perms(FsPermission.getDefault())); // Open stream before stopping IGFS. try { G.stopAll(true); // Stop the server. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java index 36d158f..b21f022 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java @@ -44,10 +44,10 @@ import static org.apache.ignite.igfs.hadoop.IgfsHadoopParameters.*; import static org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest.*; /** - * Tests for GGFS working in mode when remote file system exists: DUAL_SYNC, DUAL_ASYNC. + * Tests for IGFS working in mode when remote file system exists: DUAL_SYNC, DUAL_ASYNC. */ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractTest { - /** GGFS block size. */ + /** IGFS block size. */ protected static final int IGFS_BLOCK_SIZE = 512 * 1024; /** Amount of blocks to prefetch. */ @@ -92,19 +92,19 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT /** Default data chunk (128 bytes). */ protected static byte[] chunk; - /** Primary GGFS. */ + /** Primary IGFS. */ protected static IgfsImpl ggfs; - /** Secondary GGFS. */ + /** Secondary IGFS. */ protected static IgfsImpl ggfsSecondary; - /** GGFS mode. */ + /** IGFS mode. */ protected final IgfsMode mode; /** * Constructor. * - * @param mode GGFS mode. + * @param mode IGFS mode. */ protected IgfsHadoopDualAbstractSelfTest(IgfsMode mode) { this.mode = mode; @@ -112,11 +112,11 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT } /** - * Start grid with GGFS. + * Start grid with IGFS. * * @param gridName Grid name. - * @param ggfsName GGFS name - * @param mode GGFS mode. + * @param ggfsName IGFS name + * @param mode IGFS mode. * @param secondaryFs Secondary file system (optional). * @param restCfg Rest configuration string (optional). * @return Started grid instance. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java index 797f4d7..c124136 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java @@ -97,7 +97,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs /** File system. */ private static FileSystem fs; - /** Default GGFS mode. */ + /** Default IGFS mode. */ protected final IgfsMode mode; /** Skip embedded mode flag. */ @@ -129,7 +129,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs /** * Constructor. * - * @param mode Default GGFS mode. + * @param mode Default IGFS mode. * @param skipEmbed Whether to skip embedded mode. * @param skipLocShmem Whether to skip local shmem mode. * @param skipLocTcp Whether to skip local TCP mode. @@ -171,7 +171,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs */ private void startNodes() throws Exception { if (mode != PRIMARY) { - // Start secondary GGFS. + // Start secondary IGFS. IgfsConfiguration ggfsCfg = new IgfsConfiguration(); ggfsCfg.setDataCacheName("partitioned"); @@ -313,10 +313,10 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs } /** - * Gets GGFS configuration. + * Gets IGFS configuration. * * @param gridName Grid name. - * @return GGFS configuration. + * @return IGFS configuration. */ protected IgfsConfiguration ggfsConfiguration(String gridName) throws IgniteCheckedException { IgfsConfiguration cfg = new IgfsConfiguration(); @@ -1976,7 +1976,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs public void testClientReconnect() throws Exception { Path filePath = new Path(PRIMARY_URI, "file1"); - final FSDataOutputStream s = fs.create(filePath); // Open the stream before stopping GGFS. + final FSDataOutputStream s = fs.create(filePath); // Open the stream before stopping IGFS. try { G.stopAll(true); // Stop the server. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 994a5bd..b44c2d8 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 @@ -41,7 +41,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint.*; /** - * Test interaction between a GGFS client and a GGFS server. + * Test interaction between a IGFS client and a IGFS server. */ public class IgfsHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest { /** Logger. */ @@ -156,7 +156,7 @@ public class IgfsHadoopFileSystemClientSelfTest extends IgfsCommonAbstractTest { } /** - * Set GGFS REST handler error flag to the given state. + * Set IGFS REST handler error flag to the given state. * * @param flag Flag state. * @throws Exception If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java index db2f628..a371dae 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java @@ -45,7 +45,7 @@ import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopUtils.*; import static org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint.*; /** - * Tests for GGFS file system handshake. + * Tests for IGFS file system handshake. */ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTest { /** IP finder. */ @@ -54,10 +54,10 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes /** Grid name. */ private static final String GRID_NAME = "grid"; - /** GGFS name. */ + /** IGFS name. */ private static final String IGFS_NAME = "igfs"; - /** GGFS path. */ + /** IGFS path. */ private static final IgfsPath PATH = new IgfsPath("/path"); /** {@inheritDoc} */ @@ -66,7 +66,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes } /** - * Tests for Grid and GGFS having normal names. + * Tests for Grid and IGFS having normal names. * * @throws Exception If failed. */ @@ -91,7 +91,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes } /** - * Tests for Grid having {@code null} name and GGFS having normal name. + * Tests for Grid having {@code null} name and IGFS having normal name. * * @throws Exception If failed. */ @@ -116,7 +116,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes } /** - * Tests for Grid having normal name and GGFS having {@code null} name. + * Tests for Grid having normal name and IGFS having {@code null} name. * * @throws Exception If failed. */ @@ -141,7 +141,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes } /** - * Tests for Grid having {@code null} name and GGFS having {@code null} name. + * Tests for Grid having {@code null} name and IGFS having {@code null} name. * * @throws Exception If failed. */ @@ -169,7 +169,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes * Perform startup. * * @param dfltGridName Default Grid name. - * @param dfltGgfsName Default GGFS name. + * @param dfltGgfsName Default IGFS name. * @throws Exception If failed. */ private void startUp(boolean dfltGridName, boolean dfltGgfsName) throws Exception { @@ -184,7 +184,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes * Create Grid configuration. * * @param dfltGridName Default Grid name. - * @param dfltGgfsName Default GGFS name. + * @param dfltGgfsName Default IGFS name. * @return Grid configuration. * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java index a6a456b..2e3a3ec 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java @@ -28,7 +28,7 @@ import static org.apache.ignite.igfs.IgfsMode.*; import static org.apache.ignite.internal.igfs.common.IgfsLogger.*; /** - * Grid GGFS client logger test. + * Grid IGFS client logger test. */ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { /** Path string. */ @@ -40,7 +40,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { /** Path. */ private static final IgfsPath PATH = new IgfsPath(PATH_STR); - /** GGFS name. */ + /** IGFS name. */ private static final String IGFS_NAME = "igfs"; /** Log file path. */ @@ -222,10 +222,10 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { } /** - * Create GGFS file with the given path. + * Create IGFS file with the given path. * * @param path File path. - * @return GGFS file instance. + * @return IGFS file instance. */ private IgfsFile file(String path) { return new IgfsFileImpl(new IgfsPath(path), new IgfsFileInfo(), 64 * 1024 * 1024); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java index 7e309b7..e282019 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java @@ -44,7 +44,7 @@ import static org.apache.ignite.igfs.hadoop.IgfsHadoopParameters.*; * Ensures that sampling is really turned on/off. */ public class IgfsHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstractTest { - /** GGFS. */ + /** IGFS. */ private IgfsEx ggfs; /** File system. */ @@ -274,7 +274,7 @@ public class IgfsHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstractT } /** - * Ensure that log directory is set to GGFS when client FS connects. + * Ensure that log directory is set to IGFS when client FS connects. * * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackAbstractSelfTest.java index 6eed2f5..bd9b031 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackAbstractSelfTest.java @@ -22,14 +22,14 @@ import java.util.*; import static org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint.*; /** - * GGFS Hadoop file system IPC loopback self test. + * IGFS Hadoop file system IPC loopback self test. */ public abstract class IgfsHadoopFileSystemLoopbackAbstractSelfTest extends IgfsHadoopFileSystemAbstractSelfTest { /** * Constructor. * - * @param mode GGFS mode. + * @param mode IGFS mode. * @param skipEmbed Skip embedded mode flag. */ protected IgfsHadoopFileSystemLoopbackAbstractSelfTest(IgfsMode mode, boolean skipEmbed) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java index 0865e74..6035c7a 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import static org.apache.ignite.igfs.IgfsMode.*; /** - * GGFS Hadoop file system IPC loopback self test in DUAL_ASYNC mode. + * IGFS Hadoop file system IPC loopback self test in DUAL_ASYNC mode. */ public class IgfsHadoopFileSystemLoopbackEmbeddedDualAsyncSelfTest extends IgfsHadoopFileSystemLoopbackAbstractSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java index f831325..3900b0b 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import static org.apache.ignite.igfs.IgfsMode.*; /** - * GGFS Hadoop file system IPC loopback self test in DUAL_SYNC mode. + * IGFS Hadoop file system IPC loopback self test in DUAL_SYNC mode. */ public class IgfsHadoopFileSystemLoopbackEmbeddedDualSyncSelfTest extends IgfsHadoopFileSystemLoopbackAbstractSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java index f21433a..dee717e 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import static org.apache.ignite.igfs.IgfsMode.*; /** - * GGFS Hadoop file system IPC loopback self test in PRIMARY mode. + * IGFS Hadoop file system IPC loopback self test in PRIMARY mode. */ public class IgfsHadoopFileSystemLoopbackEmbeddedPrimarySelfTest extends IgfsHadoopFileSystemLoopbackAbstractSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java index 0c163f2..1f13019 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import static org.apache.ignite.igfs.IgfsMode.*; /** - * GGFS Hadoop file system IPC loopback self test in SECONDARY mode. + * IGFS Hadoop file system IPC loopback self test in SECONDARY mode. */ public class IgfsHadoopFileSystemLoopbackEmbeddedSecondarySelfTest extends IgfsHadoopFileSystemLoopbackAbstractSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java index 1cd8c10..4a66da6 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import static org.apache.ignite.igfs.IgfsMode.*; /** - * GGFS Hadoop file system IPC loopback self test in DUAL_ASYNC mode. + * IGFS Hadoop file system IPC loopback self test in DUAL_ASYNC mode. */ public class IgfsHadoopFileSystemLoopbackExternalDualAsyncSelfTest extends IgfsHadoopFileSystemLoopbackAbstractSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.java index d7977d8..f5f49ed 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import static org.apache.ignite.igfs.IgfsMode.*; /** - * GGFS Hadoop file system IPC loopback self test in DUAL_SYNC mode. + * IGFS Hadoop file system IPC loopback self test in DUAL_SYNC mode. */ public class IgfsHadoopFileSystemLoopbackExternalDualSyncSelfTest extends IgfsHadoopFileSystemLoopbackAbstractSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.java index f44526d..5903704 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalPrimarySelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import static org.apache.ignite.igfs.IgfsMode.*; /** - * GGFS Hadoop file system IPC loopback self test in PRIMARY mode. + * IGFS Hadoop file system IPC loopback self test in PRIMARY mode. */ public class IgfsHadoopFileSystemLoopbackExternalPrimarySelfTest extends IgfsHadoopFileSystemLoopbackAbstractSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.java index 8924699..0e95f83 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoopbackExternalSecondarySelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import static org.apache.ignite.igfs.IgfsMode.*; /** - * GGFS Hadoop file system IPC loopback self test in SECONDARY mode. + * IGFS Hadoop file system IPC loopback self test in SECONDARY mode. */ public class IgfsHadoopFileSystemLoopbackExternalSecondarySelfTest extends IgfsHadoopFileSystemLoopbackAbstractSelfTest { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java index b268679..bdce59e 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java @@ -50,7 +50,7 @@ public class IgfsHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstrac /** Pattern doesn't matching the path. */ private static final String PATTERN_NOT_MATCHES = "/files"; - /** Default GGFS mode. */ + /** Default IGFS mode. */ private IgfsMode mode; /** Path modes. */ @@ -292,7 +292,7 @@ public class IgfsHadoopFileSystemSecondaryModeSelfTest extends IgfsCommonAbstrac } /** - * Set GGFS modes for particular paths. + * Set IGFS modes for particular paths. * * @param modes Modes. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemShmemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemShmemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemShmemAbstractSelfTest.java index 446b17d..ed7b7cc 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemShmemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemShmemAbstractSelfTest.java @@ -28,13 +28,13 @@ import java.util.concurrent.*; import static org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEndpoint.*; /** - * GGFS Hadoop file system IPC self test. + * IGFS Hadoop file system IPC self test. */ public abstract class IgfsHadoopFileSystemShmemAbstractSelfTest extends IgfsHadoopFileSystemAbstractSelfTest { /** * Constructor. * - * @param mode GGFS mode. + * @param mode IGFS mode. * @param skipEmbed Skip embedded mode flag. */ protected IgfsHadoopFileSystemShmemAbstractSelfTest(IgfsMode mode, boolean skipEmbed) {
