# 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/167c1b1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/167c1b1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/167c1b1a Branch: refs/heads/ignite-226 Commit: 167c1b1a597364b850e2922a10d4b0fef073f32a Parents: 039afc8 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Feb 13 16:41:26 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Feb 13 16:41:31 2015 +0300 ---------------------------------------------------------------------- config/fabric/default-config.xml | 6 +- config/hadoop/default-config.xml | 12 +-- docs/hadoop_readme.md | 4 +- .../examples/ignitefs/IgfsMapReduceExample.java | 2 +- .../src/main/java/org/apache/ignite/Ignite.java | 12 +-- .../main/java/org/apache/ignite/IgniteFs.java | 22 ++--- .../eviction/igfs/CacheIgfsEvictionFilter.java | 2 +- .../CacheIgfsPerBlockLruEvictionPolicy.java | 2 +- ...acheIgfsPerBlockLruEvictionPolicyMXBean.java | 4 +- .../ignite/configuration/IgfsConfiguration.java | 98 ++++++++++---------- .../configuration/IgniteConfiguration.java | 20 ++-- .../org/apache/ignite/events/EventType.java | 52 +++++------ .../org/apache/ignite/events/IgfsEvent.java | 4 +- .../main/java/org/apache/ignite/igfs/Igfs.java | 2 +- .../apache/ignite/igfs/IgfsBlockLocation.java | 2 +- .../IgfsConcurrentModificationException.java | 2 +- .../org/apache/ignite/igfs/IgfsException.java | 8 +- .../java/org/apache/ignite/igfs/IgfsFile.java | 2 +- .../ignite/igfs/IgfsFileNotFoundException.java | 2 +- .../igfs/IgfsGroupDataBlocksKeyMapper.java | 6 +- .../org/apache/ignite/igfs/IgfsInputStream.java | 2 +- .../ignite/igfs/IgfsInvalidPathException.java | 2 +- .../org/apache/ignite/igfs/IgfsMetrics.java | 4 +- .../java/org/apache/ignite/igfs/IgfsMode.java | 10 +- .../ignite/igfs/IgfsOutOfSpaceException.java | 6 +- .../apache/ignite/igfs/IgfsOutputStream.java | 2 +- .../java/org/apache/ignite/igfs/IgfsPath.java | 2 +- .../ignite/igfs/mapreduce/IgfsFileRange.java | 2 +- .../apache/ignite/igfs/mapreduce/IgfsJob.java | 2 +- .../igfs/mapreduce/IgfsRecordResolver.java | 2 +- .../apache/ignite/igfs/mapreduce/IgfsTask.java | 8 +- .../ignite/igfs/mapreduce/IgfsTaskArgs.java | 8 +- .../IgfsByteDelimiterRecordResolver.java | 4 +- .../ignite/internal/GridKernalContext.java | 8 +- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../igfs/common/IgfsControlResponse.java | 6 +- .../igfs/common/IgfsDataInputStream.java | 2 +- .../igfs/common/IgfsDataOutputStream.java | 2 +- .../igfs/common/IgfsHandshakeRequest.java | 6 +- .../internal/igfs/common/IgfsIpcCommand.java | 2 +- .../ignite/internal/igfs/common/IgfsLogger.java | 2 +- .../internal/igfs/common/IgfsMarshaller.java | 8 +- .../internal/igfs/common/IgfsMessage.java | 6 +- .../internal/igfs/common/IgfsStatusRequest.java | 2 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheProjectionEx.java | 12 +-- .../preloader/GridDhtPartitionDemandPool.java | 2 +- .../processors/igfs/IgfsAttributes.java | 10 +- .../processors/igfs/IgfsBlocksMessage.java | 2 +- .../processors/igfs/IgfsClientSession.java | 2 +- .../igfs/IgfsCommunicationMessage.java | 2 +- .../internal/processors/igfs/IgfsContext.java | 14 +-- .../processors/igfs/IgfsDataManager.java | 22 ++--- .../processors/igfs/IgfsDeleteWorker.java | 12 +-- .../igfs/IgfsDirectoryNotEmptyException.java | 2 +- .../ignite/internal/processors/igfs/IgfsEx.java | 4 +- .../processors/igfs/IgfsFileWorker.java | 4 +- .../processors/igfs/IgfsFileWorkerTask.java | 2 +- .../igfs/IgfsFragmentizerManager.java | 8 +- .../igfs/IgfsFragmentizerRequest.java | 2 +- .../processors/igfs/IgfsHandshakeResponse.java | 4 +- .../internal/processors/igfs/IgfsHelper.java | 6 +- .../processors/igfs/IgfsHelperImpl.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 60 ++++++------ .../igfs/IgfsInputStreamDescriptor.java | 2 +- .../processors/igfs/IgfsInputStreamImpl.java | 4 +- .../processors/igfs/IgfsIpcHandler.java | 16 ++-- .../internal/processors/igfs/IgfsJobImpl.java | 16 ++-- .../processors/igfs/IgfsLocalMetrics.java | 2 +- .../internal/processors/igfs/IgfsManager.java | 8 +- .../processors/igfs/IgfsMetaManager.java | 2 +- .../processors/igfs/IgfsMetricsAdapter.java | 2 +- .../processors/igfs/IgfsModeResolver.java | 8 +- .../processors/igfs/IgfsNoopProcessor.java | 2 +- .../processors/igfs/IgfsOutputStreamImpl.java | 10 +- .../internal/processors/igfs/IgfsPaths.java | 6 +- .../internal/processors/igfs/IgfsProcessor.java | 62 ++++++------- .../processors/igfs/IgfsProcessorAdapter.java | 22 ++--- .../processors/igfs/IgfsSamplingKey.java | 8 +- .../internal/processors/igfs/IgfsServer.java | 12 +-- .../processors/igfs/IgfsServerHandler.java | 2 +- .../processors/igfs/IgfsServerManager.java | 6 +- .../internal/processors/igfs/IgfsStatus.java | 12 +-- .../processors/igfs/IgfsTaskArgsImpl.java | 6 +- .../internal/processors/igfs/IgfsThread.java | 10 +- .../ignite/internal/util/ipc/IpcEndpoint.java | 2 +- .../ignite/internal/visor/igfs/VisorIgfs.java | 28 +++--- .../internal/visor/igfs/VisorIgfsEndpoint.java | 10 +- .../visor/igfs/VisorIgfsFormatTask.java | 6 +- .../internal/visor/igfs/VisorIgfsMetrics.java | 4 +- .../internal/visor/igfs/VisorIgfsProfiler.java | 4 +- .../visor/igfs/VisorIgfsProfilerClearTask.java | 4 +- .../visor/igfs/VisorIgfsProfilerEntry.java | 6 +- .../visor/igfs/VisorIgfsProfilerTask.java | 18 ++-- .../visor/igfs/VisorIgfsResetMetricsTask.java | 6 +- .../visor/igfs/VisorIgfsSamplingStateTask.java | 6 +- .../visor/node/VisorGridConfiguration.java | 2 +- .../visor/node/VisorIgfsConfiguration.java | 44 ++++----- .../visor/node/VisorNodeDataCollectorJob.java | 2 +- .../node/VisorNodeDataCollectorJobResult.java | 6 +- .../node/VisorNodeDataCollectorTaskResult.java | 12 +-- .../internal/visor/util/VisorTaskUtils.java | 8 +- modules/core/src/test/config/igfs-loopback.xml | 2 +- modules/core/src/test/config/igfs-shmem.xml | 2 +- .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 56 +++++------ .../igfs/IgfsFragmentizerAbstractSelfTest.java | 4 +- ...heIgfsPerBlockLruEvictionPolicySelfTest.java | 10 +- .../processors/igfs/IgfsAbstractSelfTest.java | 80 ++++++++-------- .../processors/igfs/IgfsCacheSelfTest.java | 2 +- .../processors/igfs/IgfsCommonAbstractTest.java | 2 +- .../igfs/IgfsDataManagerSelfTest.java | 8 +- .../igfs/IgfsDualAbstractSelfTest.java | 10 +- ...IgfsGroupDataBlockKeyMapperHashSelfTest.java | 4 +- .../processors/igfs/IgfsMetricsSelfTest.java | 10 +- .../processors/igfs/IgfsModesSelfTest.java | 20 ++-- .../processors/igfs/IgfsProcessorSelfTest.java | 4 +- .../igfs/IgfsProcessorValidationSelfTest.java | 40 ++++---- .../processors/igfs/IgfsSizeSelfTest.java | 24 ++--- .../processors/igfs/IgfsStreamsSelfTest.java | 4 +- .../processors/igfs/IgfsTaskSelfTest.java | 2 +- .../IgfsAbstractRecordResolverSelfTest.java | 2 +- modules/hadoop/readme.txt | 2 +- .../igfs/hadoop/IgfsHadoopParameters.java | 8 +- .../igfs/hadoop/v1/IgfsHadoopFileSystem.java | 38 ++++---- .../igfs/hadoop/v2/IgfsHadoopFileSystem.java | 26 +++--- .../ignite/internal/igfs/hadoop/IgfsHadoop.java | 4 +- .../IgfsHadoopCommunicationException.java | 2 +- .../igfs/hadoop/IgfsHadoopEndpoint.java | 10 +- .../internal/igfs/hadoop/IgfsHadoopEx.java | 2 +- .../hadoop/IgfsHadoopFileSystemWrapper.java | 10 +- .../internal/igfs/hadoop/IgfsHadoopFuture.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopInProc.java | 10 +- .../igfs/hadoop/IgfsHadoopInputStream.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopIo.java | 6 +- .../internal/igfs/hadoop/IgfsHadoopIpcIo.java | 4 +- .../internal/igfs/hadoop/IgfsHadoopOutProc.java | 8 +- .../igfs/hadoop/IgfsHadoopOutputStream.java | 2 +- .../igfs/hadoop/IgfsHadoopStreamDelegate.java | 2 +- .../hadoop/IgfsHadoopStreamEventListener.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopUtils.java | 2 +- .../internal/igfs/hadoop/IgfsHadoopWrapper.java | 14 +-- .../ignite/internal/igfs/hadoop/package.html | 2 +- .../apache/ignite/internal/igfs/package.html | 2 +- .../hadoop/GridHadoopClassLoader.java | 4 +- .../GridHadoopDefaultMapReducePlanner.java | 6 +- .../GridHadoopClientProtocolSelfTest.java | 4 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 8 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 12 +-- .../igfs/IgfsHadoopDualAbstractSelfTest.java | 18 ++-- .../IgfsHadoopFileSystemAbstractSelfTest.java | 12 +-- .../IgfsHadoopFileSystemClientSelfTest.java | 4 +- .../IgfsHadoopFileSystemHandshakeSelfTest.java | 18 ++-- .../IgfsHadoopFileSystemLoggerSelfTest.java | 8 +- ...IgfsHadoopFileSystemLoggerStateSelfTest.java | 4 +- ...adoopFileSystemLoopbackAbstractSelfTest.java | 4 +- ...SystemLoopbackEmbeddedDualAsyncSelfTest.java | 2 +- ...eSystemLoopbackEmbeddedDualSyncSelfTest.java | 2 +- ...leSystemLoopbackEmbeddedPrimarySelfTest.java | 2 +- ...SystemLoopbackEmbeddedSecondarySelfTest.java | 2 +- ...SystemLoopbackExternalDualAsyncSelfTest.java | 2 +- ...eSystemLoopbackExternalDualSyncSelfTest.java | 2 +- ...leSystemLoopbackExternalPrimarySelfTest.java | 2 +- ...SystemLoopbackExternalSecondarySelfTest.java | 2 +- ...fsHadoopFileSystemSecondaryModeSelfTest.java | 4 +- ...fsHadoopFileSystemShmemAbstractSelfTest.java | 4 +- ...ileSystemShmemEmbeddedDualAsyncSelfTest.java | 2 +- ...FileSystemShmemEmbeddedDualSyncSelfTest.java | 2 +- ...pFileSystemShmemEmbeddedPrimarySelfTest.java | 2 +- ...ileSystemShmemEmbeddedSecondarySelfTest.java | 2 +- ...ileSystemShmemExternalDualAsyncSelfTest.java | 2 +- ...FileSystemShmemExternalDualSyncSelfTest.java | 2 +- ...pFileSystemShmemExternalPrimarySelfTest.java | 2 +- ...ileSystemShmemExternalSecondarySelfTest.java | 2 +- .../java/org/apache/ignite/igfs/IgfsLoad.java | 2 +- .../hadoop/GridHadoopAbstractSelfTest.java | 20 ++-- .../hadoop/GridHadoopAbstractWordCountTest.java | 2 +- .../hadoop/GridHadoopCommandLineTest.java | 2 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 8 +- .../hadoop/GridHadoopFileSystemsTest.java | 2 +- .../hadoop/GridHadoopSortingTest.java | 2 +- .../ignite/loadtests/ggfs/IgfsNodeStartup.java | 2 +- .../ggfs/IgfsPerformanceBenchmark.java | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- 184 files changed, 783 insertions(+), 783 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/config/fabric/default-config.xml ---------------------------------------------------------------------- diff --git a/config/fabric/default-config.xml b/config/fabric/default-config.xml index b45656a..e623dff 100644 --- a/config/fabric/default-config.xml +++ b/config/fabric/default-config.xml @@ -29,9 +29,9 @@ If you need to add streaming functionality, add your streamers configuration in 'streamerConfiguration' property below. - If you need to enable GGFS, use separate configuration files located in 'config/hadoop' - folder. To start a GGFS data node use 'config/hadoop/default-config.xml' file. To start - a GGFS client node use 'config/hadoop/default-config-client.xml' file. + If you need to enable IGFS, use separate configuration files located in 'config/hadoop' + folder. To start a IGFS data node use 'config/hadoop/default-config.xml' file. To start + a IGFS client node use 'config/hadoop/default-config-client.xml' file. --> <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <!-- Cache configurations. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/config/hadoop/default-config.xml ---------------------------------------------------------------------- diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml index b2b4b31..a545625 100644 --- a/config/hadoop/default-config.xml +++ b/config/hadoop/default-config.xml @@ -37,7 +37,7 @@ Optional description. --> <description> - Spring file for Ignite node configuration with GGFS and Apache Hadoop map-reduce support enabled. + Spring file for Ignite node configuration with IGFS and Apache Hadoop map-reduce support enabled. Ignite node will start with this configuration by default. </description> @@ -50,7 +50,7 @@ </bean> <!-- - Abstract GGFS file system configuration to be used as a template. + Abstract IGFS file system configuration to be used as a template. --> <bean id="ggfsCfgBase" class="org.apache.ignite.configuration.IgniteFsConfiguration" abstract="true"> <!-- Must correlate with cache affinity mapper. --> @@ -62,7 +62,7 @@ </bean> <!-- - Abstract cache configuration for GGFS file data to be used as a template. + Abstract cache configuration for IGFS file data to be used as a template. --> <bean id="dataCacheCfgBase" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true"> <property name="cacheMode" value="PARTITIONED"/> @@ -78,7 +78,7 @@ </bean> <!-- - Abstract cache configuration for GGFS metadata to be used as a template. + Abstract cache configuration for IGFS metadata to be used as a template. --> <bean id="metaCacheCfgBase" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true"> <property name="cacheMode" value="REPLICATED"/> @@ -110,7 +110,7 @@ </property> <!-- - Configure one GGFS file system instance named "ggfs" on this node. + Configure one IGFS file system instance named "ggfs" on this node. --> <property name="ggfsConfiguration"> <list> @@ -134,7 +134,7 @@ </property> <!-- - Caches needed by GGFS. + Caches needed by IGFS. --> <property name="cacheConfiguration"> <list> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/docs/hadoop_readme.md ---------------------------------------------------------------------- diff --git a/docs/hadoop_readme.md b/docs/hadoop_readme.md index 739a07c..f667866 100644 --- a/docs/hadoop_readme.md +++ b/docs/hadoop_readme.md @@ -61,7 +61,7 @@ To configure Ignite nodes you can change configuration files at `config` directo ### 3.1 Distributed File System Configuration -Ignite has it's own distributed in-memory file system called IgniteFS. Hadoop jobs can use it instead of HDFS to achieve maximum performance and scalability. Setting up GGFS is much simpler than HDFS, it requires just few tweaks of Ignite node configuration and does not require starting any additional processes. Default configuration shipped with the Accelerator contains one configured instance named "ignitefs" which can be used as reference. +Ignite has it's own distributed in-memory file system called IgniteFS. Hadoop jobs can use it instead of HDFS to achieve maximum performance and scalability. Setting up IGFS is much simpler than HDFS, it requires just few tweaks of Ignite node configuration and does not require starting any additional processes. Default configuration shipped with the Accelerator contains one configured instance named "ignitefs" which can be used as reference. Generally URI for IgniteFS which will be used by Apache Hadoop looks like: @@ -85,7 +85,7 @@ To run Apache Hadoop job with Ignite cluster you have to start one or multiple I When all the configuration is complete and Ignite nodes are started, running Apache Hadoop job will be the same as with conventional Apache Hadoop distribution except that all Ignite nodes are equal and any of them can be treated as Job Tracker and DFS Name Node. -To run "Word Count" example you can load some text files to GGFS using standard Apache Hadoop tools: +To run "Word Count" example you can load some text files to IGFS using standard Apache Hadoop tools: cd $HADOOP_HOME/bin http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java b/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java index 4c17ee7..e55a714 100644 --- a/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/ignitefs/IgfsMapReduceExample.java @@ -66,7 +66,7 @@ public class IgfsMapReduceExample { // Working directory path. IgfsPath workDir = new IgfsPath("/examples/fs"); - // Write file to GGFS. + // Write file to IGFS. IgfsPath fsPath = new IgfsPath(workDir, file.getName()); writeFile(fs, fsPath, file); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/Ignite.java b/modules/core/src/main/java/org/apache/ignite/Ignite.java index f3b86fb..6e8575e 100644 --- a/modules/core/src/main/java/org/apache/ignite/Ignite.java +++ b/modules/core/src/main/java/org/apache/ignite/Ignite.java @@ -189,7 +189,7 @@ public interface Ignite extends AutoCloseable { /** * Gets the cache instance for the given name, if one does not * exist {@link IllegalArgumentException} will be thrown. - * Note that in case named cache instance is used as GGFS data or meta cache, {@link IllegalStateException} + * Note that in case named cache instance is used as IGFS data or meta cache, {@link IllegalStateException} * will be thrown. * * @param <K> Key type. @@ -204,7 +204,7 @@ public interface Ignite extends AutoCloseable { /** * Gets all configured caches. - * Caches that are used as GGFS meta and data caches will not be returned in resulting collection. + * Caches that are used as IGFS meta and data caches will not be returned in resulting collection. * * @see org.apache.ignite.configuration.IgfsConfiguration * @see org.apache.ignite.configuration.IgfsConfiguration#getDataCacheName() @@ -240,15 +240,15 @@ public interface Ignite extends AutoCloseable { public <K, V> IgniteDataLoader<K, V> dataLoader(@Nullable String cacheName); /** - * Gets an instance of GGFS - Ignite In-Memory File System, if one is not + * Gets an instance of IGFS - Ignite In-Memory File System, if one is not * configured then {@link IllegalArgumentException} will be thrown. * <p> - * GGFS is fully compliant with Hadoop {@code FileSystem} APIs and can + * IGFS is fully compliant with Hadoop {@code FileSystem} APIs and can * be plugged into Hadoop installations. For more information refer to * documentation on Hadoop integration shipped with Ignite. * - * @param name GGFS name. - * @return GGFS instance. + * @param name IGFS name. + * @return IGFS instance. */ public IgniteFs fileSystem(String name); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 3ce03e8..9bd7232 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteFs.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteFs.java @@ -38,18 +38,18 @@ import java.util.*; * nodes to escape unnecessary networking. * <p/> * This API is fully thread-safe and you can use it from several threads. - * <h1 class="header">GGFS Configuration</h1> + * <h1 class="header">IGFS Configuration</h1> * The simplest way to run a Ignite node with configured file system is to pass * special configuration file included in Ignite distribution to {@code ignite.sh} or * {@code ignite.bat} scripts, like this: {@code ignite.sh config/hadoop/default-config.xml} * <p> - * {@code GGFS} can be started as a data node or as a client node. Data node is responsible for + * {@code IGFS} can be started as a data node or as a client node. Data node is responsible for * caching data, while client node is responsible for basic file system operations and accessing * data nodes remotely. When used as Hadoop file system, clients nodes usually started together * with {@code job-submitter} or {@code job-scheduler} processes, while data nodes are usually * started together with Hadoop {@code task-tracker} processes. * <h1 class="header">Integration With Hadoop</h1> - * In addition to direct file system API, {@code GGFS} can be integrated with {@code Hadoop} by + * 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. @@ -57,7 +57,7 @@ import java.util.*; * <b>NOTE:</b> integration with Hadoop is available only in {@code In-Memory Accelerator For Hadoop} edition. */ public interface IgniteFs extends Igfs, IgniteAsyncSupport { - /** GGFS scheme name. */ + /** IGFS scheme name. */ public static final String IGFS_SCHEME = "igfs"; /** File property: prefer writes to local node. */ @@ -71,9 +71,9 @@ public interface IgniteFs extends Igfs, IgniteAsyncSupport { public String name(); /** - * Gets GGFS configuration. + * Gets IGFS configuration. * - * @return GGFS configuration. + * @return IGFS configuration. */ public IgfsConfiguration configuration(); @@ -267,7 +267,7 @@ public interface IgniteFs extends Igfs, IgniteAsyncSupport { public void format() throws IgniteException; /** - * Executes GGFS task. + * Executes IGFS task. * <p> * Supports asynchronous execution (see {@link IgniteAsyncSupport}). * @@ -283,7 +283,7 @@ public interface IgniteFs extends Igfs, IgniteAsyncSupport { Collection<IgfsPath> paths, @Nullable T arg) throws IgniteException; /** - * Executes GGFS task with overridden maximum range length (see + * Executes IGFS task with overridden maximum range length (see * {@link org.apache.ignite.configuration.IgfsConfiguration#getMaximumTaskRangeLength()} for more information). * <p> * Supports asynchronous execution (see {@link IgniteAsyncSupport}). @@ -294,7 +294,7 @@ public interface IgniteFs extends Igfs, IgniteAsyncSupport { * @param skipNonExistentFiles Whether to skip non existent files. If set to {@code true} non-existent files will * be ignored. Otherwise an exception will be thrown. * @param maxRangeLen Optional maximum range length. If {@code 0}, then by default all consecutive - * GGFS blocks will be included. + * IGFS blocks will be included. * @param arg Optional task argument. * @return Task result. * @throws IgniteException If execution failed. @@ -305,7 +305,7 @@ public interface IgniteFs extends Igfs, IgniteAsyncSupport { throws IgniteException; /** - * Executes GGFS task. + * Executes IGFS task. * <p> * Supports asynchronous execution (see {@link IgniteAsyncSupport}). * @@ -321,7 +321,7 @@ public interface IgniteFs extends Igfs, IgniteAsyncSupport { @Nullable IgfsRecordResolver rslvr, Collection<IgfsPath> paths, @Nullable T arg) throws IgniteException; /** - * Executes GGFS task with overridden maximum range length (see + * Executes IGFS task with overridden maximum range length (see * {@link org.apache.ignite.configuration.IgfsConfiguration#getMaximumTaskRangeLength()} for more information). * <p> * Supports asynchronous execution (see {@link IgniteAsyncSupport}). http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsEvictionFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsEvictionFilter.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsEvictionFilter.java index 6c3cecc..d8b16c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsEvictionFilter.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsEvictionFilter.java @@ -23,7 +23,7 @@ import org.apache.ignite.internal.processors.igfs.*; import javax.cache.*; /** - * GGFS eviction filter which will not evict blocks of particular files. + * IGFS eviction filter which will not evict blocks of particular files. */ public class CacheIgfsEvictionFilter implements CacheEvictionFilter { /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicy.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicy.java index b9e4646..d58fb4a 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicy.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicy.java @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.*; import java.util.regex.*; /** - * GGFS eviction policy which evicts particular blocks. + * IGFS eviction policy which evicts particular blocks. */ public class CacheIgfsPerBlockLruEvictionPolicy implements CacheEvictionPolicy<IgfsBlockKey, byte[]>, CacheIgfsPerBlockLruEvictionPolicyMXBean { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicyMXBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicyMXBean.java b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicyMXBean.java index e5bd436..e3abc29 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicyMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/eviction/igfs/CacheIgfsPerBlockLruEvictionPolicyMXBean.java @@ -23,9 +23,9 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * MBean for {@code GGFS per-block LRU} eviction policy. + * MBean for {@code IGFS per-block LRU} eviction policy. */ -@MXBeanDescription("MBean for GGFS per-block LRU cache eviction policy.") +@MXBeanDescription("MBean for IGFS per-block LRU cache eviction policy.") public interface CacheIgfsPerBlockLruEvictionPolicyMXBean { /** * Gets maximum allowed size of all blocks in bytes. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 c9907e2..deeb410 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 @@ -25,12 +25,12 @@ import java.util.*; import java.util.concurrent.*; /** - * {@code GGFS} configuration. More than one file system can be configured within grid. - * {@code GGFS} configuration is provided via {@link org.apache.ignite.configuration.IgniteConfiguration#getIgfsConfiguration()} + * {@code IGFS} configuration. More than one file system can be configured within grid. + * {@code IGFS} configuration is provided via {@link org.apache.ignite.configuration.IgniteConfiguration#getIgfsConfiguration()} * method. * <p> * Refer to {@code config/hadoop/default-config.xml} or {@code config/hadoop/default-config-client.xml} - * configuration files under Ignite installation to see sample {@code GGFS} configuration. + * configuration files under Ignite installation to see sample {@code IGFS} configuration. */ public class IgfsConfiguration { /** Default file system user name. */ @@ -57,7 +57,7 @@ public class IgfsConfiguration { /** Default batch size for logging. */ public static final int DFLT_IGFS_LOG_BATCH_SIZE = 100; - /** Default {@code GGFS} log directory. */ + /** Default {@code IGFS} log directory. */ public static final String DFLT_IGFS_LOG_DIR = "work/igfs/log"; /** Default per node buffer size. */ @@ -66,7 +66,7 @@ public class IgfsConfiguration { /** Default number of per node parallel operations. */ public static final int DFLT_PER_NODE_PARALLEL_BATCH_CNT = 8; - /** Default GGFS mode. */ + /** Default IGFS mode. */ public static final IgfsMode DFLT_MODE = IgfsMode.DUAL_ASYNC; /** Default file's data block size (bytes). */ @@ -84,10 +84,10 @@ public class IgfsConfiguration { /** Default IPC endpoint enabled flag. */ public static final boolean DFLT_IPC_ENDPOINT_ENABLED = true; - /** GGFS instance name. */ + /** IGFS instance name. */ private String name; - /** Cache name to store GGFS meta information. */ + /** Cache name to store IGFS meta information. */ private String metaCacheName; /** Cache name to store file's data blocks. */ @@ -111,7 +111,7 @@ public class IgfsConfiguration { /** Per node parallel operations. */ private int perNodeParallelBatchCnt = DFLT_PER_NODE_PARALLEL_BATCH_CNT; - /** IPC endpoint properties to publish GGFS over. */ + /** IPC endpoint properties to publish IGFS over. */ private Map<String, String> ipcEndpointCfg; /** IPC endpoint enabled flag. */ @@ -123,7 +123,7 @@ public class IgfsConfiguration { /** Secondary file system */ private Igfs secondaryFs; - /** GGFS mode. */ + /** IGFS mode. */ private IgfsMode dfltMode = DFLT_MODE; /** Fragmentizer throttling block length. */ @@ -209,56 +209,56 @@ public class IgfsConfiguration { } /** - * Gets GGFS instance name. If {@code null}, then instance with default + * Gets IGFS instance name. If {@code null}, then instance with default * name will be used. * - * @return GGFS instance name. + * @return IGFS instance name. */ @Nullable public String getName() { return name; } /** - * Sets GGFS instance name. + * Sets IGFS instance name. * - * @param name GGFS instance name. + * @param name IGFS instance name. */ public void setName(String name) { this.name = name; } /** - * Cache name to store GGFS meta information. If {@code null}, then instance + * Cache name to store IGFS meta information. If {@code null}, then instance * with default meta-cache name will be used. * - * @return Cache name to store GGFS meta information. + * @return Cache name to store IGFS meta information. */ @Nullable public String getMetaCacheName() { return metaCacheName; } /** - * Sets cache name to store GGFS meta information. + * Sets cache name to store IGFS meta information. * - * @param metaCacheName Cache name to store GGFS meta information. + * @param metaCacheName Cache name to store IGFS meta information. */ public void setMetaCacheName(String metaCacheName) { this.metaCacheName = metaCacheName; } /** - * Cache name to store GGFS data. + * Cache name to store IGFS data. * - * @return Cache name to store GGFS data. + * @return Cache name to store IGFS data. */ @Nullable public String getDataCacheName() { return dataCacheName; } /** - * Sets cache name to store GGFS data. + * Sets cache name to store IGFS data. * - * @param dataCacheName Cache name to store GGFS data. + * @param dataCacheName Cache name to store IGFS data. */ public void setDataCacheName(String dataCacheName) { this.dataCacheName = dataCacheName; @@ -306,14 +306,14 @@ public class IgfsConfiguration { /** * Get amount of sequential block reads before prefetch is triggered. The - * higher this value, the longer GGFS will wait before starting to prefetch + * higher this value, the longer IGFS will wait before starting to prefetch * values ahead of time. Depending on the use case, this can either help * or hurt performance. * <p> * 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_GGFS_SEQ_READS_BEFORE_PREFETCH} + * {@code org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopParameters.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. @@ -326,14 +326,14 @@ public class IgfsConfiguration { /** * Sets amount of sequential block reads before prefetch is triggered. The - * higher this value, the longer GGFS will wait before starting to prefetch + * higher this value, the longer IGFS will wait before starting to prefetch * values ahead of time. Depending on the use case, this can either help * or hurt performance. * <p> * 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_GGFS_SEQ_READS_BEFORE_PREFETCH} + * {@code org.apache.ignite.ignitefs.hadoop.GridGgfsHadoopParameters.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. @@ -347,7 +347,7 @@ public class IgfsConfiguration { } /** - * Get read/write buffer size for {@code GGFS} stream operations in bytes. + * Get read/write buffer size for {@code IGFS} stream operations in bytes. * * @return Read/write buffers size (bytes). */ @@ -356,7 +356,7 @@ public class IgfsConfiguration { } /** - * Sets read/write buffers size for {@code GGFS} stream operations (bytes). + * Sets read/write buffers size for {@code IGFS} stream operations (bytes). * * @param bufSize Read/write buffers size for stream operations (bytes) or {@code 0} to reset default value. */ @@ -428,7 +428,7 @@ public class IgfsConfiguration { * </ul> * <p> * Note that {@code shared-memory} approach is not supported on Windows environments. - * In case GGFS is failed to bind to particular port, further attempts will be performed every 3 seconds. + * In case IGFS is failed to bind to particular port, further attempts will be performed every 3 seconds. * * @return Map of IPC endpoint configuration properties. In case the value is not set, defaults will be used. Default * type for Windows is "tcp", for all other platforms - "shmem". Default port is {@link #DFLT_IPC_PORT}. @@ -438,7 +438,7 @@ public class IgfsConfiguration { } /** - * Sets IPC endpoint configuration to publish GGFS over. + * Sets IPC endpoint configuration to publish IGFS over. * * @param ipcEndpointCfg Map of IPC endpoint config properties. */ @@ -466,8 +466,8 @@ public class IgfsConfiguration { } /** - * Gets port number for management endpoint. All GGFS nodes should have this port open - * for Visor Management Console to work with GGFS. + * Gets port number for management endpoint. All IGFS nodes should have this port open + * for Visor Management Console to work with IGFS. * <p> * Default value is {@link #DFLT_MGMT_PORT} * @@ -487,25 +487,25 @@ public class IgfsConfiguration { } /** - * Gets mode to specify how {@code GGFS} interacts with Hadoop file system, like {@code HDFS}. + * Gets mode to specify how {@code IGFS} interacts with Hadoop file system, like {@code HDFS}. * Secondary Hadoop file system is provided for pass-through, write-through, and read-through * purposes. * <p> * Default mode is {@link org.apache.ignite.igfs.IgfsMode#DUAL_ASYNC}. If secondary Hadoop file system is * not configured, this mode will work just like {@link org.apache.ignite.igfs.IgfsMode#PRIMARY} mode. * - * @return Mode to specify how GGFS interacts with secondary HDFS file system. + * @return Mode to specify how IGFS interacts with secondary HDFS file system. */ public IgfsMode getDefaultMode() { return dfltMode; } /** - * Sets {@code GGFS} mode to specify how it should interact with secondary + * Sets {@code IGFS} mode to specify how it should interact with secondary * Hadoop file system, like {@code HDFS}. Secondary Hadoop file system is provided * for pass-through, write-through, and read-through purposes. * - * @param dfltMode {@code GGFS} mode. + * @param dfltMode {@code IGFS} mode. */ public void setDefaultMode(IgfsMode dfltMode) { this.dfltMode = dfltMode; @@ -532,7 +532,7 @@ public class IgfsConfiguration { } /** - * Gets map of path prefixes to {@code GGFS} modes used for them. + * Gets map of path prefixes to {@code IGFS} modes used for them. * <p> * If path doesn't correspond to any specified prefix or mappings are not provided, then * {@link #getDefaultMode()} is used. @@ -545,19 +545,19 @@ public class IgfsConfiguration { * <li>{@code /apache/ignite/sync} and all it's sub-folders will always work in {@code DUAL_SYNC} mode.</li> * <li>{@code /apache/ignite/async} and all it's sub-folders will always work in {@code DUAL_ASYNC} mode.</li> * - * @return Map of paths to {@code GGFS} modes. + * @return Map of paths to {@code IGFS} modes. */ @Nullable public Map<String, IgfsMode> getPathModes() { return pathModes; } /** - * Sets map of path prefixes to {@code GGFS} modes used for them. + * Sets map of path prefixes to {@code IGFS} modes used for them. * <p> * If path doesn't correspond to any specified prefix or mappings are not provided, then * {@link #getDefaultMode()} is used. * - * @param pathModes Map of paths to {@code GGFS} modes. + * @param pathModes Map of paths to {@code IGFS} modes. */ public void setPathModes(Map<String, IgfsMode> pathModes) { this.pathModes = pathModes; @@ -618,10 +618,10 @@ public class IgfsConfiguration { } /** - * Gets amount of local memory (in % of local GGFS max space size) available for local writes + * Gets amount of local memory (in % of local IGFS max space size) available for local writes * during file creation. * <p> - * If current GGFS space size is less than {@code fragmentizerLocalWritesRatio * maxSpaceSize}, + * If current IGFS space size is less than {@code fragmentizerLocalWritesRatio * maxSpaceSize}, * then file blocks will be written to the local node first and then asynchronously distributed * among cluster nodes (fragmentized). * <p> @@ -644,7 +644,7 @@ public class IgfsConfiguration { } /** - * Gets flag indicating whether GGFS fragmentizer is enabled. If fragmentizer is disabled, files will be + * Gets flag indicating whether IGFS fragmentizer is enabled. If fragmentizer is disabled, files will be * written in distributed fashion. * * @return Flag indicating whether fragmentizer is enabled. @@ -700,7 +700,7 @@ public class IgfsConfiguration { /** * Get DUAL mode put operation executor service. This executor service will process cache PUT requests for - * data which came from the secondary file system and about to be written to GGFS data cache. + * data which came from the secondary file system and about to be written to IGFS data cache. * In case no executor service is provided, default one will be created with maximum amount of threads equals * to amount of processor cores. * @@ -761,9 +761,9 @@ public class IgfsConfiguration { } /** - * Get maximum default range size of a file being split during GGFS task execution. When GGFS task is about to + * Get maximum default range size of a file being split during IGFS task execution. When IGFS task is about to * be executed, it requests file block locations first. Each location is defined as {@link org.apache.ignite.igfs.mapreduce.IgfsFileRange} which - * has length. In case this parameter is set to positive value, then GGFS will split single file range into smaller + * has length. In case this parameter is set to positive value, then IGFS will split single file range into smaller * ranges with length not greater that this parameter. The only exception to this case is when maximum task range * length is smaller than file block size. In this case maximum task range size will be overridden and set to file * block size. @@ -773,7 +773,7 @@ public class IgfsConfiguration { * parameter depending on file data layout and selected resolver type. * <p> * Setting this parameter might be useful when file is highly colocated and have very long consequent data chunks - * so that task execution suffers from insufficient parallelism. E.g., in case you have one GGFS node in topology + * so that task execution suffers from insufficient parallelism. E.g., in case you have one IGFS node in topology * and want to process 1Gb file, then only single range of length 1Gb will be returned. This will result in * a single job which will be processed in one thread. But in case you provide this configuration parameter and set * maximum range length to 16Mb, then 64 ranges will be returned resulting in 64 jobs which could be executed in @@ -784,17 +784,17 @@ public class IgfsConfiguration { * In case value of this parameter is set to {@code 0} or negative value, it is simply ignored. Default value is * {@code 0}. * - * @return Maximum range size of a file being split during GGFS task execution. + * @return Maximum range size of a file being split during IGFS task execution. */ public long getMaximumTaskRangeLength() { return maxTaskRangeLen; } /** - * Set maximum default range size of a file being split during GGFS task execution. + * Set maximum default range size of a file being split during IGFS task execution. * See {@link #getMaximumTaskRangeLength()} for more details. * - * @param maxTaskRangeLen Set maximum default range size of a file being split during GGFS task execution. + * @param maxTaskRangeLen Set maximum default range size of a file being split during IGFS task execution. */ public void setMaximumTaskRangeLength(long maxTaskRangeLen) { this.maxTaskRangeLen = maxTaskRangeLen; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 811a557..19a2757 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -205,7 +205,7 @@ public class IgniteConfiguration { /** Management pool size. */ private int mgmtPoolSize = DFLT_MGMT_THREAD_CNT; - /** GGFS pool size. */ + /** IGFS pool size. */ private int igfsPoolSize = AVAILABLE_PROC_CNT; /** Lifecycle email notification. */ @@ -392,7 +392,7 @@ public class IgniteConfiguration { /** Local event listeners. */ private Map<IgnitePredicate<? extends Event>, int[]> lsnrs; - /** GGFS configuration. */ + /** IGFS configuration. */ private IgfsConfiguration[] igfsCfg; /** Streamer configuration. */ @@ -994,11 +994,11 @@ public class IgniteConfiguration { } /** - * Size of thread pool that is in charge of processing outgoing GGFS messages. + * Size of thread pool that is in charge of processing outgoing IGFS messages. * <p> * If not provided, executor service will have size equals number of processors available in system. * - * @return Thread pool size to be used for GGFS outgoing message sending. + * @return Thread pool size to be used for IGFS outgoing message sending. */ public int getIgfsThreadPoolSize() { return igfsPoolSize; @@ -1045,9 +1045,9 @@ public class IgniteConfiguration { } /** - * Set thread pool size that will be used to process outgoing GGFS messages. + * Set thread pool size that will be used to process outgoing IGFS messages. * - * @param poolSize Executor service to use for outgoing GGFS messages. + * @param poolSize Executor service to use for outgoing IGFS messages. * @see IgniteConfiguration#getIgfsThreadPoolSize() */ public void setIgfsThreadPoolSize(int poolSize) { @@ -2138,18 +2138,18 @@ public class IgniteConfiguration { } /** - * Gets GGFS configurations. + * Gets IGFS configurations. * - * @return GGFS configurations. + * @return IGFS configurations. */ public IgfsConfiguration[] getIgfsConfiguration() { return igfsCfg; } /** - * Sets GGFS configurations. + * Sets IGFS configurations. * - * @param igfsCfg GGFS configurations. + * @param igfsCfg IGFS configurations. */ public void setIgfsConfiguration(IgfsConfiguration... igfsCfg) { this.igfsCfg = igfsCfg; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/events/EventType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java b/modules/core/src/main/java/org/apache/ignite/events/EventType.java index ca59fb8..a9f185a 100644 --- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java +++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java @@ -680,9 +680,9 @@ public interface EventType { public static final int EVT_VISOR_EVENTS_LOST = 115; /** - * Built-in event type: GGFS file created. + * Built-in event type: IGFS file created. * <p> - * Fired when GGFS component creates new file. + * Fired when IGFS component creates new file. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -692,9 +692,9 @@ public interface EventType { public static final int EVT_IGFS_FILE_CREATED = 116; /** - * Built-in event type: GGFS file renamed. + * Built-in event type: IGFS file renamed. * <p> - * Fired when GGFS component renames an existing file. + * Fired when IGFS component renames an existing file. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -704,9 +704,9 @@ public interface EventType { public static final int EVT_IGFS_FILE_RENAMED = 117; /** - * Built-in event type: GGFS file deleted. + * Built-in event type: IGFS file deleted. * <p> - * Fired when GGFS component deletes a file. + * Fired when IGFS component deletes a file. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -716,9 +716,9 @@ public interface EventType { public static final int EVT_IGFS_FILE_DELETED = 118; /** - * Built-in event type: GGFS file opened for reading. + * Built-in event type: IGFS file opened for reading. * <p> - * Fired when GGFS file is opened for reading. + * Fired when IGFS file is opened for reading. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -728,9 +728,9 @@ public interface EventType { public static final int EVT_IGFS_FILE_OPENED_READ = 119; /** - * Built-in event type: GGFS file opened for writing. + * Built-in event type: IGFS file opened for writing. * <p> - * Fired when GGFS file is opened for writing. + * Fired when IGFS file is opened for writing. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -740,9 +740,9 @@ public interface EventType { public static final int EVT_IGFS_FILE_OPENED_WRITE = 120; /** - * Built-in event type: GGFS file or directory metadata updated. + * Built-in event type: IGFS file or directory metadata updated. * <p> - * Fired when GGFS file or directory metadata is updated. + * Fired when IGFS file or directory metadata is updated. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -752,9 +752,9 @@ public interface EventType { public static final int EVT_IGFS_META_UPDATED = 121; /** - * Built-in event type: GGFS file closed. + * Built-in event type: IGFS file closed. * <p> - * Fired when GGFS file is closed. + * Fired when IGFS file is closed. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -764,9 +764,9 @@ public interface EventType { public static final int EVT_IGFS_FILE_CLOSED_WRITE = 122; /** - * Built-in event type: GGFS file closed. + * Built-in event type: IGFS file closed. * <p> - * Fired when GGFS file is closed. + * Fired when IGFS file is closed. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -776,9 +776,9 @@ public interface EventType { public static final int EVT_IGFS_FILE_CLOSED_READ = 123; /** - * Built-in event type: GGFS directory created. + * Built-in event type: IGFS directory created. * <p> - * Fired when GGFS component creates new directory. + * Fired when IGFS component creates new directory. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -788,9 +788,9 @@ public interface EventType { public static final int EVT_IGFS_DIR_CREATED = 124; /** - * Built-in event type: GGFS directory renamed. + * Built-in event type: IGFS directory renamed. * <p> - * Fired when GGFS component renames an existing directory. + * Fired when IGFS component renames an existing directory. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -800,9 +800,9 @@ public interface EventType { public static final int EVT_IGFS_DIR_RENAMED = 125; /** - * Built-in event type: GGFS directory deleted. + * Built-in event type: IGFS directory deleted. * <p> - * Fired when GGFS component deletes a directory. + * Fired when IGFS component deletes a directory. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -812,9 +812,9 @@ public interface EventType { public static final int EVT_IGFS_DIR_DELETED = 126; /** - * Built-in event type: GGFS file purged. + * Built-in event type: IGFS file purged. * <p> - * Fired when GGFS file data was actually removed from cache. + * Fired when IGFS file data was actually removed from cache. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for * internal Ignite events and should not be used by user-defined events. @@ -1058,7 +1058,7 @@ public interface EventType { /** * All secure session events. This array can be directly passed into * {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} method to - * subscribe to all GGFS events. + * subscribe to all IGFS events. * * @see IgfsEvent */ @@ -1068,7 +1068,7 @@ public interface EventType { }; /** - * All GGFS events. This array can be directly passed into + * All IGFS events. This array can be directly passed into * {@link org.apache.ignite.IgniteEvents#localListen(org.apache.ignite.lang.IgnitePredicate, int...)} method to * subscribe to all cloud events. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java b/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java index 49c815f..1c7b1fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/events/IgfsEvent.java @@ -28,7 +28,7 @@ import java.util.*; import static org.apache.ignite.events.EventType.*; /** - * GGFS event. + * IGFS event. * <p> * Grid events are used for notification about what happens within the grid. Note that by * design Ignite keeps all events generated on the local node locally and it provides @@ -88,7 +88,7 @@ public class IgfsEvent extends EventAdapter { * @param type Event type. */ public IgfsEvent(IgfsPath path, ClusterNode node, int type) { - super(node, "GGFS event.", type); + super(node, "IGFS event.", type); this.path = path; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/Igfs.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/Igfs.java b/modules/core/src/main/java/org/apache/ignite/igfs/Igfs.java index bcfb144..48b9b58 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/Igfs.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/Igfs.java @@ -31,7 +31,7 @@ import java.util.*; * <li>write/read data streams into/from files</li> * </ul> * - * This is the minimum of functionality that is needed to work as secondary file system in dual modes of GGFS. + * This is the minimum of functionality that is needed to work as secondary file system in dual modes of IGFS. */ public interface Igfs { /** File property: user name. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java index 3e0dd36..c4f28c6 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsBlockLocation.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import java.util.*; /** - * {@code GGFS} file's data block location in the grid. It is used to determine + * {@code IGFS} file's data block location in the grid. It is used to determine * node affinity of a certain file block within the Grid by calling * {@link org.apache.ignite.IgniteFs#affinity(IgfsPath, long, long)} method. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java index d21bbed..3c7e970 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsConcurrentModificationException.java @@ -18,7 +18,7 @@ package org.apache.ignite.igfs; /** - * {@code GGFS} exception indicating that file system structure was modified concurrently. This error + * {@code IGFS} exception indicating that file system structure was modified concurrently. This error * indicates that an operation performed in DUAL mode cannot proceed due to these changes. */ public class IgfsConcurrentModificationException extends IgfsException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java index 9617bec..a704fe8 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsException.java @@ -21,14 +21,14 @@ import org.apache.ignite.*; import org.jetbrains.annotations.*; /** - * {@code GGFS} exception thrown by file system components. + * {@code IGFS} exception thrown by file system components. */ public class IgfsException extends IgniteException { /** */ private static final long serialVersionUID = 0L; /** - * Creates an instance of GGFS exception with descriptive error message. + * Creates an instance of IGFS exception with descriptive error message. * * @param msg Error message. */ @@ -37,7 +37,7 @@ public class IgfsException extends IgniteException { } /** - * Creates an instance of GGFS exception caused by nested exception. + * Creates an instance of IGFS exception caused by nested exception. * * @param cause Exception cause. */ @@ -46,7 +46,7 @@ public class IgfsException extends IgniteException { } /** - * Creates an instance of GGFS exception with error message and underlying cause. + * Creates an instance of IGFS exception with error message and underlying cause. * * @param msg Error message. * @param cause Exception cause. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 d9854cd..6fc624e 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 @@ -22,7 +22,7 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * {@code GGFS} file or directory descriptor. For example, to get information about + * {@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"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFileNotFoundException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFileNotFoundException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFileNotFoundException.java index cbeba2f..436d972 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFileNotFoundException.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsFileNotFoundException.java @@ -18,7 +18,7 @@ package org.apache.ignite.igfs; /** - * {@code GGFS} exception indicating that target resource is not found. + * {@code IGFS} exception indicating that target resource is not found. */ public class IgfsFileNotFoundException extends IgfsInvalidPathException { /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java index 45108bf..0012550 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsGroupDataBlocksKeyMapper.java @@ -22,7 +22,7 @@ import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.internal.*; /** - * {@code GGFS} class providing ability to group file's data blocks together on one node. + * {@code IGFS} class providing ability to group file's data blocks together on one node. * All blocks within the same group are guaranteed to be cached together on the same node. * Group size parameter controls how many sequential blocks will be cached together on the same node. * <p> @@ -33,12 +33,12 @@ import org.apache.ignite.internal.util.typedef.internal.*; * Note that {@link #groupSize()} parameter must correlate to Hadoop split size parameter defined * in Hadoop via {@code mapred.max.split.size} property. Ideally you want all blocks accessed * within one split to be mapped to {@code 1} group, so they can be located on the same grid node. - * For example, default Hadoop split size is {@code 64mb} and default {@code GGFS} block size + * For example, default Hadoop split size is {@code 64mb} and default {@code IGFS} block size * is {@code 64kb}. This means that to make sure that each split goes only through blocks on * the same node (without hopping between nodes over network), we have to make the {@link #groupSize()} * value be equal to {@code 64mb / 64kb = 1024}. * <p> - * It is required for {@code GGFS} data cache to be configured with this mapper. Here is an + * It is required for {@code IGFS} data cache to be configured with this mapper. Here is an * example of how it can be specified in XML configuration: * <pre name="code" class="xml"> * <bean id="cacheCfgBase" class="org.apache.ignite.cache.CacheConfiguration" abstract="true"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java index 9ab5312..308dbcb 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInputStream.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import java.io.*; /** - * {@code GGFS} input stream to read data from the file system. + * {@code IGFS} input stream to read data from the file system. * It provides several additional methods for asynchronous access. */ public abstract class IgfsInputStream extends InputStream implements IgfsReader { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java index e0159ca..bb7b5da 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsInvalidPathException.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import org.jetbrains.annotations.*; /** - * {@code GGFS} exception indicating that operation target is invalid + * {@code IGFS} exception indicating that operation target is invalid * (e.g. not a file while expecting to be a file). */ public class IgfsInvalidPathException extends IgfsException { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java index 02abc72..afdae1a 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMetrics.java @@ -18,7 +18,7 @@ package org.apache.ignite.igfs; /** - * {@code GGFS} metrics snapshot for the file system. Note, that some metrics are global and + * {@code IGFS} metrics snapshot for the file system. Note, that some metrics are global and * some are local (i.e. per each node). */ public interface IgfsMetrics { @@ -36,7 +36,7 @@ public interface IgfsMetrics { * equal to {@link org.apache.ignite.configuration.IgfsConfiguration#getMaxSpaceSize()}, or, if it is {@code 0}, equal to * {@code 80%} of maximum heap size allocated for JVM. * - * @return Maximum GGFS local space size. + * @return Maximum IGFS local space size. */ public long maxSpaceSize(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java index fc75395..5c5aa57 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsMode.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import org.jetbrains.annotations.*; /** - * {@code GGFS} mode defining interactions with underlying secondary Hadoop file system. + * {@code IGFS} mode defining interactions with underlying secondary Hadoop file system. * Secondary Hadoop file system is provided for pass-through, write-through, and * read-through purposes. * <p> @@ -29,13 +29,13 @@ import org.jetbrains.annotations.*; */ public enum IgfsMode { /** - * In this mode GGFS will not delegate to secondary Hadoop file system and will + * In this mode IGFS will not delegate to secondary Hadoop file system and will * cache all the files in memory only. */ PRIMARY, /** - * In this mode GGFS will not cache any files in memory and will only pass them + * In this mode IGFS will not cache any files in memory and will only pass them * through to secondary Hadoop file system. If this mode is enabled, then * secondary Hadoop file system must be configured. * @@ -44,7 +44,7 @@ public enum IgfsMode { PROXY, /** - * In this mode {@code GGFS} will cache files locally and also <i>synchronously</i> + * In this mode {@code IGFS} will cache files locally and also <i>synchronously</i> * write them through to secondary Hadoop file system. * <p> * If secondary Hadoop file system is not configured, then this mode behaves like @@ -55,7 +55,7 @@ public enum IgfsMode { DUAL_SYNC, /** - * In this mode {@code GGFS} will cache files locally and also <i>asynchronously</i> + * In this mode {@code IGFS} will cache files locally and also <i>asynchronously</i> * write them through to secondary Hadoop file system. * <p> * If secondary Hadoop file system is not configured, then this mode behaves like http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java index ea2530c..a4fd60e 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutOfSpaceException.java @@ -20,8 +20,8 @@ package org.apache.ignite.igfs; import org.jetbrains.annotations.*; /** - * {@code GGFS} exception that is thrown when it detected out-of-space condition. - * It is thrown when number of writes written to a {@code GGFS} data nodes exceeds + * {@code IGFS} exception that is thrown when it detected out-of-space condition. + * It is thrown when number of writes written to a {@code IGFS} data nodes exceeds * its maximum value (that is configured per-node). */ public class IgfsOutOfSpaceException extends IgfsException { @@ -47,7 +47,7 @@ public class IgfsOutOfSpaceException extends IgfsException { } /** - * Creates an instance of GGFS exception with given error message and given exception cause. + * Creates an instance of IGFS exception with given error message and given exception cause. * * @param msg Error message. * @param cause Exception cause. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java index bb5ac2f..eaaddb8 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/IgfsOutputStream.java @@ -20,7 +20,7 @@ package org.apache.ignite.igfs; import java.io.*; /** - * {@code GGFS} output stream to write data into the file system. + * {@code IGFS} output stream to write data into the file system. */ public abstract class IgfsOutputStream extends OutputStream { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 2dbf0db..dfd3af5 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 @@ -27,7 +27,7 @@ import java.net.*; import java.util.*; /** - * {@code GGFS} path to file in the file system. For example, to get information about + * {@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"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java index e5ffb6d..1465340 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsFileRange.java @@ -21,7 +21,7 @@ import org.apache.ignite.igfs.*; import org.apache.ignite.internal.util.typedef.internal.*; /** - * Entity representing part of GGFS file identified by file path, start position, and length. + * Entity representing part of IGFS file identified by file path, start position, and length. */ public class IgfsFileRange { /** File path. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 fe14c1b..673f4cb 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 @@ -44,7 +44,7 @@ public interface IgfsJob { /** * Executes this job. * - * @param igfs GGFS instance. + * @param igfs IGFS instance. * @param range File range aligned to record boundaries. * @param in Input stream for split file. This input stream is not aligned to range and points to file start * by default. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java index 8b40e99..c3c62c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/IgfsRecordResolver.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.*; import java.io.*; /** - * GGFS record resolver. When {@link IgfsTask} is split into {@link IgfsJob}s each produced job will obtain + * IGFS record resolver. When {@link IgfsTask} is split into {@link IgfsJob}s each produced job will obtain * {@link IgfsFileRange} based on file data location. Record resolver is invoked in each job before actual * execution in order to adjust record boundaries in a way consistent with user data. * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 3e1723d..b0caf4f 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,12 +30,12 @@ import org.jetbrains.annotations.*; import java.util.*; /** - * GGFS task which can be executed on the grid using one of {@code GridGgfs.execute()} methods. Essentially GGFS task + * IGFS task which can be executed on the grid using one of {@code GridGgfs.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 GGFS task is split into {@link IgfsFileRange}s first. Normally range is a number of + * 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()} * argument), then ranges could be further divided into smaller chunks. @@ -143,13 +143,13 @@ public abstract class IgfsTask<T, R> extends ComputeTaskAdapter<IgfsTaskArgs<T>, /** * Callback invoked during task map procedure to create job that will process specified split - * for GGFS file. + * for IGFS file. * * @param path Path. * @param range File range based on consecutive blocks. This range will be further * realigned to record boundaries on destination node. * @param args Task argument. - * @return GGFS job. If {@code null} is returned, the passed in file range will be skipped. + * @return IGFS job. If {@code null} is returned, the passed in file range will be skipped. * @throws IgniteException If job creation failed. */ @Nullable public abstract IgfsJob createJob(IgfsPath path, IgfsFileRange range, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 994e485..c073878 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,13 +22,13 @@ import org.apache.ignite.igfs.*; import java.util.*; /** - * GGFS task arguments. When you initiate new GGFS task execution using one of {@code GridGgfs.execute(...)} methods, + * 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 * passed to {@link IgfsTask#createJob(org.apache.ignite.igfs.IgfsPath, IgfsFileRange, IgfsTaskArgs)} method. * <p> * Task arguments encapsulates the following data: * <ul> - * <li>GGFS name</li> + * <li>IGFS name</li> * <li>File paths passed to {@code GridGgfs.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> @@ -38,9 +38,9 @@ import java.util.*; */ public interface IgfsTaskArgs<T> { /** - * Gets GGFS name. + * Gets IGFS name. * - * @return GGFS name. + * @return IGFS name. */ public String igfsName(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java index b388959..b7dab74 100644 --- a/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java +++ b/modules/core/src/main/java/org/apache/ignite/igfs/mapreduce/records/IgfsByteDelimiterRecordResolver.java @@ -140,7 +140,7 @@ public class IgfsByteDelimiterRecordResolver implements IgfsRecordResolver, Exte * which stands at least [maxDelimLen] from the start search position or until we faced stream start. * Otherwise we cannot be sure that delimiter position is determined correctly. * - * @param stream GGFS input stream. + * @param stream IGFS input stream. * @param startPos Start search position. * @return The first found delimiter. * @throws IOException In case of IO exception. @@ -171,7 +171,7 @@ public class IgfsByteDelimiterRecordResolver implements IgfsRecordResolver, Exte /** * Resolve next delimiter. * - * @param is GGFS input stream. + * @param is IGFS input stream. * @param state Current state. * @return Next delimiter and updated map. * @throws IOException In case of exception. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java index c2483a1..e695559 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java @@ -264,9 +264,9 @@ public interface GridKernalContext extends Iterable<GridComponent> { public IgfsProcessorAdapter igfs(); /** - * Gets GGFS utils processor. + * Gets IGFS utils processor. * - * @return GGFS utils processor. + * @return IGFS utils processor. */ public IgfsHelper igfsHelper(); @@ -502,9 +502,9 @@ public interface GridKernalContext extends Iterable<GridComponent> { public ExecutorService getPeerClassLoadingExecutorService(); /** - * Executor service that is in charge of processing outgoing GGFS messages. + * Executor service that is in charge of processing outgoing IGFS messages. * - * @return Thread pool implementation to be used for GGFS outgoing message sending. + * @return Thread pool implementation to be used for IGFS outgoing message sending. */ public ExecutorService getIgfsExecutorService(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index f59e7bc..c753084 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -325,7 +325,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable * @param sysExecSvc System executor service. * @param p2pExecSvc P2P executor service. * @param mgmtExecSvc Management executor service. - * @param igfsExecSvc GGFS executor service. + * @param igfsExecSvc IGFS executor service. * @param restExecSvc REST executor service. */ @SuppressWarnings("TypeMayBeWeakened") http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/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 38587b3..3d9852f 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 @@ -30,13 +30,13 @@ import java.util.*; import static org.apache.ignite.internal.igfs.common.IgfsIpcCommand.*; /** - * GGFS path command response. + * IGFS path command response. */ public class IgfsControlResponse extends IgfsMessage { - /** Generic error (not GGFS) while performing operations. */ + /** Generic error (not IGFS) while performing operations. */ private static final int ERR_GENERIC = 0; - /** Generic GGFS error while performing operations. */ + /** Generic IGFS error while performing operations. */ private static final int ERR_IGFS_GENERIC = 1; /** Target file not found. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java index 3b611fc..bfd0c71 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataInputStream.java @@ -35,6 +35,6 @@ public class IgfsDataInputStream extends DataInputStream implements ObjectInput /** {@inheritDoc} */ @Override public Object readObject() throws ClassNotFoundException, IOException { - throw new IOException("This method must not be invoked on GGFS data input stream."); + throw new IOException("This method must not be invoked on IGFS data input stream."); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/167c1b1a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java index 44ef481..deb6ac3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/igfs/common/IgfsDataOutputStream.java @@ -38,6 +38,6 @@ public class IgfsDataOutputStream extends DataOutputStream implements ObjectOutp /** {@inheritDoc} */ @Override public void writeObject(Object obj) throws IOException { - throw new IOException("This method must not be invoked on GGFS data output stream."); + throw new IOException("This method must not be invoked on IGFS data output stream."); } }
