Repository: incubator-ignite Updated Branches: refs/heads/ignite-188 9200ef5e8 -> 0704570f3
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsNearOnlyMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsNearOnlyMultiNodeSelfTest.java new file mode 100644 index 0000000..b9c0937 --- /dev/null +++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/GridGgfsNearOnlyMultiNodeSelfTest.java @@ -0,0 +1,212 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.ignitefs; + +import org.apache.hadoop.conf.*; +import org.apache.hadoop.fs.*; +import org.apache.hadoop.fs.FileSystem; +import org.apache.ignite.cache.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.util.ipc.shmem.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.spi.discovery.tcp.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; +import org.apache.ignite.testframework.junits.common.*; + +import java.io.*; +import java.net.*; +import java.util.*; + +import static org.apache.ignite.cache.CacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.events.IgniteEventType.*; + +/** + * Test hadoop file system implementation. + */ +public class GridGgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest { + /** Path to the default hadoop configuration. */ + public static final String HADOOP_FS_CFG = "examples/config/filesystem/core-site.xml"; + + /** Group size. */ + public static final int GRP_SIZE = 128; + + /** IP finder. */ + private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + + /** Node count. */ + private int cnt; + + /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + startGrids(nodeCount()); + } + + /** {@inheritDoc} */ + @Override protected void afterTestsStopped() throws Exception { + G.stopAll(true); + } + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + discoSpi.setIpFinder(IP_FINDER); + + cfg.setDiscoverySpi(discoSpi); + + IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); + + ggfsCfg.setDataCacheName("partitioned"); + ggfsCfg.setMetaCacheName("partitioned"); + ggfsCfg.setName("ggfs"); + + ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ + put("type", "shmem"); + put("port", String.valueOf(IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT + cnt)); + }}); + + ggfsCfg.setBlockSize(512 * 1024); // Together with group blocks mapper will yield 64M per node groups. + + cfg.setGgfsConfiguration(ggfsCfg); + + cfg.setCacheConfiguration(cacheConfiguration(gridName)); + + cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); + + cnt++; + + return cfg; + } + + /** @return Node count for test. */ + protected int nodeCount() { + return 4; + } + + /** + * Gets cache configuration. + * + * @param gridName Grid name. + * @return Cache configuration. + */ + protected CacheConfiguration cacheConfiguration(String gridName) { + CacheConfiguration cacheCfg = defaultCacheConfiguration(); + + cacheCfg.setName("partitioned"); + cacheCfg.setCacheMode(PARTITIONED); + cacheCfg.setDistributionMode(cnt == 0 ? NEAR_ONLY : PARTITIONED_ONLY); + cacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE)); + cacheCfg.setBackups(0); + cacheCfg.setQueryIndexEnabled(false); + cacheCfg.setAtomicityMode(TRANSACTIONAL); + + return cacheCfg; + } + + /** + * Gets config of concrete File System. + * + * @return Config of concrete File System. + */ + protected Configuration getFileSystemConfig() { + Configuration cfg = new Configuration(); + + cfg.addResource(U.resolveGridGainUrl(HADOOP_FS_CFG)); + + return cfg; + } + + /** + * Gets File System name. + * + * @param grid Grid index. + * @return File System name. + */ + protected URI getFileSystemURI(int grid) { + try { + return new URI("ggfs://127.0.0.1:" + (IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT + grid)); + } + catch (URISyntaxException e) { + throw new RuntimeException(e); + } + } + + /** @throws Exception If failed. */ + public void testContentsConsistency() throws Exception { + try (FileSystem fs = FileSystem.get(getFileSystemURI(0), getFileSystemConfig())) { + Collection<IgniteBiTuple<String, Long>> files = F.asList( + F.t("/dir1/dir2/file1", 1024L), + F.t("/dir1/dir2/file2", 8 * 1024L), + F.t("/dir1/file1", 1024 * 1024L), + F.t("/dir1/file2", 5 * 1024 * 1024L), + F.t("/file1", 64 * 1024L + 13), + F.t("/file2", 13L), + F.t("/file3", 123764L) + ); + + for (IgniteBiTuple<String, Long> file : files) { + + info("Writing file: " + file.get1()); + + try (OutputStream os = fs.create(new Path(file.get1()), (short)3)) { + byte[] data = new byte[file.get2().intValue()]; + + data[0] = 25; + data[data.length - 1] = 26; + + os.write(data); + } + + info("Finished writing file: " + file.get1()); + } + + for (int i = 1; i < nodeCount(); i++) { + + try (FileSystem ignored = FileSystem.get(getFileSystemURI(i), getFileSystemConfig())) { + for (IgniteBiTuple<String, Long> file : files) { + Path path = new Path(file.get1()); + + FileStatus fileStatus = fs.getFileStatus(path); + + assertEquals(file.get2(), (Long)fileStatus.getLen()); + + byte[] read = new byte[file.get2().intValue()]; + + info("Reading file: " + path); + + try (FSDataInputStream in = fs.open(path)) { + in.readFully(read); + + assert read[0] == 25; + assert read[read.length - 1] == 26; + } + + info("Finished reading file: " + path); + } + } + } + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgniteFsEventsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgniteFsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgniteFsEventsTestSuite.java new file mode 100644 index 0000000..14b78ae --- /dev/null +++ b/modules/hadoop/src/test/java/org/apache/ignite/ignitefs/IgniteFsEventsTestSuite.java @@ -0,0 +1,267 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.ignitefs; + +import junit.framework.*; +import org.apache.ignite.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.fs.hadoop.*; +import org.apache.ignite.internal.processors.hadoop.*; +import org.apache.ignite.internal.util.ipc.shmem.*; +import org.apache.ignite.internal.util.typedef.*; +import org.jetbrains.annotations.*; + +import java.util.*; + +import static org.apache.ignite.ignitefs.IgniteFsMode.*; + +/** + * Test suite for GGFS event tests. + */ +@SuppressWarnings("PublicInnerClass") +public class IgniteFsEventsTestSuite extends TestSuite { + /** + * @return Test suite. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suite() throws Exception { + GridHadoopClassLoader ldr = new GridHadoopClassLoader(null); + + TestSuite suite = new TestSuite("Ignite FS Events Test Suite"); + + suite.addTest(new TestSuite(ldr.loadClass(ShmemPrivate.class.getName()))); + suite.addTest(new TestSuite(ldr.loadClass(ShmemDualSync.class.getName()))); + suite.addTest(new TestSuite(ldr.loadClass(ShmemDualAsync.class.getName()))); + + suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrivate.class.getName()))); + suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualSync.class.getName()))); + suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualAsync.class.getName()))); + + return suite; + } + + /** + * @return Test suite with only tests that are supported on all platforms. + * @throws Exception Thrown in case of the failure. + */ + public static TestSuite suiteNoarchOnly() throws Exception { + GridHadoopClassLoader ldr = new GridHadoopClassLoader(null); + + TestSuite suite = new TestSuite("Gridgain GGFS Events Test Suite Noarch Only"); + + suite.addTest(new TestSuite(ldr.loadClass(LoopbackPrivate.class.getName()))); + suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualSync.class.getName()))); + suite.addTest(new TestSuite(ldr.loadClass(LoopbackDualAsync.class.getName()))); + + return suite; + } + + /** + * Shared memory IPC in PRIVATE mode. + */ + public static class ShmemPrivate extends GridGgfsEventsAbstractSelfTest { + /** {@inheritDoc} */ + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { + IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); + + ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ + put("type", "shmem"); + put("port", String.valueOf(IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT + 1)); + }}); + + return ggfsCfg; + } + } + + /** + * Loopback socket IPS in PRIVATE mode. + */ + public static class LoopbackPrivate extends GridGgfsEventsAbstractSelfTest { + /** {@inheritDoc} */ + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { + IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); + + ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ + put("type", "tcp"); + put("port", String.valueOf(IpcSharedMemoryServerEndpoint.DFLT_IPC_PORT + 1)); + }}); + + return ggfsCfg; + } + } + + /** + * Base class for all GGFS tests with primary and secondary file system. + */ + public abstract static class PrimarySecondaryTest extends GridGgfsEventsAbstractSelfTest { + /** Secondary file system. */ + private static IgniteFs ggfsSec; + + /** {@inheritDoc} */ + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { + IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); + + ggfsCfg.setSecondaryFileSystem(new GridGgfsHadoopFileSystemWrapper( + "ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/", + "modules/core/src/test/config/hadoop/core-site-secondary.xml")); + + return ggfsCfg; + } + + /** + * @return GGFS configuration for secondary file system. + */ + protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException { + IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); + + ggfsCfg.setName("ggfs-secondary"); + ggfsCfg.setDefaultMode(PRIMARY); + ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>(){{ + put("type", "tcp"); + put("port", "11500"); + }}); + + return ggfsCfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + ggfsSec = startSecondary(); + + super.beforeTestsStarted(); + } + + /** {@inheritDoc} */ + @Override protected void afterTestsStopped() throws Exception { + super.afterTestsStopped(); + + G.stopAll(true); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + super.afterTest(); + + // Clean up secondary file system. + ggfsSec.format(); + } + + /** + * Start a grid with the secondary file system. + * + * @return Secondary file system handle. + * @throws Exception If failed. + */ + @Nullable private IgniteFs startSecondary() throws Exception { + IgniteConfiguration cfg = getConfiguration("grid-secondary", getSecondaryGgfsConfiguration()); + + cfg.setLocalHost("127.0.0.1"); + cfg.setPeerClassLoadingEnabled(false); + + Ignite secG = G.start(cfg); + + return secG.fileSystem("ggfs-secondary"); + } + } + + /** + * Shared memory IPC in DUAL_SYNC mode. + */ + public static class ShmemDualSync extends PrimarySecondaryTest { + /** {@inheritDoc} */ + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { + IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); + + ggfsCfg.setDefaultMode(DUAL_SYNC); + + return ggfsCfg; + } + } + + /** + * Shared memory IPC in DUAL_SYNC mode. + */ + public static class ShmemDualAsync extends PrimarySecondaryTest { + /** {@inheritDoc} */ + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { + IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); + + ggfsCfg.setDefaultMode(DUAL_ASYNC); + + return ggfsCfg; + } + } + + /** + * Loopback socket IPC with secondary file system. + */ + public abstract static class LoopbackPrimarySecondaryTest extends PrimarySecondaryTest { + /** {@inheritDoc} */ + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { + IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); + + ggfsCfg.setSecondaryFileSystem(new GridGgfsHadoopFileSystemWrapper( + "ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/", + "modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml")); + + return ggfsCfg; + } + + /** {@inheritDoc} */ + @Override protected IgniteFsConfiguration getSecondaryGgfsConfiguration() throws IgniteCheckedException { + IgniteFsConfiguration ggfsCfg = super.getSecondaryGgfsConfiguration(); + + ggfsCfg.setName("ggfs-secondary"); + ggfsCfg.setDefaultMode(PRIMARY); + ggfsCfg.setIpcEndpointConfiguration(new HashMap<String, String>() {{ + put("type", "tcp"); + put("port", "11500"); + }}); + + return ggfsCfg; + } + } + + /** + * Loopback IPC in DUAL_SYNC mode. + */ + public static class LoopbackDualSync extends LoopbackPrimarySecondaryTest { + /** {@inheritDoc} */ + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { + IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); + + ggfsCfg.setDefaultMode(DUAL_SYNC); + + return ggfsCfg; + } + } + + /** + * Loopback socket IPC in DUAL_ASYNC mode. + */ + public static class LoopbackDualAsync extends LoopbackPrimarySecondaryTest { + /** {@inheritDoc} */ + @Override protected IgniteFsConfiguration getGgfsConfiguration() throws IgniteCheckedException { + IgniteFsConfiguration ggfsCfg = super.getGgfsConfiguration(); + + ggfsCfg.setDefaultMode(DUAL_ASYNC); + + return ggfsCfg; + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java index 30f13ac..80b71c5 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.hadoop; import org.apache.hadoop.conf.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; -import org.apache.ignite.fs.*; +import org.apache.ignite.ignitefs.*; import org.apache.ignite.internal.processors.hadoop.fs.*; import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.testframework.junits.common.*; @@ -193,8 +193,8 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest */ protected void setupFileSystems(Configuration cfg) { cfg.set("fs.defaultFS", ggfsScheme()); - cfg.set("fs.ggfs.impl", org.apache.ignite.fs.hadoop.v1.GridGgfsHadoopFileSystem.class.getName()); - cfg.set("fs.AbstractFileSystem.ggfs.impl", org.apache.ignite.fs.hadoop.v2.GridGgfsHadoopFileSystem. + cfg.set("fs.ggfs.impl", org.apache.ignite.ignitefs.hadoop.v1.GridGgfsHadoopFileSystem.class.getName()); + cfg.set("fs.AbstractFileSystem.ggfs.impl", org.apache.ignite.ignitefs.hadoop.v2.GridGgfsHadoopFileSystem. class.getName()); GridHadoopFileSystemsUtils.setupFileSystems(cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractWordCountTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractWordCountTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractWordCountTest.java index feabea2..ce55889 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractWordCountTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractWordCountTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.hadoop; import com.google.common.base.*; import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.FileSystem; -import org.apache.ignite.fs.*; +import org.apache.ignite.ignitefs.*; import org.apache.ignite.internal.processors.fs.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java index 1d1d62c..cadc7ba 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.processors.hadoop; import com.google.common.base.*; import org.apache.ignite.*; -import org.apache.ignite.fs.*; +import org.apache.ignite.ignitefs.*; import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.processors.hadoop.counter.*; import org.apache.ignite.internal.processors.hadoop.jobtracker.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index 83b73d0..de38897 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -20,8 +20,9 @@ package org.apache.ignite.internal.processors.hadoop; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; -import org.apache.ignite.fs.*; -import org.apache.ignite.fs.mapreduce.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.ignitefs.*; +import org.apache.ignite.ignitefs.mapreduce.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.fs.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java index 61e18c3..70454f5 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceEmbeddedSelfTest.java @@ -25,7 +25,7 @@ import org.apache.hadoop.mapred.*; import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import org.apache.ignite.fs.*; +import org.apache.ignite.ignitefs.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.hadoop.examples.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java index c64b114..010f399 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopMapReduceTest.java @@ -24,7 +24,7 @@ import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.FileInputFormat; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.ignite.*; -import org.apache.ignite.fs.*; +import org.apache.ignite.ignitefs.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.hadoop.counter.*; import org.apache.ignite.internal.processors.hadoop.examples.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java index 7f3fc46..a424e3c 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopStartup.java @@ -41,8 +41,8 @@ public class GridHadoopStartup { cfg.set("fs.defaultFS", "ggfs://ggfs@localhost"); - cfg.set("fs.ggfs.impl", org.apache.ignite.fs.hadoop.v1.GridGgfsHadoopFileSystem.class.getName()); - cfg.set("fs.AbstractFileSystem.ggfs.impl", org.apache.ignite.fs.hadoop.v2.GridGgfsHadoopFileSystem.class.getName()); + cfg.set("fs.ggfs.impl", org.apache.ignite.ignitefs.hadoop.v1.GridGgfsHadoopFileSystem.class.getName()); + cfg.set("fs.AbstractFileSystem.ggfs.impl", org.apache.ignite.ignitefs.hadoop.v2.GridGgfsHadoopFileSystem.class.getName()); cfg.set("dfs.client.block.write.replace-datanode-on-failure.policy", "NEVER"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java index 5a7c31f..91fc361 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTaskExecutionSelfTest.java @@ -25,9 +25,9 @@ import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.mapreduce.lib.output.*; import org.apache.ignite.*; -import org.apache.ignite.fs.*; -import org.apache.ignite.fs.hadoop.v1.*; -import org.apache.ignite.internal.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.ignitefs.*; +import org.apache.ignite.ignitefs.hadoop.v1.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTasksAllVersionsTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTasksAllVersionsTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTasksAllVersionsTest.java index c732c1f..e749e91 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTasksAllVersionsTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopTasksAllVersionsTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.hadoop; import com.google.common.base.*; import org.apache.hadoop.io.*; import org.apache.ignite.*; -import org.apache.ignite.fs.*; +import org.apache.ignite.ignitefs.*; import org.apache.ignite.internal.processors.hadoop.examples.*; import org.apache.ignite.internal.processors.hadoop.v2.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java index 769aa76..546b14f 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/taskexecutor/external/GridHadoopExternalTaskExecutionSelfTest.java @@ -24,7 +24,7 @@ import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.lib.input.*; import org.apache.hadoop.mapreduce.lib.output.*; import org.apache.ignite.*; -import org.apache.ignite.fs.*; +import org.apache.ignite.ignitefs.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java index 640932d..2378703 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteFsLinuxAndMacOSTestSuite.java @@ -18,7 +18,7 @@ package org.apache.ignite.testsuites; import junit.framework.*; -import org.apache.ignite.fs.*; +import org.apache.ignite.ignitefs.*; import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.processors.hadoop.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java index 6a251cb..240281e 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/IgniteHadoopTestSuite.java @@ -22,7 +22,7 @@ import org.apache.commons.compress.archivers.tar.*; import org.apache.commons.compress.compressors.gzip.*; import org.apache.ignite.*; import org.apache.ignite.client.hadoop.*; -import org.apache.ignite.fs.*; +import org.apache.ignite.ignitefs.*; import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.processors.hadoop.shuffle.collections.*; import org.apache.ignite.internal.processors.hadoop.shuffle.streams.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afa29526/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 15c22ee..2444f9d 100644 --- a/pom.xml +++ b/pom.xml @@ -639,7 +639,7 @@ </group> <group> <title>Hadoop Accelerator APIs</title> - <packages>org.apache.ignite.fs:org.apache.ignite.fs.hadoop:org.apache.ignite.fs.hadoop.v1:org.apache.ignite.fs.hadoop.v2:org.apache.ignite.fs.mapreduce:org.apache.ignite.fs.mapreduce.records:org.apache.ignite.hadoop</packages> + <packages>org.apache.ignite.fs:org.apache.ignite.ignitefs.hadoop:org.apache.ignite.ignitefs.hadoop.v1:org.apache.ignite.ignitefs.hadoop.v2:org.apache.ignite.ignitefs.mapreduce:org.apache.ignite.ignitefs.mapreduce.records:org.apache.ignite.hadoop</packages> </group> <group> <title>Streaming APIs</title> @@ -849,7 +849,7 @@ </group> <group> <title>Hadoop Accelerator APIs</title> - <packages>org.apache.ignite.fs:org.apache.ignite.fs.hadoop:org.apache.ignite.fs.hadoop.v1:org.apache.ignite.fs.hadoop.v2:org.apache.ignite.fs.mapreduce:org.apache.ignite.fs.mapreduce.records:org.apache.ignite.hadoop</packages> + <packages>org.apache.ignite.fs:org.apache.ignite.ignitefs.hadoop:org.apache.ignite.ignitefs.hadoop.v1:org.apache.ignite.ignitefs.hadoop.v2:org.apache.ignite.ignitefs.mapreduce:org.apache.ignite.ignitefs.mapreduce.records:org.apache.ignite.hadoop</packages> </group> <group> <title>Streaming APIs</title>
