http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java deleted file mode 100644 index c4b028b..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * 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.gridgain.grid.kernal.processors.ggfs.split; - -import org.apache.ignite.fs.*; -import org.apache.ignite.fs.mapreduce.*; -import org.apache.ignite.fs.mapreduce.records.*; -import org.apache.ignite.internal.util.typedef.*; - -import static org.apache.ignite.fs.mapreduce.records.IgniteFsNewLineRecordResolver.*; - -/** - * New line split resolver self test. - */ -public class GridGgfsNewLineDelimiterRecordResolverSelfTest extends GridGgfsAbstractRecordResolverSelfTest { - /** - * Test new line delimtier record resovler. - * - * @throws Exception If failed. - */ - public void test() throws Exception{ - byte[] data = array(F.t(wrap(1), 8), F.t(wrap(SYM_LF), 1), F.t(wrap(1), 8), F.t(wrap(SYM_CR, SYM_LF), 1), - F.t(wrap(1), 8)); - - assertSplit(0, 4, 0, 9, data); - assertSplit(0, 9, 0, 9, data); - assertSplit(0, 13, 0, 19, data); - assertSplit(0, 19, 0, 19, data); - assertSplit(0, 23, 0, 27, data); - assertSplit(0, 27, 0, 27, data); - - assertSplitNull(2, 2, data); - assertSplitNull(2, 7, data); - assertSplit(2, 11, 9, 10, data); - assertSplit(2, 17, 9, 10, data); - assertSplit(2, 21, 9, 18, data); - assertSplit(2, 25, 9, 18, data); - - assertSplit(9, 4, 9, 10, data); - assertSplit(9, 10, 9, 10, data); - assertSplit(9, 14, 9, 18, data); - assertSplit(9, 18, 9, 18, data); - - assertSplitNull(11, 2, data); - assertSplitNull(11, 8, data); - assertSplit(11, 12, 19, 8, data); - assertSplit(11, 16, 19, 8, data); - - assertSplit(19, 4, 19, 8, data); - assertSplit(19, 8, 19, 8, data); - - assertSplitNull(21, 2, data); - assertSplitNull(21, 6, data); - } - - /** - * Check split resolution. - * - * @param suggestedStart Suggested start. - * @param suggestedLen Suggested length. - * @param expStart Expected start. - * @param expLen Expected length. - * @param data File data. - * @throws Exception If failed. - */ - public void assertSplit(long suggestedStart, long suggestedLen, long expStart, long expLen, byte[] data) - throws Exception { - write(data); - - IgniteFsNewLineRecordResolver rslvr = resolver(); - - IgniteFsFileRange split; - - try (IgniteFsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); - } - - assert split != null : "Split is null."; - assert split.start() == expStart : "Incorrect start [expected=" + expStart + ", actual=" + split.start() + ']'; - assert split.length() == expLen : "Incorrect length [expected=" + expLen + ", actual=" + split.length() + ']'; - } - - /** - * Check the split resolution resulted in {@code null}. - * - * @param suggestedStart Suggested start. - * @param suggestedLen Suggested length. - * @param data File data. - * @throws Exception If failed. - */ - public void assertSplitNull(long suggestedStart, long suggestedLen, byte[] data) - throws Exception { - write(data); - - IgniteFsNewLineRecordResolver rslvr = resolver(); - - IgniteFsFileRange split; - - try (IgniteFsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); - } - - assert split == null : "Split is not null."; - } - - /** - * Create resolver. - * - * @return Resolver. - */ - private IgniteFsNewLineRecordResolver resolver() { - return IgniteFsNewLineRecordResolver.NEW_LINE; - } -}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java deleted file mode 100644 index 3879fd2..0000000 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * 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.gridgain.grid.kernal.processors.ggfs.split; - -import org.apache.ignite.fs.*; -import org.apache.ignite.fs.mapreduce.*; -import org.apache.ignite.fs.mapreduce.records.*; -import org.apache.ignite.internal.util.typedef.*; - -import java.nio.charset.*; - -/** - * String delimiter split resolver self-test. - */ -public class GridGgfsStringDelimiterRecordResolverSelfTest extends GridGgfsAbstractRecordResolverSelfTest { - /** Charset used in tests. */ - private static final Charset UTF8 = Charset.forName("UTF-8"); - - /** - * Test split resolver. - * - * @throws Exception If failed. - */ - public void testResolver() throws Exception { - String delim = "aaaaaaaa"; - - byte[] delimBytes = delim.getBytes(UTF8); - byte[] data = array(F.t(wrap(1), 8), F.t(delimBytes, 1), F.t(wrap(1), 8)); - - assertSplit(0, 4, 0, 16, data, delim); - assertSplit(0, 8, 0, 16, data, delim); - assertSplit(0, 12, 0, 16, data, delim); - assertSplit(0, 16, 0, 16, data, delim); - assertSplit(0, 20, 0, 24, data, delim); - assertSplit(0, 24, 0, 24, data, delim); - - assertSplitNull(2, 2, data, delim); - assertSplitNull(2, 6, data, delim); - assertSplitNull(2, 10, data, delim); - assertSplitNull(2, 14, data, delim); - assertSplit(2, 18, 16, 8, data, delim); - assertSplit(2, 22, 16, 8, data, delim); - - assertSplitNull(8, 4, data, delim); - assertSplitNull(8, 8, data, delim); - assertSplit(8, 12, 16, 8, data, delim); - assertSplit(8, 16, 16, 8, data, delim); - - assertSplitNull(10, 2, data, delim); - assertSplitNull(10, 6, data, delim); - assertSplit(10, 10, 16, 8, data, delim); - assertSplit(10, 14, 16, 8, data, delim); - - assertSplit(16, 4, 16, 8, data, delim); - assertSplit(16, 8, 16, 8, data, delim); - - assertSplitNull(18, 2, data, delim); - assertSplitNull(18, 6, data, delim); - } - - /** - * Check split resolution. - * - * @param suggestedStart Suggested start. - * @param suggestedLen Suggested length. - * @param expStart Expected start. - * @param expLen Expected length. - * @param data File data. - * @param delims Delimiters. - * @throws Exception If failed. - */ - public void assertSplit(long suggestedStart, long suggestedLen, long expStart, long expLen, byte[] data, - String... delims) throws Exception { - write(data); - - IgniteFsByteDelimiterRecordResolver rslvr = resolver(delims); - - IgniteFsFileRange split; - - try (IgniteFsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); - } - - assert split != null : "Split is null."; - assert split.start() == expStart : "Incorrect start [expected=" + expStart + ", actual=" + split.start() + ']'; - assert split.length() == expLen : "Incorrect length [expected=" + expLen + ", actual=" + split.length() + ']'; - } - - /** - * Check the split resolution resulted in {@code null}. - * - * @param suggestedStart Suggested start. - * @param suggestedLen Suggested length. - * @param data File data. - * @param delims Delimiters. - * @throws Exception If failed. - */ - public void assertSplitNull(long suggestedStart, long suggestedLen, byte[] data, String... delims) - throws Exception { - write(data); - - IgniteFsStringDelimiterRecordResolver rslvr = resolver(delims); - - IgniteFsFileRange split; - - try (IgniteFsInputStream is = read()) { - split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); - } - - assert split == null : "Split is not null."; - } - - /** - * Create resolver. - * - * @param delims Delimiters. - * @return Resolver. - */ - private IgniteFsStringDelimiterRecordResolver resolver(String... delims) { - return new IgniteFsStringDelimiterRecordResolver(UTF8, delims); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridGgfsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridGgfsTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridGgfsTestSuite.java index 455293c..2dac053 100644 --- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridGgfsTestSuite.java +++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridGgfsTestSuite.java @@ -19,8 +19,6 @@ package org.gridgain.testsuites.bamboo; import junit.framework.*; import org.gridgain.grid.ggfs.*; -import org.gridgain.grid.kernal.processors.ggfs.*; -import org.gridgain.grid.kernal.processors.ggfs.split.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.internal.util.ipc.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java index fa3eee9..755f5d4 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java @@ -24,7 +24,6 @@ import org.apache.ignite.internal.*; import org.apache.ignite.resources.*; import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java index 7c4de56..c6ca571 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java @@ -28,7 +28,6 @@ import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.internal.fs.common.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java index 6786237..6001fc0 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java @@ -28,7 +28,6 @@ import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.internal.fs.common.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java index ebbd62d..c82ec51 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java @@ -19,8 +19,6 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.ignite.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java index b83b099..3ea08e1 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java @@ -28,7 +28,6 @@ import java.io.*; import java.net.*; import java.util.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java index 845f827..54c2c3f 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java @@ -20,7 +20,6 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.commons.logging.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.util.lang.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java index bc6097d..eee11c9 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java @@ -21,7 +21,6 @@ import org.apache.commons.logging.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.internal.fs.common.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.util.lang.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java index 3e9543c..9638071 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java @@ -21,8 +21,6 @@ import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java index cb56bb3..7ae5aee 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java @@ -21,7 +21,6 @@ import org.apache.commons.logging.*; import org.apache.hadoop.conf.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/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 5916718..53a3523 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 @@ -21,7 +21,6 @@ import com.google.common.base.*; import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/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 d6243d8..315719e 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 @@ -21,7 +21,6 @@ import com.google.common.base.Joiner; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.hadoop.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.processors.hadoop.counter.*; import org.apache.ignite.internal.processors.hadoop.jobtracker.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/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 86a598b..161c6bc 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 @@ -27,7 +27,6 @@ import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.processors.hadoop.planner.*; import org.gridgain.grid.kernal.processors.interop.*; import org.apache.ignite.internal.util.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java index aac083a..23e369b 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java @@ -28,7 +28,6 @@ import org.apache.ignite.fs.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.communication.*; import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java index 5a26fff..b0e1863 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; @@ -41,7 +40,6 @@ import static org.apache.ignite.cache.GridCacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*; -import static org.gridgain.grid.kernal.processors.ggfs.GridGgfsAbstractSelfTest.*; /** * Tests for GGFS working in mode when remote file system exists: DUAL_SYNC, DUAL_ASYNC. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java index bfc8c44..276dafe 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java @@ -30,7 +30,6 @@ import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.ggfs.hadoop.v1.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.communication.*; import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java index e0755a2..81b4d9d 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.fs.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.fs.common.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java index 5f80ef3..b1a1ea6 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java @@ -24,7 +24,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java index f2aa537..e08daaf 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java @@ -23,7 +23,6 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java index c06b5d8..cd30a9f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java @@ -19,7 +19,6 @@ package org.gridgain.grid.ggfs; import org.apache.ignite.fs.*; import org.apache.ignite.internal.fs.common.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java index de7f42e..dfbede4 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java @@ -25,7 +25,6 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.gridgain.grid.ggfs.hadoop.v1.*; import org.apache.ignite.internal.fs.common.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java index 2a21f48..a54d035 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java @@ -25,7 +25,6 @@ import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.ggfs.hadoop.v1.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cfcf46df/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java b/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java index d63275f..9ee3420 100644 --- a/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java +++ b/modules/hadoop/src/test/java/org/gridgain/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java @@ -19,7 +19,6 @@ package org.gridgain.testsuites.bamboo; import junit.framework.*; import org.gridgain.grid.ggfs.*; -import org.gridgain.grid.kernal.processors.ggfs.*; import org.apache.ignite.internal.processors.hadoop.*; import static org.gridgain.testsuites.bamboo.GridHadoopTestSuite.*;
