http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInputStream.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInputStream.java deleted file mode 100644 index 8fb669e..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInputStream.java +++ /dev/null @@ -1,72 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -import java.io.*; - -/** - * {@code GGFS} input stream to read data from the file system. - * It provides several additional methods for asynchronous access. - */ -public abstract class IgniteFsInputStream extends InputStream implements IgniteFsReader { - /** - * Gets file length during file open. - * - * @return File length. - */ - public abstract long length(); - - /** - * Seek to the specified position. - * - * @param pos Position to seek to. - * @throws IOException In case of IO exception. - */ - public abstract void seek(long pos) throws IOException; - - /** - * Get the current position in the input stream. - * - * @return The current position in the input stream. - * @throws IOException In case of IO exception. - */ - public abstract long position() throws IOException; - - /** - * Read bytes from the given position in the stream to the given buffer. - * Continues to read until passed buffer becomes filled. - * - * @param pos Position in the input stream to seek. - * @param buf Buffer into which data is read. - * @throws IOException In case of IO exception. - */ - public abstract void readFully(long pos, byte[] buf) throws IOException; - - /** - * - * @param pos Position in the input stream to seek. - * @param buf Buffer into which data is read. - * @param off Offset in the buffer from which stream data should be written. - * @param len The number of bytes to read. - * @throws IOException In case of IO exception. - */ - public abstract void readFully(long pos, byte[] buf, int off, int len) throws IOException; - - /** - * - * @param pos Position in the input stream to seek. - * @param buf Buffer into which data is read. - * @param off Offset in the buffer from which stream data should be written. - * @param len The number of bytes to read. - * @return Total number of bytes read into the buffer, or -1 if there is no more data (EOF). - * @throws IOException In case of IO exception. - */ - @Override public abstract int read(long pos, byte[] buf, int off, int len) throws IOException; -}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInvalidHdfsVersionException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInvalidHdfsVersionException.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInvalidHdfsVersionException.java deleted file mode 100644 index 7004311..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInvalidHdfsVersionException.java +++ /dev/null @@ -1,34 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -/** - * Exception thrown when GridGain detects that remote HDFS version differs from version of HDFS libraries - * in GridGain classpath. - */ -public class IgniteFsInvalidHdfsVersionException extends IgniteFsException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * @param msg Error message. - */ - public IgniteFsInvalidHdfsVersionException(String msg) { - super(msg); - } - - /** - * @param msg Error message. - * @param cause Error cause. - */ - public IgniteFsInvalidHdfsVersionException(String msg, Throwable cause) { - super(msg, cause); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInvalidPathException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInvalidPathException.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInvalidPathException.java deleted file mode 100644 index 0e7fe00..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsInvalidPathException.java +++ /dev/null @@ -1,49 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -import org.jetbrains.annotations.*; - -/** - * {@code GGFS} exception indicating that operation target is invalid - * (e.g. not a file while expecting to be a file). - */ -public class IgniteFsInvalidPathException extends IgniteFsException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * Creates exception with given error message. - * - * @param msg Error message. - */ - public IgniteFsInvalidPathException(String msg) { - super(msg); - } - - /** - * Creates exception with given exception cause. - * - * @param cause Exception cause. - */ - public IgniteFsInvalidPathException(Throwable cause) { - super(cause); - } - - /** - * Creates exception with given error message and exception cause. - * - * @param msg Error message. - * @param cause Error cause. - */ - public IgniteFsInvalidPathException(String msg, @Nullable Throwable cause) { - super(msg, cause); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsMetrics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsMetrics.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsMetrics.java deleted file mode 100644 index d4f7fc6..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsMetrics.java +++ /dev/null @@ -1,151 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -/** - * {@code GGFS} metrics snapshot for the file system. Note, that some metrics are global and - * some are local (i.e. per each node). - */ -public interface IgniteFsMetrics { - /** - * Gets local used space in bytes. This is the sum of all file chunks stored on local node. - * <p> - * This is a local metric. - * - * @return Node used space in bytes. - */ - public long localSpaceSize(); - - /** - * Gets maximum amount of data that can be stored on local node. This metrics is either - * equal to {@link IgniteFsConfiguration#getMaxSpaceSize()}, or, if it is {@code 0}, equal to - * {@code 80%} of maximum heap size allocated for JVM. - * - * @return Maximum GGFS local space size. - */ - public long maxSpaceSize(); - - /** - * Get used space in bytes used in the secondary file system. - * <p> - * This is a global metric. - * - * @return Used space in the secondary file system or {@code 0} in case no secondary file system is configured. - */ - public long secondarySpaceSize(); - - /** - * Gets number of directories created in file system. - * <p> - * This is a global metric. - * - * @return Number of directories. - */ - public int directoriesCount(); - - /** - * Gets number of files stored in file system. - * <p> - * This is a global metric. - * - * @return Number of files. - */ - public int filesCount(); - - /** - * Gets number of files that are currently opened for reading. - * <p> - * This is a local metric. - * - * @return Number of opened files. - */ - public int filesOpenedForRead(); - - /** - * Gets number of files that are currently opened for writing. - * <p> - * This is a local metric. - * - * @return Number of opened files. - */ - public int filesOpenedForWrite(); - - /** - * Gets total blocks read, local and remote. - * <p> - * This is a local metric. - * - * @return Total blocks read. - */ - public long blocksReadTotal(); - - /** - * Gets total remote blocks read. - * <p> - * This is a local metric. - * - * @return Total blocks remote read. - */ - public long blocksReadRemote(); - - /** - * Gets total blocks written, local and remote. - * <p> - * This is a local metric. - * - * @return Total blocks written. - */ - public long blocksWrittenTotal(); - - /** - * Gets total remote blocks written. - * <p> - * This is a local metric. - * - * @return Total blocks written. - */ - public long blocksWrittenRemote(); - - /** - * Gets total bytes read. - * <p> - * This is a local metric. - * - * @return Total bytes read. - */ - public long bytesRead(); - - /** - * Gets total bytes read time. - * <p> - * This is a local metric. - * - * @return Total bytes read time. - */ - public long bytesReadTime(); - - /** - * Gets total bytes written. - * <p> - * This is a local metric. - * - * @return Total bytes written. - */ - public long bytesWritten(); - - /** - * Gets total bytes write time. - * <p> - * This is a local metric. - * - * @return Total bytes write time. - */ - public long bytesWriteTime(); -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsMode.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsMode.java deleted file mode 100644 index 67f5eef..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsMode.java +++ /dev/null @@ -1,72 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -import org.jetbrains.annotations.*; - -/** - * {@code GGFS} mode defining interactions with underlying secondary Hadoop file system. - * Secondary Hadoop file system is provided for pass-through, write-through, and - * read-through purposes. - * <p> - * This mode is configured via {@link IgniteFsConfiguration#getDefaultMode()} - * configuration property. - */ -public enum IgniteFsMode { - /** - * In this mode GGFS will not delegate to secondary Hadoop file system and will - * cache all the files in memory only. - */ - PRIMARY, - - /** - * In this mode GGFS will not cache any files in memory and will only pass them - * through to secondary Hadoop file system. If this mode is enabled, then - * secondary Hadoop file system must be configured. - * - * @see IgniteFsConfiguration#getSecondaryHadoopFileSystemUri() - */ - PROXY, - - /** - * In this mode {@code GGFS} will cache files locally and also <i>synchronously</i> - * write them through to secondary Hadoop file system. - * <p> - * If secondary Hadoop file system is not configured, then this mode behaves like - * {@link #PRIMARY} mode. - * - * @see IgniteFsConfiguration#getSecondaryHadoopFileSystemUri() - */ - DUAL_SYNC, - - /** - * In this mode {@code GGFS} will cache files locally and also <i>asynchronously</i> - * write them through to secondary Hadoop file system. - * <p> - * If secondary Hadoop file system is not configured, then this mode behaves like - * {@link #PRIMARY} mode. - * - * @see IgniteFsConfiguration#getSecondaryHadoopFileSystemUri() - */ - DUAL_ASYNC; - - /** Enumerated values. */ - private static final IgniteFsMode[] VALS = values(); - - /** - * Efficiently gets enumerated value from its ordinal. - * - * @param ord Ordinal value. - * @return Enumerated value or {@code null} if ordinal out of range. - */ - @Nullable public static IgniteFsMode fromOrdinal(int ord) { - return ord >= 0 && ord < VALS.length ? VALS[ord] : null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsOutOfSpaceException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsOutOfSpaceException.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsOutOfSpaceException.java deleted file mode 100644 index cdfee59..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsOutOfSpaceException.java +++ /dev/null @@ -1,50 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -import org.jetbrains.annotations.*; - -/** - * {@code GGFS} exception that is thrown when it detected out-of-space condition. - * It is thrown when number of writes written to a {@code GGFS} data nodes exceeds - * its maximum value (that is configured per-node). - */ -public class IgniteFsOutOfSpaceException extends IgniteFsException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * Creates exception with given error message. - * - * @param msg Error message. - */ - public IgniteFsOutOfSpaceException(String msg) { - super(msg); - } - - /** - * Creates an instance of exception with given exception cause. - * - * @param cause Exception cause. - */ - public IgniteFsOutOfSpaceException(Throwable cause) { - super(cause); - } - - /** - * Creates an instance of GGFS exception with given error message and given exception cause. - * - * @param msg Error message. - * @param cause Exception cause. - */ - public IgniteFsOutOfSpaceException(String msg, @Nullable Throwable cause) { - super(msg, cause); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsOutputStream.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsOutputStream.java deleted file mode 100644 index 76c6b1f..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsOutputStream.java +++ /dev/null @@ -1,27 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -import java.io.*; - -/** - * {@code GGFS} output stream to write data into the file system. - */ -public abstract class IgniteFsOutputStream extends OutputStream { - /** - * Transfers specified amount of bytes from data input to this output stream. - * This method is optimized to avoid unnecessary temporal buffer creation and byte array copy. - * - * @param in Data input to copy bytes from. - * @param len Data length to copy. - * @throws IOException If write failed, read from input failed or there is no enough data in data input. - */ - public abstract void transferFrom(DataInput in, int len) throws IOException; -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsParentNotDirectoryException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsParentNotDirectoryException.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsParentNotDirectoryException.java deleted file mode 100644 index 9cc46b7..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsParentNotDirectoryException.java +++ /dev/null @@ -1,42 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -import org.jetbrains.annotations.*; - -/** - * Exception thrown when parent supposed to be a directory is a file. - */ -public class IgniteFsParentNotDirectoryException extends IgniteFsInvalidPathException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * @param msg Error message. - */ - public IgniteFsParentNotDirectoryException(String msg) { - super(msg); - } - - /** - * @param cause Exception cause. - */ - public IgniteFsParentNotDirectoryException(Throwable cause) { - super(cause); - } - - /** - * @param msg Error message. - * @param cause Exception cause. - */ - public IgniteFsParentNotDirectoryException(String msg, @Nullable Throwable cause) { - super(msg, cause); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPath.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPath.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPath.java deleted file mode 100644 index aa321b3..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPath.java +++ /dev/null @@ -1,254 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -import org.gridgain.grid.util.io.*; -import org.gridgain.grid.util.typedef.*; -import org.gridgain.grid.util.typedef.internal.*; -import org.jetbrains.annotations.*; - -import java.io.*; -import java.net.*; -import java.util.*; - -/** - * {@code GGFS} path to file in the file system. For example, to get information about - * a file you would use the following code: - * <pre name="code" class="java"> - * GridGgfsPath dirPath = new GridGgfsPath("/my/working/dir"); - * GridGgfsPath filePath = new GridGgfsPath(dirPath, "file.txt"); - * - * // Get metadata about file. - * GridGgfsFile file = ggfs.info(filePath); - * </pre> - */ -public final class IgniteFsPath implements Comparable<IgniteFsPath>, Externalizable { - /** */ - private static final long serialVersionUID = 0L; - - /** The directory separator character. */ - private static final char SLASH_CHAR = '/'; - - /** The directory separator. */ - private static final String SLASH = "/"; - - /** URI representing this path. Should never change after object creation or de-serialization. */ - private String path; - - /** - * Constructs default root path. - */ - public IgniteFsPath() { - path = SLASH; - } - - /** - * Constructs a path from an URI - * - * @param uri URI to create path from. - */ - public IgniteFsPath(URI uri) { - A.notNull(uri, "uri"); - - path = normalizePath(uri.getPath()); - } - - /** - * Constructs a path from the URI string. - * - * @param path URI string. - */ - public IgniteFsPath(String path) { - A.ensure(!F.isEmpty(path), "'path' is null or empty"); - - this.path = normalizePath(path); - } - - /** - * Resolve a child path against a parent path. - * - * @param parentPath Parent path. - * @param childPath Child path. - */ - public IgniteFsPath(IgniteFsPath parentPath, String childPath) { - A.notNull(parentPath, "parentPath"); - - String path = GridFilenameUtils.concat(parentPath.path, childPath); - - if (F.isEmpty(path)) - throw new IllegalArgumentException("Failed to parse path" + - " [parent=" + parentPath + ", childPath=" + childPath + ']'); - - this.path = normalizePath(path); - } - - /** - * Initialize path with (1) not-null, (2) normalized, (3) absolute and (4) unix-format path component. - * - * @param path Path. - * @return Normalized path. - */ - private static String normalizePath(String path) { - assert path != null; - - String normalizedPath = GridFilenameUtils.normalizeNoEndSeparator(path, true); - - if (F.isEmpty(normalizedPath)) - throw new IllegalArgumentException("Failed to normalize path: " + path); - - if (!SLASH.equals(GridFilenameUtils.getPrefix(normalizedPath))) - throw new IllegalArgumentException("Path should be absolute: " + path); - - assert !normalizedPath.isEmpty() : "Expects normalized path is not empty."; - assert normalizedPath.length() == 1 || !normalizedPath.endsWith(SLASH) : - "Expects normalized path is root or don't ends with '/' symbol."; - - return normalizedPath; - } - - /** - * Returns the final component of this path. - * - * @return The final component of this path. - */ - public String name() { - return GridFilenameUtils.getName(path); - } - - /** - * Returns a root for this path. - * - * @return Root for this path. - */ - public IgniteFsPath root() { - return new IgniteFsPath(); - } - - /** - * Split full path on components. - * - * @return Path components. - */ - public List<String> components() { - String path = this.path; - - assert path.length() >= 1 : "Path expected to be absolute: " + path; - - // Path is short-living object, so we don't need to cache component's resolution result. - return path.length() == 1 ? Collections.<String>emptyList() : Arrays.asList(path.substring(1).split(SLASH)); - } - - /** - * Returns the parent of a path or {@code null} if at root. - * - * @return The parent of a path or {@code null} if at root. - */ - @Nullable public IgniteFsPath parent() { - String path = this.path; - - if (path.length() == 1) - return null; // Current path is root. - - path = GridFilenameUtils.getFullPathNoEndSeparator(path); - - return new IgniteFsPath(path); - } - - /** - * Adds a suffix to the final name in the path. - * - * @param suffix Suffix. - * @return Path with suffix. - */ - public IgniteFsPath suffix(String suffix) { - A.ensure(!F.isEmpty(suffix), "'suffix' is null or empty."); - A.ensure(!suffix.contains(SLASH), "'suffix' contains file's separator '" + SLASH + "'"); - - return new IgniteFsPath(path + suffix); - } - - /** - * Return the number of elements in this path. - * - * @return The number of elements in this path, zero depth means root directory. - */ - public int depth() { - final String path = this.path; - final int size = path.length(); - - assert size >= 1 && path.charAt(0) == SLASH_CHAR : "Expects absolute path: " + path; - - if (size == 1) - return 0; - - int depth = 1; - - // Ignore the first character. - for (int i = 1; i < size; i++) - if (path.charAt(i) == SLASH_CHAR) - depth++; - - return depth; - } - - /** - * Checks whether this path is a sub-directory of argument. - * - * @param path Path to check. - * @return {@code True} if argument is same or a sub-directory of this object. - */ - public boolean isSubDirectoryOf(IgniteFsPath path) { - A.notNull(path, "path"); - - return this.path.startsWith(path.path.endsWith(SLASH) ? path.path : path.path + SLASH); - } - - /** - * Checks if paths are identical. - * - * @param path Path to check. - * @return {@code True} if paths are identical. - */ - public boolean isSame(IgniteFsPath path) { - A.notNull(path, "path"); - - return this == path || this.path.equals(path.path); - } - - /** {@inheritDoc} */ - @Override public int compareTo(IgniteFsPath o) { - return path.compareTo(o.path); - } - - /** {@inheritDoc} */ - @Override public void writeExternal(ObjectOutput out) throws IOException { - U.writeString(out, path); - } - - /** {@inheritDoc} */ - @Override public void readExternal(ObjectInput in) throws IOException { - path = U.readString(in); - } - - /** {@inheritDoc} */ - @Override public int hashCode() { - return path.hashCode(); - } - - /** {@inheritDoc} */ - @Override public boolean equals(Object o) { - return o == this || o != null && getClass() == o.getClass() && path.equals(((IgniteFsPath)o).path); - } - - /** {@inheritDoc} */ - @Override public String toString() { - return path; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPathAlreadyExistsException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPathAlreadyExistsException.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPathAlreadyExistsException.java deleted file mode 100644 index 4126657..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPathAlreadyExistsException.java +++ /dev/null @@ -1,42 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -import org.jetbrains.annotations.*; - -/** - * Exception thrown when target path supposed to be created already exists. - */ -public class IgniteFsPathAlreadyExistsException extends IgniteFsInvalidPathException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * @param msg Error message. - */ - public IgniteFsPathAlreadyExistsException(String msg) { - super(msg); - } - - /** - * @param cause Exception cause. - */ - public IgniteFsPathAlreadyExistsException(Throwable cause) { - super(cause); - } - - /** - * @param msg Error message. - * @param cause Exception cause. - */ - public IgniteFsPathAlreadyExistsException(String msg, @Nullable Throwable cause) { - super(msg, cause); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPathSummary.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPathSummary.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPathSummary.java deleted file mode 100644 index 706a3cb..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsPathSummary.java +++ /dev/null @@ -1,130 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -import org.gridgain.grid.util.typedef.internal.*; - -import java.io.*; - -/** - * Path summary: total files count, total directories count, total length. - */ -public class IgniteFsPathSummary implements Externalizable { - /** */ - private static final long serialVersionUID = 0L; - - /** Path. */ - private IgniteFsPath path; - - /** File count. */ - private int filesCnt; - - /** Directories count. */ - private int dirCnt; - - /** Length consumed. */ - private long totalLen; - - /** - * Empty constructor required by {@link Externalizable}. - */ - public IgniteFsPathSummary() { - // No-op. - } - - /** - * Construct empty path summary. - * - * @param path Path. - */ - public IgniteFsPathSummary(IgniteFsPath path) { - this.path = path; - } - - /** - * @return Files count. - */ - public int filesCount() { - return filesCnt; - } - - /** - * @param filesCnt Files count. - */ - public void filesCount(int filesCnt) { - this.filesCnt = filesCnt; - } - - /** - * @return Directories count. - */ - public int directoriesCount() { - return dirCnt; - } - - /** - * @param dirCnt Directories count. - */ - public void directoriesCount(int dirCnt) { - this.dirCnt = dirCnt; - } - - /** - * @return Total length. - */ - public long totalLength() { - return totalLen; - } - - /** - * @param totalLen Total length. - */ - public void totalLength(long totalLen) { - this.totalLen = totalLen; - } - - /** - * @return Path for which summary is obtained. - */ - public IgniteFsPath path() { - return path; - } - - /** - * @param path Path for which summary is obtained. - */ - public void path(IgniteFsPath path) { - this.path = path; - } - - /** {@inheritDoc} */ - @Override public void writeExternal(ObjectOutput out) throws IOException { - out.writeInt(filesCnt); - out.writeInt(dirCnt); - out.writeLong(totalLen); - - path.writeExternal(out); - } - - /** {@inheritDoc} */ - @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - filesCnt = in.readInt(); - dirCnt = in.readInt(); - totalLen = in.readLong(); - - path = new IgniteFsPath(); - path.readExternal(in); - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(IgniteFsPathSummary.class, this); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsReader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsReader.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsReader.java deleted file mode 100644 index dd0635c..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/IgniteFsReader.java +++ /dev/null @@ -1,30 +0,0 @@ -/* @java.file.header */ - -/* _________ _____ __________________ _____ - * __ ____/___________(_)______ /__ ____/______ ____(_)_______ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ - */ - -package org.gridgain.grid.ggfs; - -import java.io.*; - -/** - * The simplest data input interface to read from secondary file system in dual modes. - */ -public interface IgniteFsReader extends Closeable { - /** - * Read up to the specified number of bytes, from a given position within a file, and return the number of bytes - * read. - * - * @param pos Position in the input stream to seek. - * @param buf Buffer into which data is read. - * @param off Offset in the buffer from which stream data should be written. - * @param len The number of bytes to read. - * @return Total number of bytes read into the buffer, or -1 if there is no more data (EOF). - * @throws IOException In case of any exception. - */ - public int read(long pos, byte[] buf, int off, int len) throws IOException; -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsFileRange.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsFileRange.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsFileRange.java index 1e1f27a..57ca491 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsFileRange.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsFileRange.java @@ -9,7 +9,7 @@ package org.gridgain.grid.ggfs.mapreduce; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.internal.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsInputStreamJobAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsInputStreamJobAdapter.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsInputStreamJobAdapter.java index 28c0890..0432046 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsInputStreamJobAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsInputStreamJobAdapter.java @@ -10,14 +10,14 @@ package org.gridgain.grid.ggfs.mapreduce; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.*; import java.io.*; /** - * Convenient {@link IgniteFsJob} adapter. It limits data returned from {@link org.gridgain.grid.ggfs.IgniteFsInputStream} to bytes within + * Convenient {@link IgniteFsJob} adapter. It limits data returned from {@link org.apache.ignite.fs.IgniteFsInputStream} to bytes within * the {@link IgniteFsFileRange} assigned to the job. * <p> * Under the covers it simply puts job's {@code GridGgfsInputStream} position to range start and wraps in into http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJob.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJob.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJob.java index cfd69a9..5bcf6b3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJob.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsJob.java @@ -10,8 +10,8 @@ package org.gridgain.grid.ggfs.mapreduce; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import java.io.*; @@ -19,8 +19,8 @@ import java.io.*; * Defines executable unit for {@link IgniteFsTask}. Before this job is executed, it is assigned one of the * ranges provided by the {@link IgniteFsRecordResolver} passed to one of the {@code GridGgfs.execute(...)} methods. * <p> - * {@link #execute(org.apache.ignite.IgniteFs, IgniteFsFileRange, org.gridgain.grid.ggfs.IgniteFsInputStream)} method is given {@link IgniteFsFileRange} this - * job is expected to operate on, and already opened {@link org.gridgain.grid.ggfs.IgniteFsInputStream} for the file this range belongs to. + * {@link #execute(org.apache.ignite.IgniteFs, IgniteFsFileRange, org.apache.ignite.fs.IgniteFsInputStream)} method is given {@link IgniteFsFileRange} this + * job is expected to operate on, and already opened {@link org.apache.ignite.fs.IgniteFsInputStream} for the file this range belongs to. * <p> * Note that provided input stream has position already adjusted to range start. However, it will not * automatically stop on range end. This is done to provide capability in some cases to look beyond http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsRangeInputStream.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsRangeInputStream.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsRangeInputStream.java index 8687798..6c123eb 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsRangeInputStream.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsRangeInputStream.java @@ -9,14 +9,14 @@ package org.gridgain.grid.ggfs.mapreduce; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; import java.io.*; /** - * Decorator for regular {@link org.gridgain.grid.ggfs.IgniteFsInputStream} which streams only data within the given range. + * Decorator for regular {@link org.apache.ignite.fs.IgniteFsInputStream} which streams only data within the given range. * This stream is used for {@link IgniteFsInputStreamJobAdapter} convenience adapter to create * jobs which will be working only with the assigned range. You can also use it explicitly when * working with {@link IgniteFsJob} directly. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsRecordResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsRecordResolver.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsRecordResolver.java index e9d254f..697f575 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsRecordResolver.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsRecordResolver.java @@ -10,8 +10,8 @@ package org.gridgain.grid.ggfs.mapreduce; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsTask.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsTask.java index edfdf03..bfde75c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsTask.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsTask.java @@ -12,9 +12,9 @@ package org.gridgain.grid.ggfs.mapreduce; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; +import org.apache.ignite.fs.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.gridgain.grid.util.typedef.internal.*; @@ -26,11 +26,11 @@ import java.util.*; * GGFS task which can be executed on the grid using one of {@code GridGgfs.execute()} methods. Essentially GGFS task * is regular {@link org.apache.ignite.compute.ComputeTask} with different map logic. Instead of implementing * {@link org.apache.ignite.compute.ComputeTask#map(List, Object)} method to split task into jobs, you must implement - * {@link IgniteFsTask#createJob(org.gridgain.grid.ggfs.IgniteFsPath, IgniteFsFileRange, IgniteFsTaskArgs)} method. + * {@link IgniteFsTask#createJob(org.apache.ignite.fs.IgniteFsPath, IgniteFsFileRange, IgniteFsTaskArgs)} method. * <p> * Each file participating in GGFS task is split into {@link IgniteFsFileRange}s first. Normally range is a number of * consequent bytes located on a single node (see {@code GridGgfsGroupDataBlocksKeyMapper}). In case maximum range size - * is provided (either through {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getMaximumTaskRangeLength()} or {@code GridGgfs.execute()} + * is provided (either through {@link org.apache.ignite.fs.IgniteFsConfiguration#getMaximumTaskRangeLength()} or {@code GridGgfs.execute()} * argument), then ranges could be further divided into smaller chunks. * <p> * Once file is split into ranges, each range is passed to {@code GridGgfsTask.createJob()} method in order to create a http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsTaskArgs.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsTaskArgs.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsTaskArgs.java index 4eb7757..d6622ef 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsTaskArgs.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/IgniteFsTaskArgs.java @@ -9,14 +9,14 @@ package org.gridgain.grid.ggfs.mapreduce; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import java.util.*; /** * GGFS task arguments. When you initiate new GGFS task execution using one of {@code GridGgfs.execute(...)} methods, * all passed parameters are encapsulated in a single {@code GridGgfsTaskArgs} object. Later on this object is - * passed to {@link IgniteFsTask#createJob(org.gridgain.grid.ggfs.IgniteFsPath, IgniteFsFileRange, IgniteFsTaskArgs)} method. + * passed to {@link IgniteFsTask#createJob(org.apache.ignite.fs.IgniteFsPath, IgniteFsFileRange, IgniteFsTaskArgs)} method. * <p> * Task arguments encapsulates the following data: * <ul> @@ -25,7 +25,7 @@ import java.util.*; * <li>{@link IgniteFsRecordResolver} for that task</li> * <li>Flag indicating whether to skip non-existent file paths or throw an exception</li> * <li>User-defined task argument</li> - * <li>Maximum file range length for that task (see {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getMaximumTaskRangeLength()})</li> + * <li>Maximum file range length for that task (see {@link org.apache.ignite.fs.IgniteFsConfiguration#getMaximumTaskRangeLength()})</li> * </ul> */ public interface IgniteFsTaskArgs<T> { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/IgniteFsByteDelimiterRecordResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/IgniteFsByteDelimiterRecordResolver.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/IgniteFsByteDelimiterRecordResolver.java index 79f928e..9ca7b54 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/IgniteFsByteDelimiterRecordResolver.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/IgniteFsByteDelimiterRecordResolver.java @@ -10,9 +10,9 @@ package org.gridgain.grid.ggfs.mapreduce.records; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/IgniteFsFixedLengthRecordResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/IgniteFsFixedLengthRecordResolver.java b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/IgniteFsFixedLengthRecordResolver.java index 6190207..ddfd402 100644 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/IgniteFsFixedLengthRecordResolver.java +++ b/modules/core/src/main/java/org/gridgain/grid/ggfs/mapreduce/records/IgniteFsFixedLengthRecordResolver.java @@ -10,8 +10,8 @@ package org.gridgain.grid.ggfs.mapreduce.records; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/ggfs/package.html ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/ggfs/package.html b/modules/core/src/main/java/org/gridgain/grid/ggfs/package.html deleted file mode 100644 index 7fa7477..0000000 --- a/modules/core/src/main/java/org/gridgain/grid/ggfs/package.html +++ /dev/null @@ -1,15 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> -<!-- - @html.file.header - _________ _____ __________________ _____ - __ ____/___________(_)______ /__ ____/______ ____(_)_______ - _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / / - \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/ ---> -<html> -<body> - <!-- Package description. --> - Contains <b>G</b>rid<b>G</b>ain <b>F</b>ile <b>S</b>ystem APIs. -</body> -</html> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java index a79aa15..703840b 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java @@ -11,6 +11,7 @@ package org.gridgain.grid.kernal; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.logger.*; import org.apache.ignite.logger.java.*; @@ -21,7 +22,6 @@ import org.apache.ignite.mbean.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.rendezvous.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.interop.*; import org.gridgain.grid.kernal.processors.resource.*; import org.gridgain.grid.kernal.processors.spring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsControlResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsControlResponse.java b/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsControlResponse.java index 8beb1df..b22e7b8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsControlResponse.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsControlResponse.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.ggfs.common; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.ggfs.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsLogger.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsLogger.java b/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsLogger.java index 2f0af0b..b9fcf3a 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsLogger.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsLogger.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.ggfs.common; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.typedef.internal.*; import org.jdk8.backport.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsMarshaller.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsMarshaller.java b/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsMarshaller.java index 24a8807..a7dea92 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsMarshaller.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsMarshaller.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.ggfs.common; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -316,7 +316,7 @@ public class GridGgfsMarshaller { } /** - * Reads GGFS path from data input that was written by {@link #writePath(ObjectOutput, org.gridgain.grid.ggfs.IgniteFsPath)} + * Reads GGFS path from data input that was written by {@link #writePath(ObjectOutput, org.apache.ignite.fs.IgniteFsPath)} * method. * * @param in Data input. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsPathControlRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsPathControlRequest.java b/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsPathControlRequest.java index 00b7718..412cdac 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsPathControlRequest.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/ggfs/common/GridGgfsPathControlRequest.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.ggfs.common; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 4a99bc4..52eebc6 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -13,6 +13,7 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.portables.*; import org.apache.ignite.resources.*; @@ -21,7 +22,6 @@ import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; import org.gridgain.grid.cache.datastructures.*; import org.gridgain.grid.cache.query.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.affinity.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java index b266c57..ee6edee 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java @@ -12,6 +12,7 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; @@ -20,7 +21,6 @@ import org.gridgain.grid.cache.affinity.consistenthash.*; import org.gridgain.grid.cache.affinity.fair.*; import org.gridgain.grid.cache.affinity.rendezvous.*; import org.gridgain.grid.cache.store.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.*; import org.gridgain.grid.kernal.processors.cache.datastructures.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java index 0a335ee..8f4a19d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheUtils.java @@ -12,10 +12,10 @@ package org.gridgain.grid.kernal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.cache.distributed.*; import org.gridgain.grid.kernal.processors.cache.distributed.dht.*; import org.gridgain.grid.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAsyncImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAsyncImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAsyncImpl.java index 407249b..0351392 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAsyncImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAsyncImpl.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAttributes.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAttributes.java index 885ca75..ba158c8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAttributes.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAttributes.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; @@ -30,7 +30,7 @@ public class GridGgfsAttributes implements Externalizable { /** File's data block size (bytes). */ private int blockSize; - /** Size of the group figured in {@link org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper}. */ + /** Size of the group figured in {@link org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper}. */ private int grpSize; /** Meta cache name. */ @@ -51,7 +51,7 @@ public class GridGgfsAttributes implements Externalizable { /** * @param ggfsName GGFS name. * @param blockSize File's data block size (bytes). - * @param grpSize Size of the group figured in {@link org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper}. + * @param grpSize Size of the group figured in {@link org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper}. * @param metaCacheName Meta cache name. * @param dataCacheName Data cache name. * @param dfltMode Default mode. @@ -91,7 +91,7 @@ public class GridGgfsAttributes implements Externalizable { } /** - * @return Size of the group figured in {@link org.gridgain.grid.ggfs.IgniteFsGroupDataBlocksKeyMapper}. + * @return Size of the group figured in {@link org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper}. */ public int groupSize() { return grpSize; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlockLocationImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlockLocationImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlockLocationImpl.java index b94e262..6fdf889 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlockLocationImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsBlockLocationImpl.java @@ -10,8 +10,8 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.cluster.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.tostring.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsContext.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsContext.java index a5f105c..c06fafe 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsContext.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsContext.java @@ -10,8 +10,8 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.cluster.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java index 0b8fe5f..1e15bbb 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDataManager.java @@ -12,11 +12,11 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; import org.gridgain.grid.kernal.managers.eventstorage.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDirectoryNotEmptyException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDirectoryNotEmptyException.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDirectoryNotEmptyException.java index 9850e35..fea9eec 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDirectoryNotEmptyException.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsDirectoryNotEmptyException.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; /** * Exception indicating that directory can not be deleted because it is not empty. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsEx.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsEx.java index 0738bbc..7ee45f3 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsEx.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsEx.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.jetbrains.annotations.*; import java.net.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfo.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfo.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfo.java index 2e2bcc3..bcfa82d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfo.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileInfo.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.ggfs; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -90,7 +90,7 @@ public final class GridGgfsFileInfo implements Externalizable { } /** - * Constructs directory or file info with {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#DFLT_BLOCK_SIZE default} block size. + * Constructs directory or file info with {@link org.apache.ignite.fs.IgniteFsConfiguration#DFLT_BLOCK_SIZE default} block size. * * @param isDir Constructs directory info if {@code true} or file info if {@code false}. * @param props Meta properties to set. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileWorkerBatch.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileWorkerBatch.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileWorkerBatch.java index 0d5b7d4..ba9ecc8 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileWorkerBatch.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsFileWorkerBatch.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.ggfs; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java index 5d4f4ad..a54515c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsImpl.java @@ -13,13 +13,13 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.eviction.*; import org.gridgain.grid.cache.eviction.ggfs.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.communication.*; @@ -38,7 +38,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.kernal.GridNodeAttributes.*; import static org.gridgain.grid.kernal.GridTopic.*; import static org.gridgain.grid.kernal.processors.ggfs.GridGgfsFileInfo.*; @@ -1708,7 +1708,7 @@ public final class GridGgfsImpl implements GridGgfsEx { /** * Executes GGFS task with overridden maximum range length (see - * {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getMaximumTaskRangeLength()} for more information). + * {@link org.apache.ignite.fs.IgniteFsConfiguration#getMaximumTaskRangeLength()} for more information). * * @param task Task to execute. * @param rslvr Optional resolver to control split boundaries. @@ -1742,7 +1742,7 @@ public final class GridGgfsImpl implements GridGgfsEx { /** * Executes GGFS task asynchronously with overridden maximum range length (see - * {@link org.gridgain.grid.ggfs.IgniteFsConfiguration#getMaximumTaskRangeLength()} for more information). + * {@link org.apache.ignite.fs.IgniteFsConfiguration#getMaximumTaskRangeLength()} for more information). * * @param taskCls Task class to execute. * @param rslvr Optional resolver to control split boundaries. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamAdapter.java index dea1fc2..36d12f0 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamAdapter.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamImpl.java index 91e0b4a..18a81ef 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsInputStreamImpl.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsIpcHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsIpcHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsIpcHandler.java index 14d05bd..48f0857 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsIpcHandler.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsIpcHandler.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.ggfs.common.*; import org.gridgain.grid.kernal.processors.closure.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java index 4869103..bdd8e66 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsJobImpl.java @@ -11,9 +11,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.compute.*; +import org.apache.ignite.fs.*; import org.apache.ignite.resources.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.kernal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/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 eb862f2..e3ab3a9 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 @@ -12,10 +12,10 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.managers.eventstorage.*; import org.gridgain.grid.kernal.processors.cache.*; import org.gridgain.grid.kernal.processors.task.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModeResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModeResolver.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModeResolver.java index c0701ef..443fbec 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModeResolver.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsModeResolver.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.*; import org.gridgain.grid.util.typedef.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPaths.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPaths.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPaths.java index 5dbb004..a0b0122 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPaths.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsPaths.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/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 99f817a..5ba2e40 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 @@ -13,11 +13,11 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.affinity.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.cache.*; @@ -35,7 +35,7 @@ import java.util.concurrent.*; import static org.gridgain.grid.GridSystemProperties.*; import static org.gridgain.grid.cache.GridCacheMemoryMode.*; import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; import static org.gridgain.grid.kernal.GridNodeAttributes.*; import static org.gridgain.grid.kernal.processors.license.GridLicenseSubsystem.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorAdapter.java index 066cd5c..a3bc423 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorAdapter.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.processors.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSecondaryInputStreamDescriptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSecondaryInputStreamDescriptor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSecondaryInputStreamDescriptor.java index 3a17d38..e955711 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSecondaryInputStreamDescriptor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSecondaryInputStreamDescriptor.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; /** * Descriptor of an input stream opened to the secondary file system. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManager.java index b8f17a9..4b2063f 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsServerManager.java @@ -9,9 +9,9 @@ package org.gridgain.grid.kernal.processors.ggfs; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.thread.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; @@ -21,7 +21,7 @@ import org.gridgain.grid.util.worker.*; import java.util.*; import java.util.concurrent.*; -import static org.gridgain.grid.ggfs.IgniteFsConfiguration.*; +import static org.apache.ignite.fs.IgniteFsConfiguration.*; /** * GGFS server manager. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsProcessor.java index e73779a..d1f9d6e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsProcessor.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/GridNoopGgfsProcessor.java @@ -11,7 +11,7 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; import org.apache.ignite.compute.*; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.ipc.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/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 index 28b2cd6..6ececbf 100644 --- 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 @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.ggfs; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsMetricsAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsMetricsAdapter.java index 36627f8..c77182e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsMetricsAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsMetricsAdapter.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsOutputStreamAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsOutputStreamAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsOutputStreamAdapter.java index b1cdf1b..7eac170 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsOutputStreamAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsOutputStreamAdapter.java @@ -9,8 +9,8 @@ package org.gridgain.grid.kernal.processors.ggfs; +import org.apache.ignite.fs.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsOutputStreamImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsOutputStreamImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsOutputStreamImpl.java index 1ea8d91..a9bc393 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsOutputStreamImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsOutputStreamImpl.java @@ -10,9 +10,9 @@ package org.gridgain.grid.kernal.processors.ggfs; import org.apache.ignite.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.processors.task.*; import org.gridgain.grid.util.typedef.internal.*; import org.gridgain.grid.util.future.*; @@ -22,7 +22,7 @@ import java.io.*; import java.nio.*; import java.util.concurrent.atomic.*; -import static org.gridgain.grid.ggfs.IgniteFsMode.*; +import static org.apache.ignite.fs.IgniteFsMode.*; /** * Output stream to store data into grid cache with separate blocks. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsTaskArgsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsTaskArgsImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsTaskArgsImpl.java index 1edaac8..78ecc7d 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsTaskArgsImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/ggfs/IgniteFsTaskArgsImpl.java @@ -9,7 +9,7 @@ package org.gridgain.grid.kernal.processors.ggfs; -import org.gridgain.grid.ggfs.*; +import org.apache.ignite.fs.*; import org.gridgain.grid.ggfs.mapreduce.*; import org.gridgain.grid.util.typedef.internal.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/81e01957/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java index 6a932f4..abbd45e 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/job/GridJobWorker.java @@ -13,10 +13,10 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.events.*; +import org.apache.ignite.fs.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.*; import org.gridgain.grid.*; -import org.gridgain.grid.ggfs.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.kernal.managers.deployment.*; import org.gridgain.grid.kernal.processors.task.*;
