Repository: incubator-ignite Updated Branches: refs/heads/master d8f934500 -> 20872dc75
# Ignite: fixed class names in xml Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/20872dc7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/20872dc7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/20872dc7 Branch: refs/heads/master Commit: 20872dc75fd248c61a122d1e3e8afd3004a271fe Parents: d8f9345 Author: sboikov <sboi...@gridgain.com> Authored: Wed Dec 10 09:17:47 2014 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Dec 10 09:17:47 2014 +0300 ---------------------------------------------------------------------- config/hadoop/default-config.xml | 6 +++--- .../org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java | 2 +- .../main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java | 2 +- ...fsServerManagerIpcEndpointRegistrationAbstractSelfTest.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20872dc7/config/hadoop/default-config.xml ---------------------------------------------------------------------- diff --git a/config/hadoop/default-config.xml b/config/hadoop/default-config.xml index 6d7d566..70a8d21 100644 --- a/config/hadoop/default-config.xml +++ b/config/hadoop/default-config.xml @@ -46,7 +46,7 @@ <!-- Abstract GGFS file system configuration to be used as a template. --> - <bean id="ggfsCfgBase" class="org.gridgain.grid.ggfs.GridGgfsConfiguration" abstract="true"> + <bean id="ggfsCfgBase" class="org.apache.ignite.fs.IgniteFsConfiguration" abstract="true"> <!-- Must correlate with cache affinity mapper. --> <property name="blockSize" value="#{128 * 1024}"/> <property name="perNodeBatchSize" value="512"/> @@ -64,7 +64,7 @@ <property name="writeSynchronizationMode" value="FULL_SYNC"/> <property name="backups" value="0"/> <property name="affinityMapper"> - <bean class="org.gridgain.grid.ggfs.GridGgfsGroupDataBlocksKeyMapper"> + <bean class="org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper"> <!-- How many sequential blocks will be stored on the same node. --> <constructor-arg value="512"/> </bean> @@ -104,7 +104,7 @@ --> <property name="ggfsConfiguration"> <list> - <bean class="org.gridgain.grid.ggfs.GridGgfsConfiguration" parent="ggfsCfgBase"> + <bean class="org.apache.ignite.fs.IgniteFsConfiguration" parent="ggfsCfgBase"> <property name="name" value="ggfs"/> <!-- Caches with these names must be configured. --> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20872dc7/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java b/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java index 0410c17..777d606 100644 --- a/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java +++ b/modules/core/src/main/java/org/apache/ignite/fs/IgniteFsGroupDataBlocksKeyMapper.java @@ -36,7 +36,7 @@ import org.gridgain.grid.util.typedef.internal.*; * <bean id="cacheCfgBase" class="org.gridgain.grid.cache.GridCacheConfiguration" abstract="true"> * ... * <property name="affinityMapper"> - * <bean class="org.gridgain.grid.ggfs.GridGgfsGroupDataBlocksKeyMapper"> + * <bean class="org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper"> * <!-- How many sequential blocks will be stored on the same node. --> * <constructor-arg value="512"/> * </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20872dc7/modules/core/src/main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java b/modules/core/src/main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java index c1383bf..32580ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java +++ b/modules/core/src/main/java/org/apache/ignite/fs/mapreduce/IgniteFsTask.java @@ -29,7 +29,7 @@ import java.util.*; * {@link IgniteFsTask#createJob(org.apache.ignite.fs.IgniteFsPath, IgniteFsFileRange, IgniteFsTaskArgs)} method. * <p> * Each file participating in GGFS task is split into {@link IgniteFsFileRange}s first. Normally range is a number of - * consequent bytes located on a single node (see {@code GridGgfsGroupDataBlocksKeyMapper}). In case maximum range size + * consequent bytes located on a single node (see {@code IgniteFsGroupDataBlocksKeyMapper}). In case maximum range size * is provided (either through {@link org.apache.ignite.fs.IgniteFsConfiguration#getMaximumTaskRangeLength()} or {@code GridGgfs.execute()} * argument), then ranges could be further divided into smaller chunks. * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/20872dc7/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java index fbf1148..57bb6a0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java @@ -141,10 +141,10 @@ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTe } /** - * Creates test-purposed GridGgfsConfiguration. + * Creates test-purposed IgniteFsConfiguration. * * @param endpointCfg Optional REST endpoint configuration. - * @return test-purposed GridGgfsConfiguration. + * @return test-purposed IgniteFsConfiguration. */ protected IgniteFsConfiguration gridGgfsConfiguration(@Nullable String endpointCfg) throws GridException { IgniteFsConfiguration ggfsConfiguration = new IgniteFsConfiguration();
