http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java new file mode 100644 index 0000000..66cdbd5 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsNewLineDelimiterRecordResolverSelfTest.java @@ -0,0 +1,129 @@ +/* + * 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.internal.processors.igfs.split; + +import org.apache.ignite.igfs.*; +import org.apache.ignite.igfs.mapreduce.*; +import org.apache.ignite.igfs.mapreduce.records.*; +import org.apache.ignite.internal.util.typedef.*; + +import static org.apache.ignite.igfs.mapreduce.records.IgfsNewLineRecordResolver.*; + +/** + * New line split resolver self test. + */ +public class IgfsNewLineDelimiterRecordResolverSelfTest extends IgfsAbstractRecordResolverSelfTest { + /** + * 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); + + IgfsNewLineRecordResolver rslvr = resolver(); + + IgfsFileRange split; + + try (IgfsInputStream 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); + + IgfsNewLineRecordResolver rslvr = resolver(); + + IgfsFileRange split; + + try (IgfsInputStream is = read()) { + split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen)); + } + + assert split == null : "Split is not null."; + } + + /** + * Create resolver. + * + * @return Resolver. + */ + private IgfsNewLineRecordResolver resolver() { + return IgfsNewLineRecordResolver.NEW_LINE; + } +}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java new file mode 100644 index 0000000..94a1b30 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsStringDelimiterRecordResolverSelfTest.java @@ -0,0 +1,137 @@ +/* + * 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.internal.processors.igfs.split; + +import org.apache.ignite.igfs.*; +import org.apache.ignite.igfs.mapreduce.*; +import org.apache.ignite.igfs.mapreduce.records.*; +import org.apache.ignite.internal.util.typedef.*; + +import java.nio.charset.*; + +/** + * String delimiter split resolver self-test. + */ +public class IgfsStringDelimiterRecordResolverSelfTest extends IgfsAbstractRecordResolverSelfTest { + /** 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); + + IgfsByteDelimiterRecordResolver rslvr = resolver(delims); + + IgfsFileRange split; + + try (IgfsInputStream 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); + + IgfsStringDelimiterRecordResolver rslvr = resolver(delims); + + IgfsFileRange split; + + try (IgfsInputStream 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 IgfsStringDelimiterRecordResolver resolver(String... delims) { + return new IgfsStringDelimiterRecordResolver(UTF8, delims); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java index 867941c..f5aa591 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/ipc/IpcServerEndpointDeserializerSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.util.ipc; import org.apache.ignite.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.ipc.loopback.*; import org.apache.ignite.internal.util.ipc.shmem.*; import org.apache.ignite.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java index f077ad7..92a24f6 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java @@ -19,8 +19,8 @@ package org.apache.ignite.testsuites; import junit.framework.*; import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.processors.fs.*; -import org.apache.ignite.internal.processors.fs.split.*; +import org.apache.ignite.internal.processors.igfs.*; +import org.apache.ignite.internal.processors.igfs.split.*; import org.apache.ignite.internal.util.ipc.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java index 6d5713b..ae9b3cf 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v1/IgfsHadoopFileSystem.java @@ -28,7 +28,7 @@ import org.apache.ignite.*; import org.apache.ignite.igfs.*; import org.apache.ignite.internal.igfs.common.*; import org.apache.ignite.internal.igfs.hadoop.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; 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/141f8282/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java index 16094d7..028c975 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/igfs/hadoop/v2/IgfsHadoopFileSystem.java @@ -28,7 +28,7 @@ import org.apache.ignite.*; import org.apache.ignite.igfs.*; import org.apache.ignite.internal.igfs.common.*; import org.apache.ignite.internal.igfs.hadoop.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; 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/141f8282/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoop.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoop.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoop.java index 325dd16..9f17965 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoop.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoop.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.igfs.hadoop; import org.apache.ignite.*; import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java index fbf27f0..d67ee83 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopFileSystemWrapper.java @@ -24,7 +24,7 @@ import org.apache.hadoop.fs.permission.*; import org.apache.hadoop.ipc.*; import org.apache.ignite.*; import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; 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/141f8282/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInProc.java index 09cb964..a2c168f 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInProc.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopInProc.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.igfs.hadoop; import org.apache.commons.logging.*; import org.apache.ignite.*; import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.lang.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutProc.java index a88b8d0..a71b7bf 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutProc.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopOutProc.java @@ -21,7 +21,7 @@ import org.apache.commons.logging.*; import org.apache.ignite.*; import org.apache.ignite.igfs.*; import org.apache.ignite.internal.igfs.common.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; 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/141f8282/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java index 728e3c2..dcfaf4d 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopUtils.java @@ -21,7 +21,7 @@ import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; import org.apache.ignite.*; import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopWrapper.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopWrapper.java index d72a4aa..282bbb7 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopWrapper.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/igfs/hadoop/IgfsHadoopWrapper.java @@ -21,7 +21,7 @@ import org.apache.commons.logging.*; import org.apache.hadoop.conf.*; import org.apache.ignite.*; import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; 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/141f8282/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 abe8aa1..5c8a465 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 @@ -22,7 +22,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.igfs.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.igfs.hadoop.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.processors.hadoop.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java index f1d1268..52d35bf 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoop20FileSystemAbstractSelfTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.igfs.hadoop.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java index 6e55d59..20822ef 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopDualAbstractSelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.igfs.hadoop.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.spi.discovery.tcp.*; @@ -41,7 +41,7 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.igfs.IgfsMode.*; import static org.apache.ignite.igfs.hadoop.IgfsHadoopParameters.*; -import static org.apache.ignite.internal.processors.fs.IgfsAbstractSelfTest.*; +import static org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest.*; /** * 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/141f8282/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java index b7c6b05..d1363cc 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemAbstractSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.igfs.hadoop.v1.IgfsHadoopFileSystem; import org.apache.ignite.internal.igfs.hadoop.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.*; 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/141f8282/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java index 1dc8ff7..fe22bc2 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemClientSelfTest.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.igfs.common.*; import org.apache.ignite.internal.igfs.hadoop.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java index ca82d39..f4b3580 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemHandshakeSelfTest.java @@ -23,7 +23,7 @@ import org.apache.hadoop.fs.*; import org.apache.ignite.*; import org.apache.ignite.configuration.*; import org.apache.ignite.igfs.hadoop.v2.IgfsHadoopFileSystem; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; 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/141f8282/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java index 84340f6..22213a5 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemIpcCacheSelfTest.java @@ -22,7 +22,7 @@ import org.apache.hadoop.fs.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.igfs.hadoop.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.ipc.shmem.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java index 2075331..1c59643 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.igfs; import org.apache.ignite.internal.igfs.common.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java index a135fd7..b80fbe9 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemLoggerStateSelfTest.java @@ -24,7 +24,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.igfs.hadoop.v1.*; import org.apache.ignite.internal.igfs.common.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java index c8a388f..a426814 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgfsHadoopFileSystemSecondaryModeSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.igfs.hadoop.v1.*; import org.apache.ignite.internal.igfs.hadoop.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/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 559a5a5..1e28cff 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,7 @@ import com.google.common.base.*; import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.FileSystem; import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/141f8282/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 604fd68..dbe2bb1 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 @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.hadoop; import com.google.common.base.*; import org.apache.ignite.*; import org.apache.ignite.igfs.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; 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/141f8282/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 2ff4a5a..a073b21 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 @@ -25,7 +25,7 @@ import org.apache.ignite.igfs.*; import org.apache.ignite.igfs.mapreduce.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; -import org.apache.ignite.internal.processors.fs.*; +import org.apache.ignite.internal.processors.igfs.*; import org.apache.ignite.internal.processors.hadoop.planner.*; import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*;
