# IGNITE-226: WIP.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9cf92dd5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9cf92dd5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9cf92dd5 Branch: refs/heads/ignite-226 Commit: 9cf92dd533c11970f4d5cd8bffd0ce7b15da9c7d Parents: 453d9cc Author: vozerov-gridgain <[email protected]> Authored: Fri Feb 13 15:08:56 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Feb 13 15:08:56 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/igfs/IgfsProcessor.java | 4 +- .../processors/igfs/IgfsSizeSelfTest.java | 10 ++-- .../igfs/hadoop/IgfsHadoopParameters.java | 12 ++-- .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 16 +++--- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 12 ++-- .../internal/igfs/hadoop/IgfsHadoopUtils.java | 6 +- .../internal/igfs/hadoop/IgfsHadoopWrapper.java | 6 +- .../hadoop/v2/GridHadoopV2TaskContext.java | 2 +- .../igfs/IgfsHadoopDualAbstractSelfTest.java | 8 +-- .../IgfsHadoopFileSystemAbstractSelfTest.java | 4 +- .../IgfsHadoopFileSystemHandshakeSelfTest.java | 58 ++++++++++---------- .../IgfsHadoopFileSystemIpcCacheSelfTest.java | 2 +- .../IgfsHadoopFileSystemLoggerSelfTest.java | 20 +++---- ...IgfsHadoopFileSystemLoggerStateSelfTest.java | 4 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 4 +- 15 files changed, 84 insertions(+), 84 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java index a5512f4..91c8bf1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java @@ -51,7 +51,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { private static final String NULL_NAME = UUID.randomUUID().toString(); /** Converts context to GGFS. */ - private static final IgniteClosure<IgfsContext,IgniteFs> CTX_TO_GGFS = new C1<IgfsContext, IgniteFs>() { + private static final IgniteClosure<IgfsContext,IgniteFs> CTX_TO_IGFS = new C1<IgfsContext, IgniteFs>() { @Override public IgniteFs apply(IgfsContext ggfsCtx) { return ggfsCtx.igfs(); } @@ -168,7 +168,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public Collection<IgniteFs> igfss() { - return F.viewReadOnly(igfsCache.values(), CTX_TO_GGFS); + return F.viewReadOnly(igfsCache.values(), CTX_TO_IGFS); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 97cbd8a..e4c104f 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 @@ -72,7 +72,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { private static final String META_CACHE_NAME = "metaCache"; /** GGFS name. */ - private static final String GGFS_NAME = "igfs"; + private static final String IGFS_NAME = "igfs"; /** IP finder. */ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); @@ -115,7 +115,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { ggfsCfg.setDataCacheName(DATA_CACHE_NAME); ggfsCfg.setMetaCacheName(META_CACHE_NAME); - ggfsCfg.setName(GGFS_NAME); + ggfsCfg.setName(IGFS_NAME); ggfsCfg.setBlockSize(BLOCK_SIZE); ggfsCfg.setFragmentizerEnabled(false); ggfsCfg.setMaxSpaceSize(ggfsMaxData); @@ -674,7 +674,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { * @throws Exception If failed. */ private IgfsBlockKey blockKey(IgfsPath path, long blockId) throws Exception { - IgfsEx ggfs0 = (IgfsEx)grid(0).fileSystem(GGFS_NAME); + IgfsEx ggfs0 = (IgfsEx)grid(0).fileSystem(IGFS_NAME); IgniteUuid fileId = ggfs0.context().meta().fileId(path); @@ -725,7 +725,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { * @throws Exception If failed. */ private IgfsImpl ggfs(int idx) throws Exception { - return (IgfsImpl)grid(idx).fileSystem(GGFS_NAME); + return (IgfsImpl)grid(idx).fileSystem(IGFS_NAME); } /** @@ -736,7 +736,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { * @throws Exception If failed. */ private IgfsImpl ggfs(Ignite ignite) throws Exception { - return (IgfsImpl) ignite.fileSystem(GGFS_NAME); + return (IgfsImpl) ignite.fileSystem(IGFS_NAME); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 c4cd4af..78614ad 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 @@ -74,21 +74,21 @@ package org.apache.ignite.igfs.hadoop; */ public class IgfsHadoopParameters { /** Parameter name for control over file colocation write mode. */ - public static final String PARAM_GGFS_COLOCATED_WRITES = "fs.igfs.%s.colocated.writes"; + public static final String PARAM_IGFS_COLOCATED_WRITES = "fs.igfs.%s.colocated.writes"; /** Parameter name for custom sequential reads before prefetch value. */ - public static final String PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH = + public static final String PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH = "fs.igfs.%s.open.sequential_reads_before_prefetch"; /** Parameter name for client logger directory. */ - public static final String PARAM_GGFS_LOG_DIR = "fs.igfs.%s.log.dir"; + public static final String PARAM_IGFS_LOG_DIR = "fs.igfs.%s.log.dir"; /** Parameter name for log batch size. */ - public static final String PARAM_GGFS_LOG_BATCH_SIZE = "fs.igfs.%s.log.batch_size"; + public static final String PARAM_IGFS_LOG_BATCH_SIZE = "fs.igfs.%s.log.batch_size"; /** Parameter name for log enabled flag. */ - public static final String PARAM_GGFS_LOG_ENABLED = "fs.igfs.%s.log.enabled"; + public static final String PARAM_IGFS_LOG_ENABLED = "fs.igfs.%s.log.enabled"; /** Parameter name for prefer local writes flag. */ - public static final String PARAM_GGFS_PREFER_LOCAL_WRITES = "fs.igfs.prefer.local.writes"; + public static final String PARAM_IGFS_PREFER_LOCAL_WRITES = "fs.igfs.prefer.local.writes"; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 0199198..7e94ca2 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 @@ -82,7 +82,7 @@ import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopUtils.*; */ public class IgfsHadoopFileSystem extends FileSystem { /** Internal property to indicate management connection. */ - public static final String GGFS_MANAGEMENT = "fs.igfs.management.connection"; + public static final String IGFS_MANAGEMENT = "fs.igfs.management.connection"; /** Empty array of file block locations. */ private static final BlockLocation[] EMPTY_BLOCK_LOCATIONS = new BlockLocation[0]; @@ -209,7 +209,7 @@ public class IgfsHadoopFileSystem extends FileSystem { cacheEnabled = !cfg.getBoolean(disableCacheName, false); - mgmt = cfg.getBoolean(GGFS_MANAGEMENT, false); + mgmt = cfg.getBoolean(IGFS_MANAGEMENT, false); if (!IGFS_SCHEME.equals(name.getScheme())) throw new IOException("Illegal file system URI [expected=" + IGFS_SCHEME + @@ -222,7 +222,7 @@ public class IgfsHadoopFileSystem extends FileSystem { setUser(cfg.get(MRJobConfig.USER_NAME, DFLT_USER_NAME)); // Override sequential reads before prefetch if needed. - seqReadsBeforePrefetch = parameter(cfg, PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH, uriAuthority, 0); + seqReadsBeforePrefetch = parameter(cfg, PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH, uriAuthority, 0); if (seqReadsBeforePrefetch > 0) seqReadsBeforePrefetchOverride = true; @@ -232,11 +232,11 @@ public class IgfsHadoopFileSystem extends FileSystem { dfltReplication = (short)cfg.getInt("dfs.replication", 3); // Get file colocation control flag. - colocateFileWrites = parameter(cfg, PARAM_GGFS_COLOCATED_WRITES, uriAuthority, false); - preferLocFileWrites = cfg.getBoolean(PARAM_GGFS_PREFER_LOCAL_WRITES, false); + colocateFileWrites = parameter(cfg, PARAM_IGFS_COLOCATED_WRITES, uriAuthority, false); + preferLocFileWrites = cfg.getBoolean(PARAM_IGFS_PREFER_LOCAL_WRITES, false); // Get log directory. - String logDirCfg = parameter(cfg, PARAM_GGFS_LOG_DIR, uriAuthority, DFLT_IGFS_LOG_DIR); + String logDirCfg = parameter(cfg, PARAM_IGFS_LOG_DIR, uriAuthority, DFLT_IGFS_LOG_DIR); File logDirFile = U.resolveIgnitePath(logDirCfg); @@ -252,14 +252,14 @@ public class IgfsHadoopFileSystem extends FileSystem { IgfsPaths paths = handshake.secondaryPaths(); // Initialize client logger. - Boolean logEnabled = parameter(cfg, PARAM_GGFS_LOG_ENABLED, uriAuthority, false); + Boolean logEnabled = parameter(cfg, PARAM_IGFS_LOG_ENABLED, uriAuthority, false); if (handshake.sampling() != null ? handshake.sampling() : logEnabled) { // Initiate client logger. if (logDir == null) throw new IOException("Failed to resolve log directory: " + logDirCfg); - Integer batchSize = parameter(cfg, PARAM_GGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_IGFS_LOG_BATCH_SIZE); + Integer batchSize = parameter(cfg, PARAM_IGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_IGFS_LOG_BATCH_SIZE); clientLog = IgfsLogger.logger(uriAuthority, handshake.igfsName(), logDir, batchSize); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 d7791d3..713fc94 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 @@ -218,7 +218,7 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl uriAuthority = name.getAuthority(); // Override sequential reads before prefetch if needed. - seqReadsBeforePrefetch = parameter(cfg, PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH, uriAuthority, 0); + seqReadsBeforePrefetch = parameter(cfg, PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH, uriAuthority, 0); if (seqReadsBeforePrefetch > 0) seqReadsBeforePrefetchOverride = true; @@ -228,11 +228,11 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl dfltReplication = (short)cfg.getInt("dfs.replication", 3); // Get file colocation control flag. - colocateFileWrites = parameter(cfg, PARAM_GGFS_COLOCATED_WRITES, uriAuthority, false); - preferLocFileWrites = cfg.getBoolean(PARAM_GGFS_PREFER_LOCAL_WRITES, false); + colocateFileWrites = parameter(cfg, PARAM_IGFS_COLOCATED_WRITES, uriAuthority, false); + preferLocFileWrites = cfg.getBoolean(PARAM_IGFS_PREFER_LOCAL_WRITES, false); // Get log directory. - String logDirCfg = parameter(cfg, PARAM_GGFS_LOG_DIR, uriAuthority, DFLT_IGFS_LOG_DIR); + String logDirCfg = parameter(cfg, PARAM_IGFS_LOG_DIR, uriAuthority, DFLT_IGFS_LOG_DIR); File logDirFile = U.resolveIgnitePath(logDirCfg); @@ -247,14 +247,14 @@ public class IgfsHadoopFileSystem extends AbstractFileSystem implements Closeabl IgfsPaths paths = handshake.secondaryPaths(); - Boolean logEnabled = parameter(cfg, PARAM_GGFS_LOG_ENABLED, uriAuthority, false); + Boolean logEnabled = parameter(cfg, PARAM_IGFS_LOG_ENABLED, uriAuthority, false); if (handshake.sampling() != null ? handshake.sampling() : logEnabled) { // Initiate client logger. if (logDir == null) throw new IOException("Failed to resolve log directory: " + logDirCfg); - Integer batchSize = parameter(cfg, PARAM_GGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_IGFS_LOG_BATCH_SIZE); + Integer batchSize = parameter(cfg, PARAM_IGFS_LOG_BATCH_SIZE, uriAuthority, DFLT_IGFS_LOG_BATCH_SIZE); clientLog = IgfsLogger.logger(uriAuthority, handshake.igfsName(), logDir, batchSize); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 2a0a84c..58549ef 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 @@ -31,13 +31,13 @@ import java.io.*; */ public class IgfsHadoopUtils { /** Parameter name for endpoint no embed mode flag. */ - public static final String PARAM_GGFS_ENDPOINT_NO_EMBED = "fs.igfs.%s.endpoint.no_embed"; + public static final String PARAM_IGFS_ENDPOINT_NO_EMBED = "fs.igfs.%s.endpoint.no_embed"; /** Parameter name for endpoint no shared memory flag. */ - public static final String PARAM_GGFS_ENDPOINT_NO_LOCAL_SHMEM = "fs.igfs.%s.endpoint.no_local_shmem"; + public static final String PARAM_IGFS_ENDPOINT_NO_LOCAL_SHMEM = "fs.igfs.%s.endpoint.no_local_shmem"; /** Parameter name for endpoint no local TCP flag. */ - public static final String PARAM_GGFS_ENDPOINT_NO_LOCAL_TCP = "fs.igfs.%s.endpoint.no_local_tcp"; + public static final String PARAM_IGFS_ENDPOINT_NO_LOCAL_TCP = "fs.igfs.%s.endpoint.no_local_tcp"; /** * Get string parameter. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 282bbb7..b9f28e1 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 @@ -332,7 +332,7 @@ public class IgfsHadoopWrapper implements IgfsHadoop { return curDelegate; // 2. Guess that we are in the same VM. - if (!parameter(conf, PARAM_GGFS_ENDPOINT_NO_EMBED, authority, false)) { + if (!parameter(conf, PARAM_IGFS_ENDPOINT_NO_EMBED, authority, false)) { IgfsEx ggfs = null; if (endpoint.grid() == null) { @@ -379,7 +379,7 @@ public class IgfsHadoopWrapper implements IgfsHadoop { } // 3. Try connecting using shmem. - if (!parameter(conf, PARAM_GGFS_ENDPOINT_NO_LOCAL_SHMEM, authority, false)) { + if (!parameter(conf, PARAM_IGFS_ENDPOINT_NO_LOCAL_SHMEM, authority, false)) { if (curDelegate == null && !U.isWindows()) { IgfsHadoopEx hadoop = null; @@ -401,7 +401,7 @@ public class IgfsHadoopWrapper implements IgfsHadoop { } // 4. Try local TCP connection. - boolean skipLocTcp = parameter(conf, PARAM_GGFS_ENDPOINT_NO_LOCAL_TCP, authority, false); + boolean skipLocTcp = parameter(conf, PARAM_IGFS_ENDPOINT_NO_LOCAL_TCP, authority, false); if (!skipLocTcp) { if (curDelegate == null) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2TaskContext.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2TaskContext.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2TaskContext.java index d1dbf07..41bd24a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2TaskContext.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/v2/GridHadoopV2TaskContext.java @@ -117,7 +117,7 @@ public class GridHadoopV2TaskContext extends GridHadoopTaskContext { } // For map-reduce jobs prefer local writes. - jobConf.setBooleanIfUnset(PARAM_GGFS_PREFER_LOCAL_WRITES, true); + jobConf.setBooleanIfUnset(PARAM_IGFS_PREFER_LOCAL_WRITES, true); jobCtx = new JobContextImpl(jobConf, new JobID(jobId.globalId().toString(), jobId.localId())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 dbd05ff..36d158f 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 @@ -48,7 +48,7 @@ import static org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest.*; */ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractTest { /** GGFS block size. */ - protected static final int GGFS_BLOCK_SIZE = 512 * 1024; + protected static final int IGFS_BLOCK_SIZE = 512 * 1024; /** Amount of blocks to prefetch. */ protected static final int PREFETCH_BLOCKS = 1; @@ -129,7 +129,7 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT ggfsCfg.setDataCacheName("dataCache"); ggfsCfg.setMetaCacheName("metaCache"); ggfsCfg.setName(ggfsName); - ggfsCfg.setBlockSize(GGFS_BLOCK_SIZE); + ggfsCfg.setBlockSize(IGFS_BLOCK_SIZE); ggfsCfg.setDefaultMode(mode); ggfsCfg.setIpcEndpointConfiguration(restCfg); ggfsCfg.setSecondaryFileSystem(secondaryFs); @@ -221,7 +221,7 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT create(ggfsSecondary, paths(DIR, SUBDIR), paths(FILE)); // Write enough data to the secondary file system. - final int blockSize = GGFS_BLOCK_SIZE; + final int blockSize = IGFS_BLOCK_SIZE; IgfsOutputStream out = ggfsSecondary.append(FILE, false); @@ -244,7 +244,7 @@ public abstract class IgfsHadoopDualAbstractSelfTest extends IgfsCommonAbstractT int seqReads = SEQ_READS_BEFORE_PREFETCH + 1; - cfg.setInt(String.format(PARAM_GGFS_SEQ_READS_BEFORE_PREFETCH, "igfs:grid@"), seqReads); + cfg.setInt(String.format(PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH, "igfs:grid@"), seqReads); FileSystem fs = FileSystem.get(new URI(PRIMARY_URI), cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 e4aeb8a..797f4d7 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 @@ -2355,10 +2355,10 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs cfg.setBoolean("fs.igfs.impl.disable.cache", true); if (skipEmbed) - cfg.setBoolean(String.format(IgfsHadoopUtils.PARAM_GGFS_ENDPOINT_NO_EMBED, authority), true); + cfg.setBoolean(String.format(IgfsHadoopUtils.PARAM_IGFS_ENDPOINT_NO_EMBED, authority), true); if (skipLocShmem) - cfg.setBoolean(String.format(IgfsHadoopUtils.PARAM_GGFS_ENDPOINT_NO_LOCAL_SHMEM, authority), true); + cfg.setBoolean(String.format(IgfsHadoopUtils.PARAM_IGFS_ENDPOINT_NO_LOCAL_SHMEM, authority), true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 a8a28a5..db2f628 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 @@ -55,7 +55,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes private static final String GRID_NAME = "grid"; /** GGFS name. */ - private static final String GGFS_NAME = "igfs"; + private static final String IGFS_NAME = "igfs"; /** GGFS path. */ private static final IgfsPath PATH = new IgfsPath("/path"); @@ -73,13 +73,13 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes public void testHandshake() throws Exception { startUp(false, false); - checkValid(GGFS_NAME + ":" + GRID_NAME + "@"); - checkValid(GGFS_NAME + ":" + GRID_NAME + "@127.0.0.1"); - checkValid(GGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); + checkValid(IGFS_NAME + ":" + GRID_NAME + "@"); + checkValid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1"); + checkValid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); - checkInvalid(GGFS_NAME + "@"); - checkInvalid(GGFS_NAME + "@127.0.0.1"); - checkInvalid(GGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); + checkInvalid(IGFS_NAME + "@"); + checkInvalid(IGFS_NAME + "@127.0.0.1"); + checkInvalid(IGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); checkInvalid(":" + GRID_NAME + "@"); checkInvalid(":" + GRID_NAME + "@127.0.0.1"); @@ -98,13 +98,13 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes public void testHandshakeDefaultGrid() throws Exception { startUp(true, false); - checkInvalid(GGFS_NAME + ":" + GRID_NAME + "@"); - checkInvalid(GGFS_NAME + ":" + GRID_NAME + "@127.0.0.1"); - checkInvalid(GGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); + checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@"); + checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1"); + checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); - checkValid(GGFS_NAME + "@"); - checkValid(GGFS_NAME + "@127.0.0.1"); - checkValid(GGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); + checkValid(IGFS_NAME + "@"); + checkValid(IGFS_NAME + "@127.0.0.1"); + checkValid(IGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); checkInvalid(":" + GRID_NAME + "@"); checkInvalid(":" + GRID_NAME + "@127.0.0.1"); @@ -123,13 +123,13 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes public void testHandshakeDefaultGgfs() throws Exception { startUp(false, true); - checkInvalid(GGFS_NAME + ":" + GRID_NAME + "@"); - checkInvalid(GGFS_NAME + ":" + GRID_NAME + "@127.0.0.1"); - checkInvalid(GGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); + checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@"); + checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1"); + checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); - checkInvalid(GGFS_NAME + "@"); - checkInvalid(GGFS_NAME + "@127.0.0.1"); - checkInvalid(GGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); + checkInvalid(IGFS_NAME + "@"); + checkInvalid(IGFS_NAME + "@127.0.0.1"); + checkInvalid(IGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); checkValid(":" + GRID_NAME + "@"); checkValid(":" + GRID_NAME + "@127.0.0.1"); @@ -148,13 +148,13 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes public void testHandshakeDefaultGridDefaultGgfs() throws Exception { startUp(true, true); - checkInvalid(GGFS_NAME + ":" + GRID_NAME + "@"); - checkInvalid(GGFS_NAME + ":" + GRID_NAME + "@127.0.0.1"); - checkInvalid(GGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); + checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@"); + checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1"); + checkInvalid(IGFS_NAME + ":" + GRID_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); - checkInvalid(GGFS_NAME + "@"); - checkInvalid(GGFS_NAME + "@127.0.0.1"); - checkInvalid(GGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); + checkInvalid(IGFS_NAME + "@"); + checkInvalid(IGFS_NAME + "@127.0.0.1"); + checkInvalid(IGFS_NAME + "@127.0.0.1:" + DFLT_IPC_PORT); checkInvalid(":" + GRID_NAME + "@"); checkInvalid(":" + GRID_NAME + "@127.0.0.1"); @@ -175,7 +175,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes private void startUp(boolean dfltGridName, boolean dfltGgfsName) throws Exception { Ignite ignite = G.start(gridConfiguration(dfltGridName, dfltGgfsName)); - IgniteFs ggfs = ignite.fileSystem(dfltGgfsName ? null : GGFS_NAME); + IgniteFs ggfs = ignite.fileSystem(dfltGgfsName ? null : IGFS_NAME); ggfs.mkdirs(PATH); } @@ -231,7 +231,7 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes ggfsCfg.setDataCacheName("partitioned"); ggfsCfg.setMetaCacheName("replicated"); - ggfsCfg.setName(dfltGgfsName ? null : GGFS_NAME); + ggfsCfg.setName(dfltGgfsName ? null : IGFS_NAME); ggfsCfg.setPrefetchBlocks(1); ggfsCfg.setDefaultMode(PRIMARY); ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ @@ -303,8 +303,8 @@ public class IgfsHadoopFileSystemHandshakeSelfTest extends IgfsCommonAbstractTes cfg.setBoolean("fs.igfs.impl.disable.cache", true); - cfg.setBoolean(String.format(PARAM_GGFS_ENDPOINT_NO_EMBED, authority), true); - cfg.setBoolean(String.format(PARAM_GGFS_ENDPOINT_NO_LOCAL_SHMEM, authority), true); + cfg.setBoolean(String.format(PARAM_IGFS_ENDPOINT_NO_EMBED, authority), true); + cfg.setBoolean(String.format(PARAM_IGFS_ENDPOINT_NO_LOCAL_SHMEM, authority), true); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java index efcc979..5bd47b4 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java @@ -157,7 +157,7 @@ public class IgfsHadoopFileSystemIpcCacheSelfTest extends IgfsCommonAbstractTest cfg.addResource(U.resolveIgniteUrl(HADOOP_FS_CFG)); cfg.setBoolean("fs.igfs.impl.disable.cache", true); - cfg.setBoolean(String.format(IgfsHadoopUtils.PARAM_GGFS_ENDPOINT_NO_EMBED, name), true); + cfg.setBoolean(String.format(IgfsHadoopUtils.PARAM_IGFS_ENDPOINT_NO_EMBED, name), true); // Ensure that existing IO is reused. FileSystem fs1 = FileSystem.get(new URI("igfs://" + name + "/"), cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 ee838a5..a6a456b 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 @@ -41,7 +41,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { private static final IgfsPath PATH = new IgfsPath(PATH_STR); /** GGFS name. */ - private static final String GGFS_NAME = "igfs"; + private static final String IGFS_NAME = "igfs"; /** Log file path. */ private static final String LOG_DIR = U.getIgniteHome(); @@ -50,7 +50,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { private static final String ENDPOINT = "localhost:10500"; /** Log file name. */ - private static final String LOG_FILE = LOG_DIR + File.separator + "igfs-log-" + GGFS_NAME + "-" + U.jvmPid() + + private static final String LOG_FILE = LOG_DIR + File.separator + "igfs-log-" + IGFS_NAME + "-" + U.jvmPid() + ".csv"; /** {@inheritDoc} */ @@ -87,14 +87,14 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { * @throws Exception If failed. */ public void testCreateDelete() throws Exception { - IgfsLogger log = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10); + IgfsLogger log = IgfsLogger.logger(ENDPOINT, IGFS_NAME, LOG_DIR, 10); - IgfsLogger sameLog0 = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10); + IgfsLogger sameLog0 = IgfsLogger.logger(ENDPOINT, IGFS_NAME, LOG_DIR, 10); // Loggers for the same endpoint must be the same object. assert log == sameLog0; - IgfsLogger otherLog = IgfsLogger.logger("other" + ENDPOINT, GGFS_NAME, LOG_DIR, 10); + IgfsLogger otherLog = IgfsLogger.logger("other" + ENDPOINT, IGFS_NAME, LOG_DIR, 10); // Logger for another endpoint must be different. assert log != otherLog; @@ -110,7 +110,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { // When there are multiple loggers, closing one must not force flushing. assert !logFile.exists(); - IgfsLogger sameLog1 = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10); + IgfsLogger sameLog1 = IgfsLogger.logger(ENDPOINT, IGFS_NAME, LOG_DIR, 10); assert sameLog0 == sameLog1; @@ -125,7 +125,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { logFile.delete(); - IgfsLogger sameLog2 = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10); + IgfsLogger sameLog2 = IgfsLogger.logger(ENDPOINT, IGFS_NAME, LOG_DIR, 10); // This time we expect new logger instance to be created. assert sameLog0 != sameLog2; @@ -142,7 +142,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { * @throws Exception If failed. */ public void testLogRead() throws Exception { - IgfsLogger log = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10); + IgfsLogger log = IgfsLogger.logger(ENDPOINT, IGFS_NAME, LOG_DIR, 10); log.logOpen(1, PATH, PRIMARY, 2, 3L); log.logRandomRead(1, 4L, 5); @@ -172,7 +172,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { * @throws Exception If failed. */ public void testLogWrite() throws Exception { - IgfsLogger log = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10); + IgfsLogger log = IgfsLogger.logger(ENDPOINT, IGFS_NAME, LOG_DIR, 10); log.logCreate(1, PATH, PRIMARY, true, 2, new Integer(3).shortValue(), 4L); log.logAppend(2, PATH, PRIMARY, 8); @@ -197,7 +197,7 @@ public class IgfsHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest { */ @SuppressWarnings("TooBroadScope") public void testLogMisc() throws Exception { - IgfsLogger log = IgfsLogger.logger(ENDPOINT, GGFS_NAME, LOG_DIR, 10); + IgfsLogger log = IgfsLogger.logger(ENDPOINT, IGFS_NAME, LOG_DIR, 10); String newFile = "/dir3/file.test"; String file1 = "/dir3/file1.test"; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/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 e7f7ef8..7e309b7 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 @@ -300,9 +300,9 @@ public class IgfsHadoopFileSystemLoggerStateSelfTest extends IgfsCommonAbstractT fsCfg.setBoolean("fs.igfs.impl.disable.cache", true); if (logging) - fsCfg.setBoolean(String.format(PARAM_GGFS_LOG_ENABLED, "igfs:igfs-grid@"), logging); + fsCfg.setBoolean(String.format(PARAM_IGFS_LOG_ENABLED, "igfs:igfs-grid@"), logging); - fsCfg.setStrings(String.format(PARAM_GGFS_LOG_DIR, "igfs:igfs-grid@"), U.getIgniteHome()); + fsCfg.setStrings(String.format(PARAM_IGFS_LOG_DIR, "igfs:igfs-grid@"), U.getIgniteHome()); return (IgfsHadoopFileSystem)FileSystem.get(new URI("igfs://igfs:igfs-grid@/"), fsCfg); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9cf92dd5/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index 7cc4bb6..e5c2f3f 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -72,7 +72,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac private static final MockIgnite GRID = new MockIgnite(); /** Mocked GGFS. */ - private static final IgniteFs GGFS = new MockIgfs(); + private static final IgniteFs IGFS = new MockIgfs(); /** Planner. */ private static final GridHadoopMapReducePlanner PLANNER = new GridHadoopDefaultMapReducePlanner(); @@ -928,7 +928,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac @Override public IgniteFs igfsx(String name) { assert F.eq("igfs", name); - return GGFS; + return IGFS; } /** {@inheritDoc} */
