# IGNITE-226: No more "ggfs".
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d2207c6c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d2207c6c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d2207c6c Branch: refs/heads/ignite-143 Commit: d2207c6c11407e9f842bf9d555547c71f8740485 Parents: fd1f854 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Feb 13 18:23:31 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Feb 13 18:23:31 2015 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 18 +++++++++--------- examples/config/filesystem/example-ignitefs.xml | 2 +- .../src/main/java/org/apache/ignite/IgniteFs.java | 4 ++-- .../ignite/configuration/IgfsConfiguration.java | 6 +++--- .../java/org/apache/ignite/igfs/IgfsFile.java | 4 ++-- .../java/org/apache/ignite/igfs/IgfsPath.java | 6 +++--- .../igfs/mapreduce/IgfsInputStreamJobAdapter.java | 4 ++-- .../org/apache/ignite/igfs/mapreduce/IgfsJob.java | 2 +- .../apache/ignite/igfs/mapreduce/IgfsTask.java | 10 +++++----- .../ignite/igfs/mapreduce/IgfsTaskArgs.java | 6 +++--- .../internal/igfs/common/IgfsControlResponse.java | 14 +++++++------- .../internal/processors/igfs/IgfsAsyncImpl.java | 4 ++-- .../internal/processors/igfs/IgfsContext.java | 2 +- .../internal/processors/igfs/IgfsHelper.java | 2 +- .../internal/processors/igfs/IgfsHelperImpl.java | 2 +- .../ignite/internal/processors/igfs/IgfsImpl.java | 2 +- .../processors/igfs/IgfsInputStreamImpl.java | 2 +- .../internal/processors/igfs/IgfsIpcHandler.java | 2 +- .../processors/igfs/IgfsNoopProcessor.java | 2 +- .../processors/igfs/IgfsOutputStreamImpl.java | 2 +- .../internal/processors/igfs/IgfsProcessor.java | 14 +++++++------- .../internal/util/ipc/IpcEndpointFactory.java | 2 +- .../visor/node/VisorGridConfiguration.java | 4 ++-- .../visor/node/VisorIgfsConfiguration.java | 4 ++-- modules/core/src/test/config/igfs-loopback.xml | 12 ++++++------ modules/core/src/test/config/igfs-shmem.xml | 12 ++++++------ .../ignite/igfs/IgfsTestInputGenerator.java | 2 +- .../processors/igfs/IgfsAttributesSelfTest.java | 2 +- .../processors/igfs/IgfsDataManagerSelfTest.java | 2 +- .../processors/igfs/IgfsMetaManagerSelfTest.java | 2 +- .../processors/igfs/IgfsSizeSelfTest.java | 4 ++-- .../IpcSharedMemoryCrashDetectionSelfTest.java | 12 ++++++------ .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +- .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 4 ++-- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopJclLogger.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopOutProc.java | 16 ++++++++-------- .../IgfsHadoopFileSystemAbstractSelfTest.java | 2 +- .../loadtests/igfs/IgfsPerformanceBenchmark.java | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- 40 files changed, 100 insertions(+), 100 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/config/hadoop/default-config.xml ---------------------------------------------------------------------- diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml index a545625..33600bb 100644 --- a/config/hadoop/default-config.xml +++ b/config/hadoop/default-config.xml @@ -52,7 +52,7 @@ <!-- Abstract IGFS file system configuration to be used as a template. --> - <bean id="ggfsCfgBase" class="org.apache.ignite.configuration.IgniteFsConfiguration" abstract="true"> + <bean id="igfsCfgBase" class="org.apache.ignite.configuration.IgniteFsConfiguration" abstract="true"> <!-- Must correlate with cache affinity mapper. --> <property name="blockSize" value="#{128 * 1024}"/> <property name="perNodeBatchSize" value="512"/> @@ -110,16 +110,16 @@ </property> <!-- - Configure one IGFS file system instance named "ggfs" on this node. + Configure one IGFS file system instance named "igfs" on this node. --> - <property name="ggfsConfiguration"> + <property name="igfsConfiguration"> <list> - <bean class="org.apache.ignite.configuration.IgniteFsConfiguration" parent="ggfsCfgBase"> - <property name="name" value="ggfs"/> + <bean class="org.apache.ignite.configuration.IgniteFsConfiguration" parent="igfsCfgBase"> + <property name="name" value="igfs"/> <!-- Caches with these names must be configured. --> - <property name="metaCacheName" value="ggfs-meta"/> - <property name="dataCacheName" value="ggfs-data"/> + <property name="metaCacheName" value="igfs-meta"/> + <property name="dataCacheName" value="igfs-data"/> <!-- Configure TCP endpoint for communication with the file system instance. --> <property name="ipcEndpointConfiguration"> @@ -140,12 +140,12 @@ <list> <!-- File system metadata cache. --> <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="metaCacheCfgBase"> - <property name="name" value="ggfs-meta"/> + <property name="name" value="igfs-meta"/> </bean> <!-- File system files data cache. --> <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="dataCacheCfgBase"> - <property name="name" value="ggfs-data"/> + <property name="name" value="igfs-data"/> </bean> </list> </property> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/examples/config/filesystem/example-ignitefs.xml ---------------------------------------------------------------------- diff --git a/examples/config/filesystem/example-ignitefs.xml b/examples/config/filesystem/example-ignitefs.xml index 23fc089..a1b0d01 100644 --- a/examples/config/filesystem/example-ignitefs.xml +++ b/examples/config/filesystem/example-ignitefs.xml @@ -63,7 +63,7 @@ </bean> </property> - <property name="ggfsConfiguration"> + <property name="igfsConfiguration"> <list> <bean class="org.apache.ignite.configuration.IgfsConfiguration"> <property name="name" value="ignitefs"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/IgniteFs.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java index 9bd7232..ce8ebcf 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java @@ -51,8 +51,8 @@ import java.util.*; * <h1 class="header">Integration With Hadoop</h1> * In addition to direct file system API, {@code IGFS} can be integrated with {@code Hadoop} by * plugging in as {@code Hadoop FileSystem}. Refer to - * {@code org.apache.ignite.ignitefs.hadoop.v1.GridGgfsHadoopFileSystem} or - * {@code org.apache.ignite.ignitefs.hadoop.v2.GridGgfsHadoopFileSystem} for more information. + * {@code org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem} or + * {@code org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem} for more information. * <p> * <b>NOTE:</b> integration with Hadoop is available only in {@code In-Memory Accelerator For Hadoop} edition. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java index deeb410..308471d 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgfsConfiguration.java @@ -313,7 +313,7 @@ public class IgfsConfiguration { * Default is {@code 0} which means that pre-fetching will start right away. * <h1 class="header">Integration With Hadoop</h1> * This parameter can be also overridden for individual Hadoop MapReduce tasks by passing - * {@code org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopParameters.PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH} + * {@code org.apache.ignite.igfs.hadoop.IgfsHadoopParameters.PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH} * configuration property directly to Hadoop MapReduce task. * <p> * <b>NOTE:</b> Integration with Hadoop is available only in {@code In-Memory Accelerator For Hadoop} edition. @@ -333,7 +333,7 @@ public class IgfsConfiguration { * Default is {@code 0} which means that pre-fetching will start right away. * <h1 class="header">Integration With Hadoop</h1> * This parameter can be also overridden for individual Hadoop MapReduce tasks by passing - * {@code org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopParameters.PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH} + * {@code org.apache.ignite.igfs.hadoop.IgfsHadoopParameters.PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH} * configuration property directly to Hadoop MapReduce task. * <p> * <b>NOTE:</b> Integration with Hadoop is available only in {@code In-Memory Accelerator For Hadoop} edition. @@ -779,7 +779,7 @@ public class IgfsConfiguration { * maximum range length to 16Mb, then 64 ranges will be returned resulting in 64 jobs which could be executed in * parallel. * <p> - * Note that some {@code GridGgfs.execute()} methods can override value of this parameter. + * Note that some {@code IgniteFs.execute()} methods can override value of this parameter. * <p> * In case value of this parameter is set to {@code 0} or negative value, it is simply ignored. Default value is * {@code 0}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java index 6fc624e..172dca1 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFile.java @@ -25,10 +25,10 @@ import java.util.*; * {@code IGFS} file or directory descriptor. For example, to get information about * a file you would use the following code: * <pre name="code" class="java"> - * GridGgfsPath filePath = new GridGgfsPath("my/working/dir", "file.txt"); + * IgfsPath filePath = new IgfsPath("my/working/dir", "file.txt"); * * // Get metadata about file. - * GridGgfsFile file = igfs.info(filePath); + * IgfsFile file = igfs.info(filePath); * </pre> */ public interface IgfsFile { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java index dfd3af5..f0959bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsPath.java @@ -30,11 +30,11 @@ import java.util.*; * {@code IGFS} path to file in the file system. For example, to get information about * a file you would use the following code: * <pre name="code" class="java"> - * GridGgfsPath dirPath = new GridGgfsPath("/my/working/dir"); - * GridGgfsPath filePath = new GridGgfsPath(dirPath, "file.txt"); + * IgfsPath dirPath = new IgfsPath("/my/working/dir"); + * IgfsPath filePath = new IgfsPath(dirPath, "file.txt"); * * // Get metadata about file. - * GridGgfsFile file = igfs.info(filePath); + * IgfsFile file = igfs.info(filePath); * </pre> */ public final class IgfsPath implements Comparable<IgfsPath>, Externalizable { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java index b63b717..bf2636f 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsInputStreamJobAdapter.java @@ -24,10 +24,10 @@ import org.apache.ignite.internal.util.*; import java.io.*; /** - * Convenient {@link IgfsJob} adapter. It limits data returned from {@link org.apache.ignite.igfs.IgfsInputStream} to bytes within + * Convenient {@link IgfsJob} adapter. It limits data returned from {@link IgfsInputStream} to bytes within * the {@link IgfsFileRange} assigned to the job. * <p> - * Under the covers it simply puts job's {@code GridGgfsInputStream} position to range start and wraps in into + * Under the covers it simply puts job's {@code IgfsInputStream} position to range start and wraps in into * {@link GridFixedSizeInputStream} limited to range length. */ public abstract class IgfsInputStreamJobAdapter extends IgfsJobAdapter { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java index 673f4cb..d12fc79 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsJob.java @@ -24,7 +24,7 @@ import java.io.*; /** * Defines executable unit for {@link IgfsTask}. Before this job is executed, it is assigned one of the - * ranges provided by the {@link IgfsRecordResolver} passed to one of the {@code GridGgfs.execute(...)} methods. + * ranges provided by the {@link IgfsRecordResolver} passed to one of the {@code IgniteFs.execute(...)} methods. * <p> * {@link #execute(org.apache.ignite.IgniteFs, IgfsFileRange, org.apache.ignite.igfs.IgfsInputStream)} method is given {@link IgfsFileRange} this * job is expected to operate on, and already opened {@link org.apache.ignite.igfs.IgfsInputStream} for the file this range belongs to. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java index b0caf4f..92ea5d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTask.java @@ -30,17 +30,17 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * IGFS task which can be executed on the grid using one of {@code GridGgfs.execute()} methods. Essentially IGFS task + * IGFS task which can be executed on the grid using one of {@code IgniteFs.execute()} methods. Essentially IGFS task * is regular {@link org.apache.ignite.compute.ComputeTask} with different map logic. Instead of implementing * {@link org.apache.ignite.compute.ComputeTask#map(List, Object)} method to split task into jobs, you must implement * {@link IgfsTask#createJob(org.apache.ignite.igfs.IgfsPath, IgfsFileRange, IgfsTaskArgs)} method. * <p> * Each file participating in IGFS task is split into {@link IgfsFileRange}s first. Normally range is a number of * consequent bytes located on a single node (see {@code IgniteFsGroupDataBlocksKeyMapper}). In case maximum range size - * is provided (either through {@link org.apache.ignite.configuration.IgfsConfiguration#getMaximumTaskRangeLength()} or {@code GridGgfs.execute()} + * is provided (either through {@link org.apache.ignite.configuration.IgfsConfiguration#getMaximumTaskRangeLength()} or {@code IgniteFs.execute()} * argument), then ranges could be further divided into smaller chunks. * <p> - * Once file is split into ranges, each range is passed to {@code GridGgfsTask.createJob()} method in order to create a + * Once file is split into ranges, each range is passed to {@code IgfsTask.createJob()} method in order to create a * {@link IgfsJob}. * <p> * Finally all generated jobs are sent to Grid nodes for execution. @@ -49,9 +49,9 @@ import java.util.*; * <p> * Here is an example of such a task: * <pre name="code" class="java"> - * public class WordCountTask extends GridGgfsTask<String, Integer> { + * public class WordCountTask extends IgfsTask<String, Integer> { * @Override - * public GridGgfsJob createJob(GridGgfsPath path, GridGgfsFileRange range, GridGgfsTaskArgs<T> args) throws IgniteCheckedException { + * public IgfsJob createJob(IgfsPath path, IgfsFileRange range, IgfsTaskArgs<T> args) throws IgniteCheckedException { * // New job will be created for each range within each file. * // We pass user-provided argument (which is essentially a word to look for) to that job. * return new WordCountJob(args.userArgument()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java index c073878..7db26ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsTaskArgs.java @@ -22,14 +22,14 @@ import org.apache.ignite.igfs.*; import java.util.*; /** - * IGFS task arguments. When you initiate new IGFS task execution using one of {@code GridGgfs.execute(...)} methods, - * all passed parameters are encapsulated in a single {@code GridGgfsTaskArgs} object. Later on this object is + * IGFS task arguments. When you initiate new IGFS task execution using one of {@code IgniteFs.execute(...)} methods, + * all passed parameters are encapsulated in a single {@code IgfsTaskArgs} object. Later on this object is * passed to {@link IgfsTask#createJob(org.apache.ignite.igfs.IgfsPath, IgfsFileRange, IgfsTaskArgs)} method. * <p> * Task arguments encapsulates the following data: * <ul> * <li>IGFS name</li> - * <li>File paths passed to {@code GridGgfs.execute()} method</li> + * <li>File paths passed to {@code IgniteFs.execute()} method</li> * <li>{@link IgfsRecordResolver} for that task</li> * <li>Flag indicating whether to skip non-existent file paths or throw an exception</li> * <li>User-defined task argument</li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java index 3d9852f..7295bda 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsControlResponse.java @@ -63,25 +63,25 @@ public class IgfsControlResponse extends IgfsMessage { /** Response is Long. */ public static final int RES_TYPE_LONG = 1; - /** Response is GridGgfsFile. */ + /** Response is IgfsFile. */ public static final int RES_TYPE_IGFS_FILE = 2; - /** Response is GridGgfsFileInfo. */ + /** Response is IgfsFileInfo. */ public static final int RES_TYPE_IGFS_STREAM_DESCRIPTOR = 3; - /** Response is GridGgfsPath. */ + /** Response is IgfsPath. */ public static final int RES_TYPE_IGFS_PATH = 4; - /** Response is collection of GridGgfsFile. */ + /** Response is collection of IgfsFile. */ public static final int RES_TYPE_COL_IGFS_FILE = 5; - /** Response is collection of GridGgfsPath. */ + /** Response is collection of IgfsPath. */ public static final int RES_TYPE_COL_IGFS_PATH = 6; - /** Response is collection of GridGgfsBlockLocation. */ + /** Response is collection of IgfsBlockLocation. */ public static final int RES_TYPE_COL_IGFS_BLOCK_LOCATION = 7; - /** Response is collection of GridGgfsBlockLocation. */ + /** Response is collection of IgfsBlockLocation. */ public static final int RES_TYPE_BYTE_ARRAY = 8; /** Response is an error containing stream ID and error message. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java index c89e3c1..1479a88 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java @@ -30,14 +30,14 @@ import java.net.*; import java.util.*; /** - * Ggfs supporting asynchronous operations. + * Igfs supporting asynchronous operations. */ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFs> implements IgfsEx { /** */ private final IgfsImpl igfs; /** - * @param igfs Ggfs. + * @param igfs Igfs. */ public IgfsAsyncImpl(IgfsImpl igfs) { super(true); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java index 34ebc2d..245a1dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsContext.java @@ -64,7 +64,7 @@ public class IgfsContext { * @param dataMgr Data manager. * @param srvMgr Server manager. * @param fragmentizerMgr Fragmentizer manager. - * @throws IgniteCheckedException If GGFs context instantiation is failed. + * @throws IgniteCheckedException If IGFS context instantiation is failed. */ public IgfsContext( GridKernalContext ctx, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java index 8378619..4795478 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelper.java @@ -40,7 +40,7 @@ public interface IgfsHelper { public abstract void validateCacheConfiguration(CacheConfiguration cfg) throws IgniteCheckedException; /** - * Check whether object is of type {@code GridGgfsBlockKey} + * Check whether object is of type {@code IgfsBlockKey} * * @param key Key. * @return {@code True} if IGFS block key. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java index f068aa7..8bca65f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsHelperImpl.java @@ -43,7 +43,7 @@ public class IgfsHelperImpl implements IgfsHelper { if (evictFilter != null && !(evictFilter instanceof CacheIgfsEvictionFilter)) throw new IgniteCheckedException("Eviction filter cannot be set explicitly when using " + - "CacheGgfsPerBlockLruEvictionPolicy:" + cfg.getName()); + "CacheIgfsPerBlockLruEvictionPolicy:" + cfg.getName()); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index b5887ae..cb27cc9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -73,7 +73,7 @@ public final class IgfsImpl implements IgfsEx { /** FS configuration. */ private IgfsConfiguration cfg; - /** Ggfs context. */ + /** IGFS context. */ private IgfsContext igfsCtx; /** Event storage manager. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java index 32d1f76..92b4383 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java @@ -95,7 +95,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter { /** Time consumed on reading. */ private long time; - /** Local GGFs metrics. */ + /** Local IGFS metrics. */ private final IgfsLocalMetrics metrics; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java index daef65a..1d5ba1a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java @@ -50,7 +50,7 @@ class IgfsIpcHandler implements IgfsServerHandler { /** Buffer size. */ private final int bufSize; // Buffer size. Must not be less then file block size. - /** Ggfs instance for this handler. */ + /** IGFS instance for this handler. */ private IgfsEx igfs; /** Resource ID generator. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java index 26ef77a..a299fc4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsNoopProcessor.java @@ -45,7 +45,7 @@ public class IgfsNoopProcessor extends IgfsProcessorAdapter { @Override public void printMemoryStats() { X.println(">>>"); X.println(">>> IGFS processor memory stats [grid=" + ctx.gridName() + ']'); - X.println(">>> ggfsCacheSize: " + 0); + X.println(">>> igfsCacheSize: " + 0); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java index 36f19cc..7a6d946 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java @@ -95,7 +95,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter { * @param bufSize The size of the buffer to be used. * @param mode Grid IGFS mode. * @param batch Optional secondary file system batch. - * @param metrics Local GGFs metrics. + * @param metrics Local IGFS metrics. * @throws IgniteCheckedException If stream creation failed. */ IgfsOutputStreamImpl(IgfsContext igfsCtx, IgfsPath path, IgfsFileInfo fileInfo, IgniteUuid parentId, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/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 73f5950..847cd50 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 @@ -228,7 +228,7 @@ public class IgfsProcessor extends IgfsProcessorAdapter { if (!(affMapper instanceof IgfsGroupDataBlocksKeyMapper)) // Do not create IGFS attributes for such a node nor throw error about invalid configuration. - // Configuration will be validated later, while starting GridGgfsProcessor. + // Configuration will be validated later, while starting IgfsProcessor. continue; attrVals.add(new IgfsAttributes( @@ -301,12 +301,12 @@ public class IgfsProcessor extends IgfsProcessorAdapter { if (offHeapSize < 0 && maxSpaceSize > maxHeapSize) // Offheap is disabled. throw new IgniteCheckedException("Maximum IGFS space size cannot be greater that size of available heap " + - "memory [maxHeapSize=" + maxHeapSize + ", maxGgfsSpaceSize=" + maxSpaceSize + ']'); + "memory [maxHeapSize=" + maxHeapSize + ", maxIgfsSpaceSize=" + maxSpaceSize + ']'); else if (offHeapSize > 0 && maxSpaceSize > maxHeapSize + offHeapSize) // Offheap is enabled, but limited. throw new IgniteCheckedException("Maximum IGFS space size cannot be greater than size of available heap " + "memory and offheap storage [maxHeapSize=" + maxHeapSize + ", offHeapSize=" + offHeapSize + - ", maxGgfsSpaceSize=" + maxSpaceSize + ']'); + ", maxIgfsSpaceSize=" + maxSpaceSize + ']'); } if (dataCache.configuration().getCacheMode() == PARTITIONED) { @@ -366,8 +366,8 @@ public class IgfsProcessor extends IgfsProcessorAdapter { "property) [metaCacheName=" + rmtAttr.metaCacheName() + ", locNodeId=" + ctx.localNodeId() + ", rmtNodeId=" + rmtNode.id() + - ", locGgfsName=" + locAttr.igfsName() + - ", rmtGgfsName=" + rmtAttr.igfsName() + ']'); + ", locIgfsName=" + locAttr.igfsName() + + ", rmtIgfsName=" + rmtAttr.igfsName() + ']'); if (F.eq(rmtAttr.dataCacheName(), locAttr.dataCacheName())) throw new IgniteCheckedException("Data cache names should be different for different IGFS instances " + @@ -376,8 +376,8 @@ public class IgfsProcessor extends IgfsProcessorAdapter { "property)[dataCacheName=" + rmtAttr.dataCacheName() + ", locNodeId=" + ctx.localNodeId() + ", rmtNodeId=" + rmtNode.id() + - ", locGgfsName=" + locAttr.igfsName() + - ", rmtGgfsName=" + rmtAttr.igfsName() + ']'); + ", locIgfsName=" + locAttr.igfsName() + + ", rmtIgfsName=" + rmtAttr.igfsName() + ']'); continue; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java index 02b10a5..06710fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/IpcEndpointFactory.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.util.ipc.shmem.*; import org.apache.ignite.internal.util.typedef.internal.*; /** - * Ggfs endpoint factory for inter-process communication. + * Igfs endpoint factory for inter-process communication. */ public class IpcEndpointFactory { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java index 2f05a37..ac53798 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java @@ -74,7 +74,7 @@ public class VisorGridConfiguration implements Serializable { /** Caches. */ private Iterable<VisorCacheConfiguration> caches; - /** Ggfss. */ + /** Igfss. */ private Iterable<VisorIgfsConfiguration> igfss; /** Streamers. */ @@ -299,7 +299,7 @@ public class VisorGridConfiguration implements Serializable { } /** - * @return Ggfss. + * @return Igfss. */ public Iterable<VisorIgfsConfiguration> igfss() { return igfss; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java index 0cf84bd..bb0927d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java @@ -196,7 +196,7 @@ public class VisorIgfsConfiguration implements Serializable { } /** - * @param name New gGFS instance name. + * @param name New IGFS instance name. */ public void name(@Nullable String name) { this.name = name; @@ -336,7 +336,7 @@ public class VisorIgfsConfiguration implements Serializable { } /** - * @param dfltMode New gGFS instance mode. + * @param dfltMode New IGFS instance mode. */ public void defaultMode(IgfsMode dfltMode) { defaultMode = dfltMode; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/test/config/igfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/igfs-loopback.xml b/modules/core/src/test/config/igfs-loopback.xml index 5d5f546..81ce501 100644 --- a/modules/core/src/test/config/igfs-loopback.xml +++ b/modules/core/src/test/config/igfs-loopback.xml @@ -78,12 +78,12 @@ </bean> </property> - <property name="ggfsConfiguration"> + <property name="igfsConfiguration"> <list> <bean class="org.apache.ignite.configuration.IgfsConfiguration"> - <property name="name" value="ggfs"/> - <property name="metaCacheName" value="ggfs-meta"/> - <property name="dataCacheName" value="ggfs-data"/> + <property name="name" value="igfs"/> + <property name="metaCacheName" value="igfs-meta"/> + <property name="dataCacheName" value="igfs-data"/> <!-- Must correlate with cache affinity mapper. --> <property name="blockSize" value="#{128 * 1024}"/> @@ -107,7 +107,7 @@ <property name="cacheConfiguration"> <list> <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="ggfs-data"/> + <property name="name" value="igfs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> <property name="queryIndexEnabled" value="false"/> @@ -123,7 +123,7 @@ </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="ggfs-meta"/> + <property name="name" value="igfs-meta"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> <property name="queryIndexEnabled" value="false"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/test/config/igfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/igfs-shmem.xml b/modules/core/src/test/config/igfs-shmem.xml index a1c8625..d30051b 100644 --- a/modules/core/src/test/config/igfs-shmem.xml +++ b/modules/core/src/test/config/igfs-shmem.xml @@ -78,12 +78,12 @@ </bean> </property> - <property name="ggfsConfiguration"> + <property name="igfsConfiguration"> <list> <bean class="org.apache.ignite.configuration.IgfsConfiguration"> - <property name="name" value="ggfs"/> - <property name="metaCacheName" value="ggfs-meta"/> - <property name="dataCacheName" value="ggfs-data"/> + <property name="name" value="igfs"/> + <property name="metaCacheName" value="igfs-meta"/> + <property name="dataCacheName" value="igfs-data"/> <!-- Must correlate with cache affinity mapper. --> <property name="blockSize" value="#{128 * 1024}"/> @@ -107,7 +107,7 @@ <property name="cacheConfiguration"> <list> <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="ggfs-data"/> + <property name="name" value="igfs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> <property name="queryIndexEnabled" value="false"/> @@ -123,7 +123,7 @@ </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="ggfs-meta"/> + <property name="name" value="igfs-meta"/> <property name="cacheMode" value="REPLICATED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> <property name="queryIndexEnabled" value="false"/> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java index cc46dfe..abf6e89 100644 --- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java +++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsTestInputGenerator.java @@ -25,7 +25,7 @@ import java.io.*; public class IgfsTestInputGenerator { public static void main(String[] args) throws IOException { if (args.length != 2) { - System.out.println("Run: GridGgfsTestInputGenerator <file name> <length>"); + System.out.println("Run: IgfsTestInputGenerator <file name> <length>"); System.exit(-1); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAttributesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAttributesSelfTest.java index b9f6c5a..c2591b1 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAttributesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAttributesSelfTest.java @@ -38,7 +38,7 @@ public class IgfsAttributesSelfTest extends IgfsCommonAbstractTest { pathModes.put("path1", PRIMARY); pathModes.put("path2", PROXY); - IgfsAttributes attrs = new IgfsAttributes("testGgfsName", 513000, 888, "meta", "data", DUAL_SYNC, + IgfsAttributes attrs = new IgfsAttributes("testIgfsName", 513000, 888, "meta", "data", DUAL_SYNC, pathModes, true); ByteArrayOutputStream bos = new ByteArrayOutputStream(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java index a294ab1..2af01bf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java @@ -394,7 +394,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { final int blockSize = 10; final int grpSize = blockSize * DATA_BLOCK_GROUP_CNT; - //GridGgfsFileInfo info = new GridGgfsFileInfo(blockSize, 0); + //IgfsFileInfo info = new IgfsFileInfo(blockSize, 0); IgfsFileInfo info = new IgfsFileInfo(blockSize, 1024 * 1024, null, null, false, null); for (int pos = 0; pos < 5 * grpSize; pos++) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java index 9da1418..1a52b7c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java @@ -142,7 +142,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { assertEquals(F.asMap("dir", new IgfsListingEntry(dir), "file", new IgfsListingEntry(file)), mgr.directoryListing(ROOT_ID)); - //GridGgfsFileInfo tmp = mgr.info(dir.id()); + //IgfsFileInfo tmp = mgr.info(dir.id()); assertEquals(dir, mgr.info(dir.id())); assertEquals(file, mgr.info(file.id())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/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 3cc563c..ca46228 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 @@ -718,7 +718,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { } /** - * Get GGfs of a node with the given index. + * Get IGFS of a node with the given index. * * @param idx Node index. * @return IGFS. @@ -729,7 +729,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { } /** - * Get GGfs of the given node. + * Get IGFS of the given node. * * @param ignite Node; * @return IGFS. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java index fe2dd71..5cdb048 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryCrashDetectionSelfTest.java @@ -158,7 +158,7 @@ public class IpcSharedMemoryCrashDetectionSelfTest extends GridCommonAbstractTes } /** - * Launches GgfsSharedMemoryTestServer and GgfsSharedMemoryTestClient. + * Launches IgfsSharedMemoryTestServer and IgfsSharedMemoryTestClient. * After successful connection kills firstly server and secondly client. * * @return Collection of shared memory IDs created while client-server interactions. @@ -188,7 +188,7 @@ public class IpcSharedMemoryCrashDetectionSelfTest extends GridCommonAbstractTes } /** - * Launches GgfsSharedMemoryTestServer and connects to it with client endpoint. + * Launches IgfsSharedMemoryTestServer and connects to it with client endpoint. * After couple of reads-writes kills the server and checks client throws correct exception. * * @return List of shared memory IDs created while client-server interactions. @@ -322,9 +322,9 @@ public class IpcSharedMemoryCrashDetectionSelfTest extends GridCommonAbstractTes } /** - * Starts {@code GgfsSharedMemoryTestClient}. The method doesn't wait while client being started. + * Starts {@code IgfsSharedMemoryTestClient}. The method doesn't wait while client being started. * - * @return Start result of the {@code GgfsSharedMemoryTestClient}. + * @return Start result of the {@code IgfsSharedMemoryTestClient}. * @throws Exception In case of any exception happen. */ private ProcessStartResult startSharedMemoryTestClient() throws Exception { @@ -371,9 +371,9 @@ public class IpcSharedMemoryCrashDetectionSelfTest extends GridCommonAbstractTes } /** - * Starts {@code GgfsSharedMemoryTestServer}. The method waits while server being started. + * Starts {@code IgfsSharedMemoryTestServer}. The method waits while server being started. * - * @return Start result of the {@code GgfsSharedMemoryTestServer}. + * @return Start result of the {@code IgfsSharedMemoryTestServer}. * @throws Exception In case of any exception happen. */ private ProcessStartResult startSharedMemoryTestServer() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java index 92a24f6..791ffc8 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java @@ -36,7 +36,7 @@ public class IgniteIgfsTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Ignite FS Test Suite For Platform Independent Tests"); -// suite.addTest(new TestSuite(GridGgfsSizeSelfTest.class)); TODO Enable after GG-9035 +// suite.addTest(new TestSuite(IgfsSizeSelfTest.class)); TODO Enable after GG-9035 suite.addTest(new TestSuite(IgfsAttributesSelfTest.class)); suite.addTest(new TestSuite(IgfsFileInfoSelfTest.class)); suite.addTest(new TestSuite(IgfsMetaManagerSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/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 b877b86..8762d83 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 @@ -56,7 +56,7 @@ import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopUtils.*; * * <property> * <name>fs.igfs.impl</name> - * <value>org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopFileSystem</value> + * <value>org.apache.ignite.igfs.hadoop.IgfsHadoopFileSystem</value> * </property> * </pre> * You should also add Ignite JAR and all libraries to Hadoop classpath. To @@ -158,7 +158,7 @@ public class IgfsHadoopFileSystem extends FileSystem { /** {@inheritDoc} */ @Override public URI getUri() { if (uri == null) - throw new IllegalStateException("URI is null (was GridGgfsHadoopFileSystem properly initialized?)."); + throw new IllegalStateException("URI is null (was IgfsHadoopFileSystem properly initialized?)."); return uri; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/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 c3642d4..a38178c 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 @@ -56,7 +56,7 @@ import static org.apache.ignite.internal.igfs.hadoop.IgfsHadoopUtils.*; * * <property> * <name>fs.igfs.impl</name> - * <value>org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopFileSystem</value> + * <value>org.apache.ignite.igfs.hadoop.IgfsHadoopFileSystem</value> * </property> * </pre> * You should also add Ignite JAR and all libraries to Hadoop classpath. To http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopJclLogger.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopJclLogger.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopJclLogger.java index e3606ab..e43d77a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopJclLogger.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopJclLogger.java @@ -107,6 +107,6 @@ public class IgfsHadoopJclLogger implements IgniteLogger { /** {@inheritDoc} */ @Override public String toString() { - return "GridGgfsHadoopJclLogger [impl=" + impl + ']'; + return "IgfsHadoopJclLogger [impl=" + impl + ']'; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/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 6b5242f..31183a8 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 @@ -41,34 +41,34 @@ public class IgfsHadoopOutProc implements IgfsHadoopEx, IgfsHadoopIpcIoListener /** Expected result is boolean. */ private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, Long> LONG_RES = createClosure(); - /** Expected result is {@code GridGgfsFile}. */ + /** Expected result is {@code IgfsFile}. */ private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, IgfsFile> FILE_RES = createClosure(); - /** Expected result is {@code GridGgfsHandshakeResponse} */ + /** Expected result is {@code IgfsHandshakeResponse} */ private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, IgfsHandshakeResponse> HANDSHAKE_RES = createClosure(); - /** Expected result is {@code GridGgfsStatus} */ + /** Expected result is {@code IgfsStatus} */ private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, IgfsStatus> STATUS_RES = createClosure(); - /** Expected result is {@code GridGgfsFile}. */ + /** Expected result is {@code IgfsFile}. */ private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, IgfsInputStreamDescriptor> STREAM_DESCRIPTOR_RES = createClosure(); - /** Expected result is {@code GridGgfsFile}. */ + /** Expected result is {@code IgfsFile}. */ private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, Collection<IgfsFile>> FILE_COL_RES = createClosure(); - /** Expected result is {@code GridGgfsFile}. */ + /** Expected result is {@code IgfsFile}. */ private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, Collection<IgfsPath>> PATH_COL_RES = createClosure(); - /** Expected result is {@code GridGgfsPathSummary}. */ + /** Expected result is {@code IgfsPathSummary}. */ private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, IgfsPathSummary> SUMMARY_RES = createClosure(); - /** Expected result is {@code GridGgfsFile}. */ + /** Expected result is {@code IgfsFile}. */ private static final GridPlainClosure<GridPlainFuture<IgfsMessage>, Collection<IgfsBlockLocation>> BLOCK_LOCATION_COL_RES = createClosure(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/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 b3eef32..d40bb89 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 @@ -353,7 +353,7 @@ public abstract class IgfsHadoopFileSystemAbstractSelfTest extends IgfsCommonAbs @Override public Object call() throws Exception { return new IgfsHadoopFileSystem().getUri(); } - }, IllegalStateException.class, "URI is null (was GridGgfsHadoopFileSystem properly initialized?)."); + }, IllegalStateException.class, "URI is null (was IgfsHadoopFileSystem properly initialized?)."); } /** @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java index b5b309c..7b54561 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/loadtests/igfs/IgfsPerformanceBenchmark.java @@ -74,7 +74,7 @@ public class IgfsPerformanceBenchmark { System.out.println("Warming up..."); -// warmUp(fs, ggfsHome, op, fileLen); +// warmUp(fs, igfsHome, op, fileLen); System.out.println("Finished warm up."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2207c6c/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala index fbb3673..6c51062 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala @@ -1492,7 +1492,7 @@ object visor extends VisorTag { val cfgs = try // Cache, IGFS, streamer and DR configurations should be excluded from daemon node config. - spring.loadConfigurations(url, "cacheConfiguration", "ggfsConfiguration", "streamerConfiguration", + spring.loadConfigurations(url, "cacheConfiguration", "igfsConfiguration", "streamerConfiguration", "drSenderHubConfiguration", "drReceiverHubConfiguration").get1() finally { if (log4jTup != null)
