http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java index 79e17de..2db4380 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManager.java @@ -488,7 +488,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { GridGgfsFileInfo oldInfo = info(fileId); if (oldInfo == null) - throw new GridGgfsFileNotFoundException("Failed to unlock file (file not found): " + fileId); + throw new IgniteFsFileNotFoundException("Failed to unlock file (file not found): " + fileId); if (!info.lockId().equals(oldInfo.lockId())) throw new GridException("Failed to unlock file (inconsistent file lock ID) [fileId=" + fileId + @@ -727,7 +727,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { assert validTxState(true); if (parentInfo == null) - throw new GridGgfsFileNotFoundException("Failed to lock parent directory (not found): " + parentId); + throw new IgniteFsFileNotFoundException("Failed to lock parent directory (not found): " + parentId); if (!parentInfo.isDirectory()) throw new GridGgfsInvalidPathException("Parent file is not a directory: " + parentInfo); @@ -827,7 +827,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { GridGgfsFileInfo srcInfo = infoMap.get(srcParentId); if (srcInfo == null) - throw new GridGgfsFileNotFoundException("Failed to lock source directory (not found?)" + + throw new IgniteFsFileNotFoundException("Failed to lock source directory (not found?)" + " [srcParentId=" + srcParentId + ']'); if (!srcInfo.isDirectory()) @@ -836,7 +836,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { GridGgfsFileInfo destInfo = infoMap.get(destParentId); if (destInfo == null) - throw new GridGgfsFileNotFoundException("Failed to lock destination directory (not found?)" + + throw new IgniteFsFileNotFoundException("Failed to lock destination directory (not found?)" + " [destParentId=" + destParentId + ']'); if (!destInfo.isDirectory()) @@ -845,7 +845,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { GridGgfsFileInfo fileInfo = infoMap.get(fileId); if (fileInfo == null) - throw new GridGgfsFileNotFoundException("Failed to lock target file (not found?) [fileId=" + + throw new IgniteFsFileNotFoundException("Failed to lock target file (not found?) [fileId=" + fileId + ']'); GridGgfsListingEntry srcEntry = srcInfo.listing().get(srcFileName); @@ -853,7 +853,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { // If source file does not exist or was re-created. if (srcEntry == null || !srcEntry.fileId().equals(fileId)) - throw new GridGgfsFileNotFoundException("Failed to remove file name from the source directory" + + throw new IgniteFsFileNotFoundException("Failed to remove file name from the source directory" + " (file not found) [fileId=" + fileId + ", srcFileName=" + srcFileName + ", srcParentId=" + srcParentId + ", srcEntry=" + srcEntry + ']'); @@ -1577,7 +1577,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return Output stream descriptor. * @throws GridException If file creation failed. */ - public GridGgfsSecondaryOutputStreamDescriptor createDual(final GridGgfsFileSystem fs, final IgniteFsPath path, + public GridGgfsSecondaryOutputStreamDescriptor createDual(final IgniteFsFileSystem fs, final IgniteFsPath path, final boolean simpleCreate, @Nullable final Map<String, String> props, final boolean overwrite, final int bufSize, final short replication, final long blockSize, final IgniteUuid affKey) throws GridException { @@ -1637,7 +1637,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { } // Get created file info. - GridGgfsFile status = fs.info(path); + IgniteFsFile status = fs.info(path); if (status == null) throw new IgniteFsException("Failed to open output stream to the file created in " + @@ -1737,7 +1737,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return Output stream descriptor. * @throws GridException If output stream open for append has failed. */ - public GridGgfsSecondaryOutputStreamDescriptor appendDual(final GridGgfsFileSystem fs, final IgniteFsPath path, + public GridGgfsSecondaryOutputStreamDescriptor appendDual(final IgniteFsFileSystem fs, final IgniteFsPath path, final int bufSize) throws GridException { if (busyLock.enterBusy()) { try { @@ -1820,7 +1820,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return Input stream descriptor. * @throws GridException If input stream open has failed. */ - public GridGgfsSecondaryInputStreamDescriptor openDual(final GridGgfsFileSystem fs, final IgniteFsPath path, + public GridGgfsSecondaryInputStreamDescriptor openDual(final IgniteFsFileSystem fs, final IgniteFsPath path, final int bufSize) throws GridException { if (busyLock.enterBusy()) { @@ -1846,7 +1846,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { GridGgfsFileInfo info = infos.get(path); if (info == null) - throw new GridGgfsFileNotFoundException("File not found: " + path); + throw new IgniteFsFileNotFoundException("File not found: " + path); if (!info.isFile()) throw new GridGgfsInvalidPathException("Failed to open file (not a file): " + path); @@ -1884,7 +1884,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return File info or {@code null} if file not found. * @throws GridException If sync task failed. */ - @Nullable public GridGgfsFileInfo synchronizeFileDual(final GridGgfsFileSystem fs, final IgniteFsPath path) + @Nullable public GridGgfsFileInfo synchronizeFileDual(final IgniteFsFileSystem fs, final IgniteFsPath path) throws GridException { assert fs != null; assert path != null; @@ -1935,7 +1935,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return {@code True} in case rename was successful. * @throws GridException If directory creation failed. */ - public boolean mkdirsDual(final GridGgfsFileSystem fs, final IgniteFsPath path, final Map<String, String> props) + public boolean mkdirsDual(final IgniteFsFileSystem fs, final IgniteFsPath path, final Map<String, String> props) throws GridException { if (busyLock.enterBusy()) { try { @@ -2019,7 +2019,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return Operation result. * @throws GridException If failed. */ - public boolean renameDual(final GridGgfsFileSystem fs, final IgniteFsPath src, final IgniteFsPath dest) throws + public boolean renameDual(final IgniteFsFileSystem fs, final IgniteFsPath src, final IgniteFsPath dest) throws GridException { if (busyLock.enterBusy()) { try { @@ -2042,10 +2042,10 @@ public class GridGgfsMetaManager extends GridGgfsManager { // Source path and destination (or destination parent) must exist. if (srcInfo == null) - throw new GridGgfsFileNotFoundException("Failed to rename (source path not found): " + src); + throw new IgniteFsFileNotFoundException("Failed to rename (source path not found): " + src); if (destInfo == null && destParentInfo == null) - throw new GridGgfsFileNotFoundException("Failed to rename (destination path not found): " + + throw new IgniteFsFileNotFoundException("Failed to rename (destination path not found): " + dest); // Delegate to the secondary file system. @@ -2120,7 +2120,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return Operation result. * @throws GridException If delete failed. */ - public boolean deleteDual(final GridGgfsFileSystem fs, final IgniteFsPath path, final boolean recursive) + public boolean deleteDual(final IgniteFsFileSystem fs, final IgniteFsPath path, final boolean recursive) throws GridException { if (busyLock.enterBusy()) { try { @@ -2186,7 +2186,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return Update file info. * @throws GridException If update failed. */ - public GridGgfsFileInfo updateDual(final GridGgfsFileSystem fs, final IgniteFsPath path, final Map<String, String> props) + public GridGgfsFileInfo updateDual(final IgniteFsFileSystem fs, final IgniteFsPath path, final Map<String, String> props) throws GridException { assert fs != null; assert path != null; @@ -2239,7 +2239,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return File info of the end path. * @throws GridException If failed. */ - private GridGgfsFileInfo synchronize(GridGgfsFileSystem fs, IgniteFsPath startPath, GridGgfsFileInfo startPathInfo, + private GridGgfsFileInfo synchronize(IgniteFsFileSystem fs, IgniteFsPath startPath, GridGgfsFileInfo startPathInfo, IgniteFsPath endPath, boolean strict, @Nullable Map<IgniteFsPath, GridGgfsFileInfo> created) throws GridException { assert fs != null; @@ -2261,7 +2261,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { parentInfo = created.get(curPath); else { // Get file status from the secondary file system. - GridGgfsFile status = fs.info(curPath); + IgniteFsFile status = fs.info(curPath); if (status != null) { if (!status.isDirectory() && !curPath.equals(endPath)) @@ -2311,7 +2311,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return Result of task execution. * @throws GridException If failed. */ - private <T> T synchronizeAndExecute(SynchronizationTask<T> task, GridGgfsFileSystem fs, boolean strict, + private <T> T synchronizeAndExecute(SynchronizationTask<T> task, IgniteFsFileSystem fs, boolean strict, IgniteFsPath... paths) throws GridException { return synchronizeAndExecute(task, fs, strict, null, paths); @@ -2329,7 +2329,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { * @return Result of task execution. * @throws GridException If failed. */ - private <T> T synchronizeAndExecute(SynchronizationTask<T> task, GridGgfsFileSystem fs, boolean strict, + private <T> T synchronizeAndExecute(SynchronizationTask<T> task, IgniteFsFileSystem fs, boolean strict, @Nullable Collection<IgniteUuid> extraLockIds, IgniteFsPath... paths) throws GridException { assert task != null; assert fs != null; @@ -2581,7 +2581,7 @@ public class GridGgfsMetaManager extends GridGgfsManager { GridGgfsFileInfo fileInfo = infoMap.get(fileId); if (fileInfo == null) - throw new GridGgfsFileNotFoundException("Failed to update times (path was not found): " + + throw new IgniteFsFileNotFoundException("Failed to update times (path was not found): " + fileName); GridGgfsFileInfo parentInfo = infoMap.get(parentId);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsOutputStreamImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsOutputStreamImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsOutputStreamImpl.java index 854fda0..8e58787 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsOutputStreamImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsOutputStreamImpl.java @@ -358,7 +358,7 @@ class GridGgfsOutputStreamImpl extends GridGgfsOutputStreamAdapter { try { meta.unlock(fileInfo, modificationTime); } - catch (GridGgfsFileNotFoundException ignore) { + catch (IgniteFsFileNotFoundException ignore) { data.delete(fileInfo); // Safety to ensure that all data blocks are deleted. throw new IOException("File was concurrently deleted: " + path); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java index dc83ed5..0b37e55 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessor.java @@ -262,7 +262,7 @@ public class GridGgfsProcessor extends GridGgfsProcessorAdapter { GridCacheAffinityKeyMapper affMapper = cacheCfg.getAffinityMapper(); - if (!(affMapper instanceof GridGgfsGroupDataBlocksKeyMapper)) + if (!(affMapper instanceof IgniteFsGroupDataBlocksKeyMapper)) // Do not create GGFS attributes for such a node nor throw error about invalid configuration. // Configuration will be validated later, while starting GridGgfsProcessor. continue; @@ -270,7 +270,7 @@ public class GridGgfsProcessor extends GridGgfsProcessorAdapter { attrVals.add(new GridGgfsAttributes( ggfsCfg.getName(), ggfsCfg.getBlockSize(), - ((GridGgfsGroupDataBlocksKeyMapper)affMapper).groupSize(), + ((IgniteFsGroupDataBlocksKeyMapper)affMapper).groupSize(), ggfsCfg.getMetaCacheName(), ggfsCfg.getDataCacheName(), ggfsCfg.getDefaultMode(), @@ -323,9 +323,9 @@ public class GridGgfsProcessor extends GridGgfsProcessorAdapter { if (F.eq(cfg.getDataCacheName(), cfg.getMetaCacheName())) throw new GridException("Cannot use same cache as both data and meta cache: " + cfg.getName()); - if (!(dataCache.configuration().getAffinityMapper() instanceof GridGgfsGroupDataBlocksKeyMapper)) + if (!(dataCache.configuration().getAffinityMapper() instanceof IgniteFsGroupDataBlocksKeyMapper)) throw new GridException("Invalid GGFS data cache configuration (key affinity mapper class should be " + - GridGgfsGroupDataBlocksKeyMapper.class.getSimpleName() + "): " + cfg); + IgniteFsGroupDataBlocksKeyMapper.class.getSimpleName() + "): " + cfg); long maxSpaceSize = cfg.getMaxSpaceSize(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsFileImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsFileImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsFileImpl.java new file mode 100644 index 0000000..28b2cd6 --- /dev/null +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsFileImpl.java @@ -0,0 +1,237 @@ +/* @java.file.header */ + +/* _________ _____ __________________ _____ + * __ ____/___________(_)______ /__ ____/______ ____(_)_______ + * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ + * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / + * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ + */ + +package org.gridgain.grid.kernal.processors.ggfs; + +import org.apache.ignite.lang.*; +import org.gridgain.grid.ggfs.*; +import org.gridgain.grid.util.typedef.internal.*; +import org.jetbrains.annotations.*; + +import java.io.*; +import java.util.*; + +/** + * File or directory information. + */ +public final class IgniteFsFileImpl implements IgniteFsFile, Externalizable { + /** */ + private static final long serialVersionUID = 0L; + + /** Path to this file. */ + private IgniteFsPath path; + + /** File id. */ + private IgniteUuid fileId; + + /** Block size. */ + private int blockSize; + + /** Group block size. */ + private long grpBlockSize; + + /** File length. */ + private long len; + + /** Last access time. */ + private long accessTime; + + /** Last modification time. */ + private long modificationTime; + + /** Properties. */ + private Map<String, String> props; + + /** + * Empty constructor required by {@link Externalizable}. + */ + public IgniteFsFileImpl() { + // No-op. + } + + /** + * Constructs directory info. + * + * @param path Path. + */ + public IgniteFsFileImpl(IgniteFsPath path, GridGgfsFileInfo info, long globalGrpBlockSize) { + A.notNull(path, "path"); + A.notNull(info, "info"); + + this.path = path; + fileId = info.id(); + + if (info.isFile()) { + blockSize = info.blockSize(); + len = info.length(); + + grpBlockSize = info.affinityKey() == null ? globalGrpBlockSize : + info.length() == 0 ? globalGrpBlockSize : info.length(); + } + + props = info.properties(); + + if (props == null) + props = Collections.emptyMap(); + + accessTime = info.accessTime(); + modificationTime = info.modificationTime(); + } + + /** + * Constructs file instance. + * + * @param path Path. + * @param entry Listing entry. + */ + public IgniteFsFileImpl(IgniteFsPath path, GridGgfsListingEntry entry, long globalGrpSize) { + A.notNull(path, "path"); + A.notNull(entry, "entry"); + + this.path = path; + fileId = entry.fileId(); + + blockSize = entry.blockSize(); + + grpBlockSize = entry.affinityKey() == null ? globalGrpSize : + entry.length() == 0 ? globalGrpSize : entry.length(); + + len = entry.length(); + props = entry.properties(); + + accessTime = entry.accessTime(); + modificationTime = entry.modificationTime(); + } + + /** {@inheritDoc} */ + @Override public IgniteFsPath path() { + return path; + } + + /** + * @return File ID. + */ + public IgniteUuid fileId() { + return fileId; + } + + /** {@inheritDoc} */ + @Override public boolean isFile() { + return blockSize > 0; + } + + /** {@inheritDoc} */ + @Override public boolean isDirectory() { + return blockSize == 0; + } + + /** {@inheritDoc} */ + @Override public long length() { + return len; + } + + /** {@inheritDoc} */ + @Override public int blockSize() { + return blockSize; + } + + /** {@inheritDoc} */ + @Override public long groupBlockSize() { + return grpBlockSize; + } + + /** {@inheritDoc} */ + @Override public long accessTime() { + return accessTime; + } + + /** {@inheritDoc} */ + @Override public long modificationTime() { + return modificationTime; + } + + /** {@inheritDoc} */ + @Override public String property(String name) throws IllegalArgumentException { + String val = props.get(name); + + if (val == null) + throw new IllegalArgumentException("File property not found [path=" + path + ", name=" + name + ']'); + + return val; + } + + /** {@inheritDoc} */ + @Override public String property(String name, @Nullable String dfltVal) { + String val = props.get(name); + + return val == null ? dfltVal : val; + } + + /** {@inheritDoc} */ + @Override public Map<String, String> properties() { + return props; + } + + /** + * Writes object to data output. + * + * @param out Data output. + */ + @Override public void writeExternal(ObjectOutput out) throws IOException { + path.writeExternal(out); + + out.writeInt(blockSize); + out.writeLong(grpBlockSize); + out.writeLong(len); + U.writeStringMap(out, props); + out.writeLong(accessTime); + out.writeLong(modificationTime); + } + + /** + * Reads object from data input. + * + * @param in Data input. + */ + @Override public void readExternal(ObjectInput in) throws IOException { + path = new IgniteFsPath(); + + path.readExternal(in); + + blockSize = in.readInt(); + grpBlockSize = in.readLong(); + len = in.readLong(); + props = U.readStringMap(in); + accessTime = in.readLong(); + modificationTime = in.readLong(); + } + + /** {@inheritDoc} */ + @Override public int hashCode() { + return path.hashCode(); + } + + /** {@inheritDoc} */ + @Override public boolean equals(Object o) { + if (o == this) + return true; + + if (o == null || getClass() != o.getClass()) + return false; + + IgniteFsFileImpl that = (IgniteFsFileImpl)o; + + return path.equals(that.path); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(IgniteFsFileImpl.class, this); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java index fb8d9fc..0ac5d5d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/visor/node/VisorGgfsConfiguration.java @@ -128,7 +128,7 @@ public class VisorGgfsConfiguration implements Serializable { cfg.perNodeBatchSize(ggfs.getPerNodeBatchSize()); cfg.perNodeParallelBatchCount(ggfs.getPerNodeParallelBatchCount()); - GridGgfsFileSystem secFs = ggfs.getSecondaryFileSystem(); + IgniteFsFileSystem secFs = ggfs.getSecondaryFileSystem(); if (secFs != null) { Map<String, String> props = secFs.properties(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/config/ggfs-loopback.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-loopback.xml b/modules/core/src/test/config/ggfs-loopback.xml index 1721ae8..a6b911d 100644 --- a/modules/core/src/test/config/ggfs-loopback.xml +++ b/modules/core/src/test/config/ggfs-loopback.xml @@ -109,7 +109,7 @@ <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="0"/> <property name="affinityMapper"> - <bean class="org.gridgain.grid.ggfs.GridGgfsGroupDataBlocksKeyMapper"> + <bean class="org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper"> <!-- Haw many blocks in row will be stored on the same node. --> <constructor-arg value="512"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/config/ggfs-no-endpoint.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-no-endpoint.xml b/modules/core/src/test/config/ggfs-no-endpoint.xml index 741edbf..cd4fa1e 100644 --- a/modules/core/src/test/config/ggfs-no-endpoint.xml +++ b/modules/core/src/test/config/ggfs-no-endpoint.xml @@ -109,7 +109,7 @@ <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="0"/> <property name="affinityMapper"> - <bean class="org.gridgain.grid.ggfs.GridGgfsGroupDataBlocksKeyMapper"> + <bean class="org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper"> <!-- Haw many blocks in row will be stored on the same node. --> <constructor-arg value="512"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/config/ggfs-shmem.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/ggfs-shmem.xml b/modules/core/src/test/config/ggfs-shmem.xml index 271ace7..84d1f72 100644 --- a/modules/core/src/test/config/ggfs-shmem.xml +++ b/modules/core/src/test/config/ggfs-shmem.xml @@ -109,7 +109,7 @@ <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="0"/> <property name="affinityMapper"> - <bean class="org.gridgain.grid.ggfs.GridGgfsGroupDataBlocksKeyMapper"> + <bean class="org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper"> <!-- Haw many blocks in row will be stored on the same node. --> <constructor-arg value="512"/> </bean> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java index 202d168..9254490 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsEventsAbstractSelfTest.java @@ -58,7 +58,7 @@ public abstract class GridGgfsEventsAbstractSelfTest extends GridCommonAbstractT cacheCfg.setDistributionMode(PARTITIONED_ONLY); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); cacheCfg.setEvictionPolicy(null); - cacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); cacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java index d1c6ea9..94cfd3c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerAbstractSelfTest.java @@ -103,7 +103,7 @@ public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstract cfg.setCacheMode(PARTITIONED); cfg.setBackups(0); - cfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(GGFS_GROUP_SIZE)); + cfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GGFS_GROUP_SIZE)); cfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); cfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); cfg.setQueryIndexEnabled(false); @@ -125,13 +125,13 @@ public class GridGgfsFragmentizerAbstractSelfTest extends GridGgfsCommonAbstract IgniteUuid fileId = meta.fileId(path); if (fileId == null) - throw new GridGgfsFileNotFoundException("File not found: " + path); + throw new IgniteFsFileNotFoundException("File not found: " + path); GridGgfsFileInfo fileInfo = meta.info(fileId); do { if (fileInfo == null) - throw new GridGgfsFileNotFoundException("File not found: " + path); + throw new IgniteFsFileNotFoundException("File not found: " + path); if (fileInfo.fileMap().ranges().isEmpty()) return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java index d34f6de..b21ba0d 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java @@ -102,7 +102,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm evictPlc = new GridCacheGgfsPerBlockLruEvictionPolicy(); dataCacheCfg.setEvictionPolicy(evictPlc); - dataCacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); @@ -159,7 +159,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest extends GridGgfsComm dataCacheCfg.setCacheMode(PARTITIONED); dataCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); - dataCacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); dataCacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java index b099ed3..c7dcfb4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java @@ -168,7 +168,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes * @throws Exception If failed. */ protected Ignite startGridWithGgfs(String gridName, String ggfsName, GridGgfsMode mode, - @Nullable GridGgfsFileSystem secondaryFs, @Nullable String restCfg) throws Exception { + @Nullable IgniteFsFileSystem secondaryFs, @Nullable String restCfg) throws Exception { IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); ggfsCfg.setDataCacheName("dataCache"); @@ -187,7 +187,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes dataCacheCfg.setCacheMode(PARTITIONED); dataCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); - dataCacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(2)); + dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(2)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); dataCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -271,15 +271,15 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes public void testListFiles() throws Exception { create(ggfs, paths(DIR, SUBDIR, SUBSUBDIR), paths(FILE)); - Collection<GridGgfsFile> paths = ggfs.listFiles(SUBDIR); + Collection<IgniteFsFile> paths = ggfs.listFiles(SUBDIR); assert paths != null; assert paths.size() == 2; - Iterator<GridGgfsFile> iter = paths.iterator(); + Iterator<IgniteFsFile> iter = paths.iterator(); - GridGgfsFile path1 = iter.next(); - GridGgfsFile path2 = iter.next(); + IgniteFsFile path1 = iter.next(); + IgniteFsFile path2 = iter.next(); assert (SUBSUBDIR.equals(path1.path()) && FILE.equals(path2.path())) || (FILE.equals(path1.path()) && SUBSUBDIR.equals(path2.path())); @@ -291,7 +291,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes * @throws Exception If failed. */ public void testListFilesPathDoesNotExist() throws Exception { - Collection<GridGgfsFile> paths = null; + Collection<IgniteFsFile> paths = null; try { paths = ggfs.listFiles(SUBDIR); @@ -311,7 +311,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes public void testInfo() throws Exception { create(ggfs, paths(DIR), null); - GridGgfsFile info = ggfs.info(DIR); + IgniteFsFile info = ggfs.info(DIR); assert info != null; @@ -324,7 +324,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes * @throws Exception If failed. */ public void testInfoPathDoesNotExist() throws Exception { - GridGgfsFile info = null; + IgniteFsFile info = null; try { info = ggfs.info(DIR); @@ -864,7 +864,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes return null; } - }, GridGgfsFileNotFoundException.class, "File not found: " + FILE); + }, IgniteFsFileNotFoundException.class, "File not found: " + FILE); } /** @@ -2124,7 +2124,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes * @param files Files. * @throws Exception If failed. */ - public static void create(GridGgfsFileSystem ggfs, @Nullable IgniteFsPath[] dirs, @Nullable IgniteFsPath[] files) + public static void create(IgniteFsFileSystem ggfs, @Nullable IgniteFsPath[] dirs, @Nullable IgniteFsPath[] files) throws Exception { if (dirs != null) { for (IgniteFsPath dir : dirs) @@ -2150,7 +2150,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes * @throws IOException In case of IO exception. * @throws GridException In case of Grid exception. */ - protected static void createFile(GridGgfsFileSystem ggfs, IgniteFsPath file, boolean overwrite, + protected static void createFile(IgniteFsFileSystem ggfs, IgniteFsPath file, boolean overwrite, @Nullable byte[]... chunks) throws IOException, GridException { OutputStream os = null; @@ -2236,7 +2236,7 @@ public abstract class GridGgfsAbstractSelfTest extends GridGgfsCommonAbstractTes * @param ggfs GGFS. * @param file File. */ - public static void awaitFileClose(GridGgfsFileSystem ggfs, IgniteFsPath file) { + public static void awaitFileClose(IgniteFsFileSystem ggfs, IgniteFsPath file) { try { ggfs.update(file, Collections.singletonMap("prop", "val")); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java index 5add5ee..71945ee 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsCacheSelfTest.java @@ -72,7 +72,7 @@ public class GridGgfsCacheSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setBackups(0); - cacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); } cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java index e3e953a..605b1c0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManagerSelfTest.java @@ -111,7 +111,7 @@ public class GridGgfsDataManagerSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setBackups(0); - cacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(DATA_BLOCK_GROUP_CNT)); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(DATA_BLOCK_GROUP_CNT)); } cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java index 2cc67ec..57fadf9 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDualAbstractSelfTest.java @@ -74,15 +74,15 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT public void testListFilesPathMissing() throws Exception { create(ggfsSecondary, paths(DIR, SUBDIR, SUBSUBDIR), paths(FILE)); - Collection<GridGgfsFile> paths = ggfs.listFiles(SUBDIR); + Collection<IgniteFsFile> paths = ggfs.listFiles(SUBDIR); assert paths != null; assert paths.size() == 2; - Iterator<GridGgfsFile> iter = paths.iterator(); + Iterator<IgniteFsFile> iter = paths.iterator(); - GridGgfsFile path1 = iter.next(); - GridGgfsFile path2 = iter.next(); + IgniteFsFile path1 = iter.next(); + IgniteFsFile path2 = iter.next(); assert (SUBSUBDIR.equals(path1.path()) && FILE.equals(path2.path())) || (FILE.equals(path1.path()) && SUBSUBDIR.equals(path2.path())); @@ -97,7 +97,7 @@ public abstract class GridGgfsDualAbstractSelfTest extends GridGgfsAbstractSelfT create(ggfsSecondary, paths(DIR), null); create(ggfs, null, null); - GridGgfsFile info = ggfs.info(DIR); + IgniteFsFile info = ggfs.info(DIR); assert info != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsGroupDataBlockKeyMapperHashSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsGroupDataBlockKeyMapperHashSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsGroupDataBlockKeyMapperHashSelfTest.java index a2ea6ba..e1140b4 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsGroupDataBlockKeyMapperHashSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsGroupDataBlockKeyMapperHashSelfTest.java @@ -16,7 +16,7 @@ import org.gridgain.grid.util.typedef.internal.*; import java.util.concurrent.*; /** - * Tests for {@link GridGgfsGroupDataBlocksKeyMapper} hash. + * Tests for {@link org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper} hash. */ public class GridGgfsGroupDataBlockKeyMapperHashSelfTest extends GridGgfsCommonAbstractTest { /** @@ -46,7 +46,7 @@ public class GridGgfsGroupDataBlockKeyMapperHashSelfTest extends GridGgfsCommonA * @param partCnt Total partitions count. * @return Partition index. */ - private int partition(GridGgfsGroupDataBlocksKeyMapper mapper, IgniteUuid fileId, long blockId, int partCnt) { + private int partition(IgniteFsGroupDataBlocksKeyMapper mapper, IgniteUuid fileId, long blockId, int partCnt) { return U.safeAbs((Integer) mapper.affinityKey(new GridGgfsBlockKey(fileId, null, false, blockId)) % partCnt); } @@ -58,7 +58,7 @@ public class GridGgfsGroupDataBlockKeyMapperHashSelfTest extends GridGgfsCommonA public void checkDistribution(int grpSize, int partCnt) throws Exception { IgniteUuid fileId = IgniteUuid.randomUuid(); - GridGgfsGroupDataBlocksKeyMapper mapper = new GridGgfsGroupDataBlocksKeyMapper(grpSize); + IgniteFsGroupDataBlocksKeyMapper mapper = new IgniteFsGroupDataBlocksKeyMapper(grpSize); int lastPart = 0; @@ -98,7 +98,7 @@ public class GridGgfsGroupDataBlockKeyMapperHashSelfTest extends GridGgfsCommonA public void checkIntOverflowDistribution(int partCnt) throws Exception { IgniteUuid fileId = IgniteUuid.randomUuid(); - GridGgfsGroupDataBlocksKeyMapper mapper = new GridGgfsGroupDataBlocksKeyMapper(1); + IgniteFsGroupDataBlocksKeyMapper mapper = new IgniteFsGroupDataBlocksKeyMapper(1); int part1 = partition(mapper, fileId, Integer.MAX_VALUE - 1, partCnt); int part2 = partition(mapper, fileId, Integer.MAX_VALUE, partCnt); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java index b1ea25b..2d3fa9c 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java @@ -92,7 +92,7 @@ public class GridGgfsMetaManagerSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setDistributionMode(PARTITIONED_ONLY); cacheCfg.setBackups(0); - cacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); } cacheCfg.setQueryIndexEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java index db70a00..84a6736 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsMetricsSelfTest.java @@ -112,7 +112,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { dataCacheCfg.setCacheMode(PARTITIONED); dataCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); - dataCacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); dataCacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -164,7 +164,7 @@ public class GridGgfsMetricsSelfTest extends GridGgfsCommonAbstractTest { dataCacheCfg.setCacheMode(PARTITIONED); dataCacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); dataCacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); - dataCacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); dataCacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java index 55a7bb9..4a7d98b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModesSelfTest.java @@ -98,7 +98,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); cacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -152,7 +152,7 @@ public class GridGgfsModesSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); cacheCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java index 1f90684..e425bc8 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java @@ -127,7 +127,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setBackups(0); - cacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); } cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); @@ -198,7 +198,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { try (GridGgfsOutputStream os = ggfs.create(path, false)) { assert os != null; - GridGgfsFileImpl info = (GridGgfsFileImpl)ggfs.info(path); + IgniteFsFileImpl info = (IgniteFsFileImpl)ggfs.info(path); for (int i = 0; i < nodesCount(); i++) { GridGgfsFileInfo fileInfo = (GridGgfsFileInfo)grid(i).cachex(metaCacheName).peek(info.fileId()); @@ -300,7 +300,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { GridTestUtils.runMultiThreaded(new Callable<Object>() { @Override public Object call() throws Exception { for (int cur = cnt.incrementAndGet(); cur < max; cur = cnt.incrementAndGet()) { - GridGgfsFile info = ggfs.info(path(cur)); + IgniteFsFile info = ggfs.info(path(cur)); assertNotNull("Expects file exist: " + cur, info); assertTrue("Expects file is a directory: " + cur, info.isDirectory()); @@ -955,11 +955,11 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest { * @throws GridException If failed. */ private void assertListDir(String path, String... item) throws GridException { - Collection<GridGgfsFile> files = ggfs.listFiles(new IgniteFsPath(path)); + Collection<IgniteFsFile> files = ggfs.listFiles(new IgniteFsPath(path)); List<String> names = new ArrayList<>(item.length); - for (GridGgfsFile file : files) + for (IgniteFsFile file : files) names.add(file.path().name()); Arrays.sort(item); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java index de5f837..612a4a0 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorValidationSelfTest.java @@ -474,7 +474,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT } /** - * @param grpSize Group size to use in {@link GridGgfsGroupDataBlocksKeyMapper}. + * @param grpSize Group size to use in {@link org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper}. * @param cacheNames 2 Optional caches names. * @return 2 preconfigured data caches. */ @@ -490,7 +490,7 @@ public class GridGgfsProcessorValidationSelfTest extends GridGgfsCommonAbstractT GridCacheConfiguration dataCache = defaultCacheConfiguration(); dataCache.setName(cacheNames[i]); - dataCache.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(grpSize)); + dataCache.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(grpSize)); dataCache.setAtomicityMode(TRANSACTIONAL); dataCache.setQueryIndexEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java index cbc49e2..73a5556 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTest.java @@ -123,7 +123,7 @@ public abstract class GridGgfsServerManagerIpcEndpointRegistrationAbstractSelfTe cc.setName("partitioned"); cc.setCacheMode(GridCacheMode.PARTITIONED); - cc.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + cc.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); cc.setBackups(0); cc.setAtomicityMode(TRANSACTIONAL); cc.setQueryIndexEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java index c4a08eb..730338a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java @@ -125,7 +125,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest { dataCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); dataCfg.setPreloadMode(SYNC); - dataCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + dataCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); dataCfg.setQueryIndexEnabled(false); dataCfg.setAtomicityMode(TRANSACTIONAL); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java index 34a693d..e4f5145 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java @@ -129,7 +129,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setBackups(0); - cacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(CFG_GRP_SIZE)); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(CFG_GRP_SIZE)); } cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); @@ -200,7 +200,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { out.write(new byte[1024 * 1024]); } - GridGgfsFile info = fs.info(path); + IgniteFsFile info = fs.info(path); Collection<IgniteFsBlockLocation> affNodes = fs.affinity(path, 0, info.length()); @@ -246,7 +246,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { } // After this we should have first two block colocated with grid 0 and last block colocated with grid 1. - GridGgfsFileImpl fileImpl = (GridGgfsFileImpl)fs.info(path); + IgniteFsFileImpl fileImpl = (IgniteFsFileImpl)fs.info(path); GridCache<Object, Object> metaCache = grid(0).cachex(META_CACHE_NAME); @@ -364,7 +364,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest { info("Get stored file info: " + path); - GridGgfsFile desc = fs.info(path); + IgniteFsFile desc = fs.info(path); info("Validate stored file info: " + desc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java index 88adf6f..35f5c9a 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java @@ -106,7 +106,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest { dataCacheCfg.setAtomicityMode(TRANSACTIONAL); dataCacheCfg.setDistributionMode(PARTITIONED_ONLY); dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC); - dataCacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(1)); + dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(1)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java index 34e5345..fcbb563 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java @@ -58,7 +58,7 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe dataCacheCfg.setAtomicityMode(TRANSACTIONAL); dataCacheCfg.setDistributionMode(NEAR_PARTITIONED); dataCacheCfg.setWriteSynchronizationMode(FULL_SYNC); - dataCacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(128)); + dataCacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(128)); dataCacheCfg.setBackups(0); dataCacheCfg.setQueryIndexEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/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 8459461..09fd723 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 @@ -814,12 +814,12 @@ public class GridGgfsHadoopFileSystem extends FileSystem { return arr; } else { - Collection<GridGgfsFile> list = rmtClient.listFiles(path); + Collection<IgniteFsFile> list = rmtClient.listFiles(path); if (list == null) throw new FileNotFoundException("File " + f + " does not exist."); - List<GridGgfsFile> files = new ArrayList<>(list); + List<IgniteFsFile> files = new ArrayList<>(list); FileStatus[] arr = new FileStatus[files.size()]; @@ -952,7 +952,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem { return toPrimary(secondaryFs.getFileStatus(toSecondary(f))); } else { - GridGgfsFile info = rmtClient.info(convert(f)); + IgniteFsFile info = rmtClient.info(convert(f)); if (info == null) throw new FileNotFoundException("File not found: " + f); @@ -1185,7 +1185,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem { * @return Hadoop file status. */ @SuppressWarnings("deprecation") - private FileStatus convert(GridGgfsFile file) { + private FileStatus convert(IgniteFsFile file) { return new FileStatus(file.length(), file.isDirectory(), getDefaultReplication(), file.groupBlockSize(), file.modificationTime(), file.accessTime(), permission(file), file.property(PROP_USER_NAME, DFLT_USER_NAME), file.property(PROP_GROUP_NAME, "users"), @@ -1224,7 +1224,7 @@ public class GridGgfsHadoopFileSystem extends FileSystem { * @param file File info. * @return Hadoop permission. */ - private FsPermission permission(GridGgfsFile file) { + private FsPermission permission(IgniteFsFile file) { String perm = file.property(PROP_PERMISSION, null); if (perm == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/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 9d320b4..201adcf 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 @@ -691,12 +691,12 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos return arr; } else { - Collection<GridGgfsFile> list = rmtClient.listFiles(path); + Collection<IgniteFsFile> list = rmtClient.listFiles(path); if (list == null) throw new FileNotFoundException("File " + f + " does not exist."); - List<GridGgfsFile> files = new ArrayList<>(list); + List<IgniteFsFile> files = new ArrayList<>(list); FileStatus[] arr = new FileStatus[files.size()]; @@ -758,7 +758,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos if (mode(f) == PROXY) return toPrimary(secondaryFs.getFileStatus(toSecondary(f))); else { - GridGgfsFile info = rmtClient.info(convert(f)); + IgniteFsFile info = rmtClient.info(convert(f)); if (info == null) throw new FileNotFoundException("File not found: " + f); @@ -933,7 +933,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos * @param file GGFS file information. * @return Hadoop file status. */ - private FileStatus convert(GridGgfsFile file) { + private FileStatus convert(IgniteFsFile file) { return new FileStatus( file.length(), file.isDirectory(), @@ -978,7 +978,7 @@ public class GridGgfsHadoopFileSystem extends AbstractFileSystem implements Clos * @param file File info. * @return Hadoop permission. */ - private FsPermission permission(GridGgfsFile file) { + private FsPermission permission(IgniteFsFile file) { String perm = file.property(PROP_PERMISSION, null); if (perm == null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/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 558500c..3b35a95 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 @@ -44,7 +44,7 @@ public interface GridGgfsHadoop { * @return Future for info operation. * @throws GridException If failed. */ - public GridGgfsFile info(IgniteFsPath path) throws GridException, IOException; + public IgniteFsFile info(IgniteFsPath path) throws GridException, IOException; /** * Command to update file properties. @@ -54,7 +54,7 @@ public interface GridGgfsHadoop { * @return Future for update operation. * @throws GridException If failed. */ - public GridGgfsFile update(IgniteFsPath path, Map<String, String> props) throws GridException, IOException; + public IgniteFsFile update(IgniteFsPath path, Map<String, String> props) throws GridException, IOException; /** * Sets last access time and last modification time for a file. @@ -124,7 +124,7 @@ public interface GridGgfsHadoop { * @return Future for listFiles operation. * @throws GridException If failed. */ - public Collection<GridGgfsFile> listFiles(IgniteFsPath path) throws GridException, IOException; + public Collection<IgniteFsFile> listFiles(IgniteFsPath path) throws GridException, IOException; /** * Command to get directory listing. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/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 f07b430..c3e0dae 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 @@ -26,9 +26,9 @@ import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; /** - * Adapter to use any Hadoop file system {@link org.apache.hadoop.fs.FileSystem} as {@link GridGgfsFileSystem}. + * Adapter to use any Hadoop file system {@link org.apache.hadoop.fs.FileSystem} as {@link org.gridgain.grid.ggfs.IgniteFsFileSystem}. */ -public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, AutoCloseable { +public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem, AutoCloseable { /** Property name for path to Hadoop configuration. */ public static final String SECONDARY_FS_CONFIG_PATH = "SECONDARY_FS_CONFIG_PATH"; @@ -110,7 +110,7 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto */ public static IgniteFsException cast(String msg, IOException e) { if (e instanceof FileNotFoundException) - return new GridGgfsFileNotFoundException(e); + return new IgniteFsFileNotFoundException(e); else if (e instanceof ParentNotDirectoryException) return new GridGgfsParentNotDirectoryException(msg, e); else if (e instanceof PathIsNotEmptyDirectoryException) @@ -148,7 +148,7 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto } /** {@inheritDoc} */ - @Nullable @Override public GridGgfsFile update(IgniteFsPath path, Map<String, String> props) throws GridException { + @Nullable @Override public IgniteFsFile update(IgniteFsPath path, Map<String, String> props) throws GridException { GridGgfsHadoopFSProperties props0 = new GridGgfsHadoopFSProperties(props); try { @@ -217,7 +217,7 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto FileStatus[] statuses = fileSys.listStatus(convert(path)); if (statuses == null) - throw new GridGgfsFileNotFoundException("Failed to list files (path not found): " + path); + throw new IgniteFsFileNotFoundException("Failed to list files (path not found): " + path); Collection<IgniteFsPath> res = new ArrayList<>(statuses.length); @@ -227,7 +227,7 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto return res; } catch (FileNotFoundException ignored) { - throw new GridGgfsFileNotFoundException("Failed to list files (path not found): " + path); + throw new IgniteFsFileNotFoundException("Failed to list files (path not found): " + path); } catch (IOException e) { throw handleSecondaryFsError(e, "Failed to list statuses due to secondary file system exception: " + path); @@ -235,27 +235,27 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto } /** {@inheritDoc} */ - @Override public Collection<GridGgfsFile> listFiles(IgniteFsPath path) throws GridException { + @Override public Collection<IgniteFsFile> listFiles(IgniteFsPath path) throws GridException { try { FileStatus[] statuses = fileSys.listStatus(convert(path)); if (statuses == null) - throw new GridGgfsFileNotFoundException("Failed to list files (path not found): " + path); + throw new IgniteFsFileNotFoundException("Failed to list files (path not found): " + path); - Collection<GridGgfsFile> res = new ArrayList<>(statuses.length); + Collection<IgniteFsFile> res = new ArrayList<>(statuses.length); for (FileStatus status : statuses) { GridGgfsFileInfo fsInfo = status.isDirectory() ? new GridGgfsFileInfo(true, properties(status)) : new GridGgfsFileInfo((int)status.getBlockSize(), status.getLen(), null, null, false, properties(status)); - res.add(new GridGgfsFileImpl(new IgniteFsPath(path, status.getPath().getName()), fsInfo, 1)); + res.add(new IgniteFsFileImpl(new IgniteFsPath(path, status.getPath().getName()), fsInfo, 1)); } return res; } catch (FileNotFoundException ignored) { - throw new GridGgfsFileNotFoundException("Failed to list files (path not found): " + path); + throw new IgniteFsFileNotFoundException("Failed to list files (path not found): " + path); } catch (IOException e) { throw handleSecondaryFsError(e, "Failed to list statuses due to secondary file system exception: " + path); @@ -306,7 +306,7 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto } /** {@inheritDoc} */ - @Override public GridGgfsFile info(final IgniteFsPath path) throws GridException { + @Override public IgniteFsFile info(final IgniteFsPath path) throws GridException { try { final FileStatus status = fileSys.getFileStatus(convert(path)); @@ -315,7 +315,7 @@ public class GridGgfsHadoopFileSystemWrapper implements GridGgfsFileSystem, Auto final Map<String, String> props = properties(status); - return new GridGgfsFile() { + return new IgniteFsFile() { @Override public IgniteFsPath path() { return path; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/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 b09fc5c..e14f9b9 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 @@ -72,7 +72,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public GridGgfsFile info(IgniteFsPath path) throws GridException { + @Override public IgniteFsFile info(IgniteFsPath path) throws GridException { try { return ggfs.info(path); } @@ -82,7 +82,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public GridGgfsFile update(IgniteFsPath path, Map<String, String> props) throws GridException { + @Override public IgniteFsFile update(IgniteFsPath path, Map<String, String> props) throws GridException { try { return ggfs.update(path, props); } @@ -148,7 +148,7 @@ public class GridGgfsHadoopInProc implements GridGgfsHadoopEx { } /** {@inheritDoc} */ - @Override public Collection<GridGgfsFile> listFiles(IgniteFsPath path) throws GridException { + @Override public Collection<IgniteFsFile> listFiles(IgniteFsPath path) throws GridException { try { return ggfs.listFiles(path); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/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 194a217..c32616c 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 @@ -34,7 +34,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, Long> LONG_RES = createClosure(); /** Expected result is {@code GridGgfsFile}. */ - private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, GridGgfsFile> FILE_RES = createClosure(); + private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, IgniteFsFile> FILE_RES = createClosure(); /** Expected result is {@code GridGgfsHandshakeResponse} */ private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, @@ -50,7 +50,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp /** Expected result is {@code GridGgfsFile}. */ private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, - Collection<GridGgfsFile>> FILE_COL_RES = createClosure(); + Collection<IgniteFsFile>> FILE_COL_RES = createClosure(); /** Expected result is {@code GridGgfsFile}. */ private static final GridPlainClosure<GridPlainFuture<GridGgfsMessage>, @@ -157,7 +157,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp } /** {@inheritDoc} */ - @Override public GridGgfsFile info(IgniteFsPath path) throws GridException { + @Override public IgniteFsFile info(IgniteFsPath path) throws GridException { final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest(); msg.command(INFO); @@ -167,7 +167,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp } /** {@inheritDoc} */ - @Override public GridGgfsFile update(IgniteFsPath path, Map<String, String> props) throws GridException { + @Override public IgniteFsFile update(IgniteFsPath path, Map<String, String> props) throws GridException { final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest(); msg.command(UPDATE); @@ -246,7 +246,7 @@ public class GridGgfsHadoopOutProc implements GridGgfsHadoopEx, GridGgfsHadoopIp } /** {@inheritDoc} */ - @Override public Collection<GridGgfsFile> listFiles(IgniteFsPath path) throws GridException { + @Override public Collection<IgniteFsFile> listFiles(IgniteFsPath path) throws GridException { final GridGgfsPathControlRequest msg = new GridGgfsPathControlRequest(); msg.command(LIST_FILES); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/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 f54dbfb..9d52a99 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 @@ -102,7 +102,7 @@ public class GridGgfsHadoopUtils { // First check for any nested IOException; if exists - re-throw it. if (e.hasCause(IOException.class)) return e.getCause(IOException.class); - else if (e instanceof GridGgfsFileNotFoundException) + else if (e instanceof IgniteFsFileNotFoundException) return new FileNotFoundException(path); // TODO: Or PathNotFoundException? else if (e instanceof GridGgfsParentNotDirectoryException) return new ParentNotDirectoryException(path); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/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 4fff807..cd34dd2 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 @@ -88,9 +88,9 @@ public class GridGgfsHadoopWrapper implements GridGgfsHadoop { } /** {@inheritDoc} */ - @Override public GridGgfsFile info(final IgniteFsPath path) throws IOException { - return withReconnectHandling(new FileSystemClosure<GridGgfsFile>() { - @Override public GridGgfsFile apply(GridGgfsHadoopEx hadoop, GridGgfsHandshakeResponse hndResp) + @Override public IgniteFsFile info(final IgniteFsPath path) throws IOException { + return withReconnectHandling(new FileSystemClosure<IgniteFsFile>() { + @Override public IgniteFsFile apply(GridGgfsHadoopEx hadoop, GridGgfsHandshakeResponse hndResp) throws GridException, IOException { return hadoop.info(path); } @@ -98,9 +98,9 @@ public class GridGgfsHadoopWrapper implements GridGgfsHadoop { } /** {@inheritDoc} */ - @Override public GridGgfsFile update(final IgniteFsPath path, final Map<String, String> props) throws IOException { - return withReconnectHandling(new FileSystemClosure<GridGgfsFile>() { - @Override public GridGgfsFile apply(GridGgfsHadoopEx hadoop, GridGgfsHandshakeResponse hndResp) + @Override public IgniteFsFile update(final IgniteFsPath path, final Map<String, String> props) throws IOException { + return withReconnectHandling(new FileSystemClosure<IgniteFsFile>() { + @Override public IgniteFsFile apply(GridGgfsHadoopEx hadoop, GridGgfsHandshakeResponse hndResp) throws GridException, IOException { return hadoop.update(path, props); } @@ -170,9 +170,9 @@ public class GridGgfsHadoopWrapper implements GridGgfsHadoop { } /** {@inheritDoc} */ - @Override public Collection<GridGgfsFile> listFiles(final IgniteFsPath path) throws IOException { - return withReconnectHandling(new FileSystemClosure<Collection<GridGgfsFile>>() { - @Override public Collection<GridGgfsFile> apply(GridGgfsHadoopEx hadoop, + @Override public Collection<IgniteFsFile> listFiles(final IgniteFsPath path) throws IOException { + return withReconnectHandling(new FileSystemClosure<Collection<IgniteFsFile>>() { + @Override public Collection<IgniteFsFile> apply(GridGgfsHadoopEx hadoop, GridGgfsHandshakeResponse hndResp) throws GridException, IOException { return hadoop.listFiles(path); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/modules/hadoop/src/test/java/org/gridgain/client/hadoop/GridHadoopClientProtocolSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/client/hadoop/GridHadoopClientProtocolSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/client/hadoop/GridHadoopClientProtocolSelfTest.java index dda947f..49c4ad9 100644 --- a/modules/hadoop/src/test/java/org/gridgain/client/hadoop/GridHadoopClientProtocolSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/client/hadoop/GridHadoopClientProtocolSelfTest.java @@ -393,7 +393,7 @@ public class GridHadoopClientProtocolSelfTest extends GridHadoopAbstractSelfTest */ @SuppressWarnings("ConstantConditions") private static void dumpGgfs(IgniteFs ggfs, IgniteFsPath path) throws Exception { - GridGgfsFile file = ggfs.info(path); + IgniteFsFile file = ggfs.info(path); assert file != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ba3dc44/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 06c0a07..5e70bd3 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 @@ -152,7 +152,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(GRP_SIZE)); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); cacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -222,7 +222,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf cacheCfg.setCacheMode(PARTITIONED); cacheCfg.setDistributionMode(GridCacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); - cacheCfg.setAffinityMapper(new GridGgfsGroupDataBlocksKeyMapper(GRP_SIZE)); + cacheCfg.setAffinityMapper(new IgniteFsGroupDataBlocksKeyMapper(GRP_SIZE)); cacheCfg.setBackups(0); cacheCfg.setQueryIndexEnabled(false); cacheCfg.setAtomicityMode(TRANSACTIONAL); @@ -1295,7 +1295,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf IgniteFsPath filePath = new IgniteFsPath("/someFile"); - GridGgfsFile fileInfo = igniteFs.info(filePath); + IgniteFsFile fileInfo = igniteFs.info(filePath); Collection<IgniteFsBlockLocation> locations = igniteFs.affinity(filePath, 0, fileInfo.length());
