http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java index 06ae40b..013bb18 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java @@ -17,12 +17,6 @@ package org.apache.ignite.internal.processors.igfs; -import java.nio.ByteBuffer; -import java.security.SecureRandom; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.concurrent.Callable; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; @@ -44,6 +38,13 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.Nullable; +import java.nio.ByteBuffer; +import java.security.SecureRandom; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.concurrent.Callable; + import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -168,8 +169,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { long t = System.currentTimeMillis(); - IgfsFileInfo info = new IgfsFileInfo(200, 0L, null, IgfsUtils.DELETE_LOCK_ID, - false, null, t, t); + IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), 200, 0L, null, + IgfsUtils.DELETE_LOCK_ID, false, null, t, t); assertNull(mgr.dataBlock(info, path, 0, null).get()); @@ -181,11 +182,11 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { expectsStoreFail(info, data, "Not enough space reserved to store data"); - info = new IgfsFileInfo(info, info.length() + data.length - 3); + info = info.length(info.length() + data.length - 3); expectsStoreFail(info, data, "Not enough space reserved to store data"); - info = new IgfsFileInfo(info, info.length() + 3); + info = info.length(info.length() + 3); IgfsFileAffinityRange range = new IgfsFileAffinityRange(); @@ -253,8 +254,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { long t = System.currentTimeMillis(); - IgfsFileInfo info = new IgfsFileInfo(blockSize, 0L, null, IgfsUtils.DELETE_LOCK_ID, - false, null, t, t); + IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 0L, null, + IgfsUtils.DELETE_LOCK_ID, false, null, t, t); assertNull(mgr.dataBlock(info, path, 0, null).get()); @@ -266,7 +267,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { rnd.nextBytes(remainder); - info = new IgfsFileInfo(info, info.length() + data.length + remainder.length); + info = info.length(info.length() + data.length + remainder.length); IgniteInternalFuture<Boolean> fut = mgr.writeStart(info); @@ -279,7 +280,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { byte[] remainder2 = new byte[blockSize / 2]; - info = new IgfsFileInfo(info, info.length() + remainder2.length); + info = info.length(info.length() + remainder2.length); byte[] left2 = mgr.storeDataBlocks(info, info.length(), left, left.length, ByteBuffer.wrap(remainder2), false, range, null); @@ -344,9 +345,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { long t = System.currentTimeMillis(); - IgfsFileInfo info = - new IgfsFileInfo(blockSize, 0L, null, IgfsUtils.DELETE_LOCK_ID, - false, null, t, t); + IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 0L, null, + IgfsUtils.DELETE_LOCK_ID, false, null, t, t); IgfsFileAffinityRange range = new IgfsFileAffinityRange(); @@ -356,7 +356,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { byte[] data = new byte[chunkSize]; - info = new IgfsFileInfo(info, info.length() + data.length * writesCnt); + info = info.length(info.length() + data.length * writesCnt); IgniteInternalFuture<Boolean> fut = mgr.writeStart(info); @@ -416,7 +416,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { long t = System.currentTimeMillis(); //IgfsFileInfo info = new IgfsFileInfo(blockSize, 0); - IgfsFileInfo info = new IgfsFileInfo(blockSize, 1024 * 1024, null, null, false, null, t, t); + IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false, + null, t, t); for (int pos = 0; pos < 5 * grpSize; pos++) { assertEquals("Expects no affinity for zero length.", Collections.<IgfsBlockLocation>emptyList(), @@ -466,7 +467,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { long t = System.currentTimeMillis(); - IgfsFileInfo info = new IgfsFileInfo(blockSize, 1024 * 1024, null, null, false, null, t, t); + IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false, + null, t, t); Collection<IgfsBlockLocation> affinity = mgr.affinity(info, 0, info.length()); @@ -499,7 +501,8 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { long t = System.currentTimeMillis(); - IgfsFileInfo info = new IgfsFileInfo(blockSize, 1024 * 1024, null, null, false, null, t, t); + IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false, + null, t, t); IgniteUuid affKey = IgniteUuid.randomUuid(); @@ -508,7 +511,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { map.addRange(new IgfsFileAffinityRange(3 * BLOCK_SIZE, 5 * BLOCK_SIZE - 1, affKey)); map.addRange(new IgfsFileAffinityRange(13 * BLOCK_SIZE, 17 * BLOCK_SIZE - 1, affKey)); - info.fileMap(map); + info = info.fileMap(map); Collection<IgfsBlockLocation> affinity = mgr.affinity(info, 0, info.length()); @@ -542,7 +545,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { * @param info File info. * @param affinity Affinity block locations to check. */ - private void checkAffinity(int blockSize, IgfsFileInfo info, Iterable<IgfsBlockLocation> affinity) { + private void checkAffinity(int blockSize, IgfsEntryInfo info, Iterable<IgfsBlockLocation> affinity) { for (IgfsBlockLocation loc : affinity) { info("Going to check IGFS block location: " + loc); @@ -574,7 +577,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { * @param data Data to store. * @param msg Expected failure message. */ - private void expectsStoreFail(final IgfsFileInfo reserved, final byte[] data, @Nullable String msg) { + private void expectsStoreFail(final IgfsEntryInfo reserved, final byte[] data, @Nullable String msg) { GridTestUtils.assertThrows(log, new Callable() { @Override public Object call() throws Exception { IgfsFileAffinityRange range = new IgfsFileAffinityRange(); @@ -592,7 +595,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { * @param fileInfo File to delete data for. * @param msg Expected failure message. */ - private void expectsDeleteFail(final IgfsFileInfo fileInfo, @Nullable String msg) { + private void expectsDeleteFail(final IgfsEntryInfo fileInfo, @Nullable String msg) { GridTestUtils.assertThrows(log, new Callable() { @Override public Object call() throws Exception { mgr.delete(fileInfo); @@ -610,7 +613,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest { * @param len File part length to get affinity for. * @param msg Expected failure message. */ - private void expectsAffinityFail(final IgfsFileInfo info, final long start, final long len, + private void expectsAffinityFail(final IgfsEntryInfo info, final long start, final long len, @Nullable String msg) { GridTestUtils.assertThrows(log, new Callable() { @Override public Object call() throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java index 0731436..6e13280 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java @@ -17,13 +17,6 @@ package org.apache.ignite.internal.processors.igfs; -import java.io.IOException; -import java.io.OutputStream; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.CyclicBarrier; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.igfs.IgfsFile; @@ -36,6 +29,14 @@ import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; +import java.io.IOException; +import java.io.OutputStream; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.CyclicBarrier; + import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC; import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC; import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_PERMISSION; @@ -1254,7 +1255,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest { // Wait for a while for prefetch to finish. IgfsMetaManager meta = igfs.context().meta(); - IgfsFileInfo info = meta.info(meta.fileId(FILE)); + IgfsEntryInfo info = meta.info(meta.fileId(FILE)); assert info != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java index feccdb5..486179c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java @@ -17,18 +17,19 @@ package org.apache.ignite.internal.processors.igfs; -import java.io.Externalizable; -import java.util.Random; -import java.util.concurrent.Callable; import org.apache.ignite.IgniteCheckedException; -import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.marshaller.Marshaller; import org.apache.ignite.marshaller.MarshallerContextTestImpl; import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; import org.jetbrains.annotations.Nullable; +import java.io.Externalizable; +import java.util.Random; +import java.util.concurrent.Callable; + /** - * {@link IgfsFileInfo} test case. + * {@link IgfsEntryInfo} test case. */ public class IgfsFileInfoSelfTest extends IgfsCommonAbstractTest { /** Marshaller to test {@link Externalizable} interface. */ @@ -49,23 +50,7 @@ public class IgfsFileInfoSelfTest extends IgfsCommonAbstractTest { @SuppressWarnings("deprecation") // Suppress due to default constructor should never be used directly. @Nullable @Override public Object call() throws IgniteCheckedException { - for (int i = 0; i < 10000; i++) { - testSerialization(new IgfsFileInfo()); - testSerialization(new IgfsFileInfo()); - - long a = System.currentTimeMillis(); - long m = a + 1; - - testSerialization(new IgfsFileInfo(true, null, a, m)); - testSerialization(new IgfsFileInfo(false, null, a, m)); - - IgfsFileInfo rndInfo = - new IgfsFileInfo(rnd.nextInt(max), 0, false, null, a, m); - - testSerialization(rndInfo); - testSerialization(new IgfsFileInfo(rndInfo, rnd.nextInt(max))); - testSerialization(new IgfsFileInfo(rndInfo, F.asMap("desc", String.valueOf(rnd.nextLong())))); - } + testSerialization(IgfsUtils.createDirectory(IgniteUuid.randomUuid())); return null; } @@ -78,7 +63,7 @@ public class IgfsFileInfoSelfTest extends IgfsCommonAbstractTest { * @param info Node info to test serialization for. * @throws IgniteCheckedException If failed. */ - public void testSerialization(IgfsFileInfo info) throws IgniteCheckedException { + public void testSerialization(IgfsEntryInfo info) throws IgniteCheckedException { assertEquals(info, mu(info)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java index 26424f0..3dc2791 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java @@ -147,12 +147,12 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { IgfsListingEntry dirEntry = mgr.directoryListing(ROOT_ID).get("dir"); assertNotNull(dirEntry); assertTrue(dirEntry.isDirectory()); - IgfsFileInfo dir = mgr.info(dirEntry.fileId()); + IgfsEntryInfo dir = mgr.info(dirEntry.fileId()); IgfsListingEntry fileEntry = mgr.directoryListing(ROOT_ID).get("file"); assertNotNull(fileEntry); assertTrue(!fileEntry.isDirectory()); - IgfsFileInfo file = mgr.info(fileEntry.fileId()); + IgfsEntryInfo file = mgr.info(fileEntry.fileId()); assertEquals(2, mgr.directoryListing(ROOT_ID).size()); @@ -166,7 +166,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { String key1 = UUID.randomUUID().toString(); String key2 = UUID.randomUUID().toString(); - IgfsFileInfo info = mgr.info(fileId); + IgfsEntryInfo info = mgr.info(fileId); assertNull("Unexpected stored properties: " + info, info.properties().get(key1)); assertNull("Unexpected stored properties: " + info, info.properties().get(key2)); @@ -197,24 +197,24 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { assertNull(mgr.updateProperties(dir.id(), F.asMap("p", "7"))); } - private IgfsFileInfo mkdirsAndGetInfo(String path) throws IgniteCheckedException { + private IgfsEntryInfo mkdirsAndGetInfo(String path) throws IgniteCheckedException { IgfsPath p = path(path); mgr.mkdirs(p, IgfsImpl.DFLT_DIR_META); IgniteUuid id = mgr.fileId(p); - IgfsFileInfo info = mgr.info(id); + IgfsEntryInfo info = mgr.info(id); assert info.isDirectory(); return info; } - private IgfsFileInfo createFileAndGetInfo(String path) throws IgniteCheckedException { + private IgfsEntryInfo createFileAndGetInfo(String path) throws IgniteCheckedException { IgfsPath p = path(path); - IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = mgr.create(p, null, false, 400, null, false, null); + IgniteBiTuple<IgfsEntryInfo, IgniteUuid> t2 = mgr.create(p, null, false, 400, null, false, null); assert t2 != null; assert !t2.get1().isDirectory(); @@ -228,7 +228,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { * @throws Exception If failed. */ public void testStructure() throws Exception { - IgfsFileInfo rootInfo = new IgfsFileInfo(); + IgfsEntryInfo rootInfo = IgfsUtils.createDirectory(ROOT_ID); // Test empty structure. assertEmpty(mgr.directoryListing(ROOT_ID)); @@ -236,15 +236,15 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { assertEquals(F.asMap(ROOT_ID, rootInfo), mgr.infos(Arrays.asList(ROOT_ID))); // Directories: - IgfsFileInfo a = mkdirsAndGetInfo("/a"); - IgfsFileInfo b = mkdirsAndGetInfo("/a/b"); - IgfsFileInfo k = mkdirsAndGetInfo("/a/b/k"); - IgfsFileInfo z = mkdirsAndGetInfo("/a/k"); + IgfsEntryInfo a = mkdirsAndGetInfo("/a"); + IgfsEntryInfo b = mkdirsAndGetInfo("/a/b"); + IgfsEntryInfo k = mkdirsAndGetInfo("/a/b/k"); + IgfsEntryInfo z = mkdirsAndGetInfo("/a/k"); // Files: - IgfsFileInfo f1 = createFileAndGetInfo("/f1"); - IgfsFileInfo f2 = createFileAndGetInfo("/a/f2"); - IgfsFileInfo f3 = createFileAndGetInfo("/a/b/f3"); + IgfsEntryInfo f1 = createFileAndGetInfo("/f1"); + IgfsEntryInfo f2 = createFileAndGetInfo("/a/f2"); + IgfsEntryInfo f3 = createFileAndGetInfo("/a/b/f3"); assertEquals(F.asMap("a", new IgfsListingEntry(a), "f1", new IgfsListingEntry(f1)), mgr.directoryListing(ROOT_ID)); @@ -256,11 +256,11 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest { "k", new IgfsListingEntry(k)), mgr.directoryListing(b.id())); // Validate empty files listings. - for (IgfsFileInfo info : Arrays.asList(f1, f2, f3)) + for (IgfsEntryInfo info : Arrays.asList(f1, f2, f3)) assertEmpty(mgr.directoryListing(info.id())); // Validate 'file info' operations. - for (IgfsFileInfo info : Arrays.asList(rootInfo, a, b, f1, f2, f3)) { + for (IgfsEntryInfo info : Arrays.asList(rootInfo, a, b, f1, f2, f3)) { assertEquals(info, mgr.info(info.id())); assertEquals(F.asMap(info.id(), info), mgr.infos(Arrays.asList(info.id()))); } http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java index 4112846..bcc2314 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java @@ -17,17 +17,6 @@ package org.apache.ignite.internal.processors.igfs; -import java.security.SecureRandom; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.atomic.AtomicInteger; -import javax.cache.Cache; import org.apache.commons.io.IOUtils; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; @@ -56,6 +45,18 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.Nullable; +import javax.cache.Cache; +import java.security.SecureRandom; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicInteger; + import static java.nio.charset.StandardCharsets.UTF_8; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; @@ -227,8 +228,8 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { IgfsFileImpl info = (IgfsFileImpl)igfs.info(path); for (int i = 0; i < nodesCount(); i++) { - IgfsFileInfo fileInfo = - (IgfsFileInfo)grid(i).cachex(metaCacheName).localPeek(info.fileId(), ONHEAP_PEEK_MODES, null); + IgfsEntryInfo fileInfo = + (IgfsEntryInfo)grid(i).cachex(metaCacheName).localPeek(info.fileId(), ONHEAP_PEEK_MODES, null); assertNotNull(fileInfo); assertNotNull(fileInfo.listing()); @@ -693,10 +694,10 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest { IgniteUuid fileId = U.field(igfs.info(path), "fileId"); - GridCacheAdapter<IgniteUuid, IgfsFileInfo> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME); + GridCacheAdapter<IgniteUuid, IgfsEntryInfo> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME); GridCacheAdapter<IgfsBlockKey, byte[]> dataCache = ((IgniteKernal)grid(0)).internalCache(DATA_CACHE_NAME); - IgfsFileInfo info = metaCache.get(fileId); + IgfsEntryInfo info = metaCache.get(fileId); assertNotNull(info); assertTrue(info.isFile()); http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java index fcf4b3b..3933e86 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java @@ -17,17 +17,6 @@ package org.apache.ignite.internal.processors.igfs; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.Callable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.atomic.AtomicReference; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.cache.CacheMode; @@ -55,6 +44,18 @@ import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.transactions.Transaction; import org.jsr166.ThreadLocalRandom8; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.atomic.AtomicReference; + import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -505,12 +506,12 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { os.write(chunk((int)igfsMaxData)); os.close(); - final IgniteCache<IgniteUuid, IgfsFileInfo> metaCache = igfs.context().kernalContext().cache().jcache( + final IgniteCache<IgniteUuid, IgfsEntryInfo> metaCache = igfs.context().kernalContext().cache().jcache( igfs.configuration().getMetaCacheName()); // Start a transaction in a separate thread which will lock file ID. final IgniteUuid id = igfs.context().meta().fileId(path); - final IgfsFileInfo info = igfs.context().meta().info(id); + final IgfsEntryInfo info = igfs.context().meta().info(id); final AtomicReference<Throwable> err = new AtomicReference<>(); @@ -543,15 +544,15 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest { new IgfsListingEntry(info)); // Clear root listing. - metaCache.put(IgfsUtils.ROOT_ID, new IgfsFileInfo(IgfsUtils.ROOT_ID)); + metaCache.put(IgfsUtils.ROOT_ID, IgfsUtils.createDirectory(IgfsUtils.ROOT_ID)); // Add file to trash listing. - IgfsFileInfo trashInfo = metaCache.get(trashId); + IgfsEntryInfo trashInfo = metaCache.get(trashId); if (trashInfo == null) - metaCache.put(trashId, new IgfsFileInfo(listing, new IgfsFileInfo(trashId))); + metaCache.put(trashId, IgfsUtils.createDirectory(trashId).listing(listing)); else - metaCache.put(trashId, new IgfsFileInfo(listing, trashInfo)); + metaCache.put(trashId, trashInfo.listing(listing)); tx.commit(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java index 8383a18..7b7078f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java @@ -17,17 +17,6 @@ package org.apache.ignite.internal.processors.igfs; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Random; -import java.util.UUID; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.atomic.AtomicInteger; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteFileSystem; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -53,6 +42,18 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.atomic.AtomicInteger; + import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -276,7 +277,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest { GridCacheAdapter<Object, Object> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME); - IgfsFileInfo fileInfo = (IgfsFileInfo)metaCache.get(fileImpl.fileId()); + IgfsEntryInfo fileInfo = (IgfsEntryInfo)metaCache.get(fileImpl.fileId()); IgfsFileMap map = fileInfo.fileMap(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java index 672b912..7a4648a 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java @@ -41,11 +41,12 @@ import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadabl import org.apache.ignite.internal.processors.hadoop.HadoopPayloadAware; import org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsProperties; import org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsSecondaryFileSystemPositionedReadable; +import org.apache.ignite.internal.processors.igfs.IgfsEntryInfo; import org.apache.ignite.internal.processors.igfs.IgfsFileImpl; -import org.apache.ignite.internal.processors.igfs.IgfsFileInfo; import org.apache.ignite.internal.processors.igfs.IgfsUtils; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgniteOutClosure; +import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.lifecycle.LifecycleAware; import org.jetbrains.annotations.Nullable; @@ -350,13 +351,28 @@ public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSys Collection<IgfsFile> res = new ArrayList<>(statuses.length); - for (FileStatus status : statuses) { - IgfsFileInfo fsInfo = status.isDirectory() ? - new IgfsFileInfo(true, properties(status), status.getAccessTime(), status.getModificationTime()) : - new IgfsFileInfo((int)status.getBlockSize(), status.getLen(), null, null, false, properties(status), - status.getAccessTime(), status.getModificationTime()); - - res.add(new IgfsFileImpl(new IgfsPath(path, status.getPath().getName()), fsInfo, 1)); + for (FileStatus s : statuses) { + IgfsEntryInfo fsInfo = s.isDirectory() ? + IgfsUtils.createDirectory( + IgniteUuid.randomUuid(), + null, + properties(s), + s.getAccessTime(), + s.getModificationTime() + ) : + IgfsUtils.createFile( + IgniteUuid.randomUuid(), + (int)s.getBlockSize(), + s.getLen(), + null, + null, + false, + properties(s), + s.getAccessTime(), + s.getModificationTime() + ); + + res.add(new IgfsFileImpl(new IgfsPath(path, s.getPath().getName()), fsInfo, 1)); } return res; http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java index 0ec8a78..40cf493 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java @@ -17,9 +17,6 @@ package org.apache.ignite.igfs; -import java.io.IOException; -import java.net.URI; -import java.util.concurrent.Callable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; @@ -34,7 +31,7 @@ import org.apache.ignite.hadoop.fs.IgniteHadoopIgfsSecondaryFileSystem; import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem; import org.apache.ignite.internal.processors.igfs.IgfsBlockKey; import org.apache.ignite.internal.processors.igfs.IgfsCommonAbstractTest; -import org.apache.ignite.internal.processors.igfs.IgfsFileInfo; +import org.apache.ignite.internal.processors.igfs.IgfsEntryInfo; import org.apache.ignite.internal.processors.igfs.IgfsImpl; import org.apache.ignite.internal.processors.igfs.IgfsMetaManager; import org.apache.ignite.internal.util.typedef.G; @@ -44,6 +41,10 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.GridTestUtils; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.net.URI; +import java.util.concurrent.Callable; + import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED; import static org.apache.ignite.cache.CacheMode.REPLICATED; @@ -279,7 +280,7 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT // Wait for a while for prefetch to finish (if any). IgfsMetaManager meta = igfs.context().meta(); - IgfsFileInfo info = meta.info(meta.fileId(FILE)); + IgfsEntryInfo info = meta.info(meta.fileId(FILE)); IgfsBlockKey key = new IgfsBlockKey(info.id(), info.affinityKey(), info.evictExclude(), 2); http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemLoggerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemLoggerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemLoggerSelfTest.java index e89d651..3013311 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemLoggerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/IgniteHadoopFileSystemLoggerSelfTest.java @@ -17,6 +17,11 @@ package org.apache.ignite.igfs; +import org.apache.ignite.internal.igfs.common.IgfsLogger; +import org.apache.ignite.internal.processors.igfs.IgfsCommonAbstractTest; +import org.apache.ignite.internal.util.typedef.internal.SB; +import org.apache.ignite.internal.util.typedef.internal.U; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -24,12 +29,6 @@ import java.io.FilenameFilter; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; -import org.apache.ignite.internal.igfs.common.IgfsLogger; -import org.apache.ignite.internal.processors.igfs.IgfsCommonAbstractTest; -import org.apache.ignite.internal.processors.igfs.IgfsFileImpl; -import org.apache.ignite.internal.processors.igfs.IgfsFileInfo; -import org.apache.ignite.internal.util.typedef.internal.SB; -import org.apache.ignite.internal.util.typedef.internal.U; import static org.apache.ignite.igfs.IgfsMode.PRIMARY; import static org.apache.ignite.internal.igfs.common.IgfsLogger.DELIM_FIELD; @@ -244,16 +243,6 @@ public class IgniteHadoopFileSystemLoggerSelfTest extends IgfsCommonAbstractTest } /** - * Create IGFS file with the given path. - * - * @param path File path. - * @return IGFS file instance. - */ - private IgfsFile file(String path) { - return new IgfsFileImpl(new IgfsPath(path), new IgfsFileInfo(), 64 * 1024 * 1024); - } - - /** * Ensure that log file has only the following lines. * * @param lines Expected lines. http://git-wip-us.apache.org/repos/asf/ignite/blob/4794f87b/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 e03e4e1..ebc0c23 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 @@ -17,17 +17,6 @@ package org.apache.ignite.testsuites; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.net.URL; -import java.net.URLConnection; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; import junit.framework.TestSuite; import org.apache.commons.compress.archivers.tar.TarArchiveEntry; import org.apache.commons.compress.archivers.tar.TarArchiveInputStream; @@ -68,6 +57,7 @@ import org.apache.ignite.internal.processors.hadoop.HadoopJobTrackerSelfTest; import org.apache.ignite.internal.processors.hadoop.HadoopMapReduceEmbeddedSelfTest; import org.apache.ignite.internal.processors.hadoop.HadoopMapReduceTest; import org.apache.ignite.internal.processors.hadoop.HadoopSerializationWrapperSelfTest; +import org.apache.ignite.internal.processors.hadoop.HadoopSnappyFullMapReduceTest; import org.apache.ignite.internal.processors.hadoop.HadoopSnappyTest; import org.apache.ignite.internal.processors.hadoop.HadoopSortingTest; import org.apache.ignite.internal.processors.hadoop.HadoopSplitWrapperSelfTest; @@ -76,7 +66,6 @@ import org.apache.ignite.internal.processors.hadoop.HadoopTasksV1Test; import org.apache.ignite.internal.processors.hadoop.HadoopTasksV2Test; import org.apache.ignite.internal.processors.hadoop.HadoopV2JobSelfTest; import org.apache.ignite.internal.processors.hadoop.HadoopValidationSelfTest; -import org.apache.ignite.internal.processors.hadoop.HadoopSnappyFullMapReduceTest; import org.apache.ignite.internal.processors.hadoop.shuffle.collections.HadoopConcurrentHashMultimapSelftest; import org.apache.ignite.internal.processors.hadoop.shuffle.collections.HadoopHashMapSelfTest; import org.apache.ignite.internal.processors.hadoop.shuffle.collections.HadoopSkipListSelfTest; @@ -85,6 +74,18 @@ import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.U; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.net.URLConnection; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; + import static org.apache.ignite.testframework.GridTestUtils.modeToPermissionSet; /** @@ -184,6 +185,7 @@ public class IgniteHadoopTestSuite extends TestSuite { suite.addTest(new TestSuite(ldr.loadClass(HadoopSecondaryFileSystemConfigurationTest.class.getName()))); suite.addTest(new TestSuite(ldr.loadClass(HadoopTxConfigCacheTest.class.getName()))); + return suite; }
