You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/06/06 13:07:03 UTC
[16/16] ignite git commit: IGNITE-3258: Done.
IGNITE-3258: Done.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e271e799
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e271e799
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e271e799
Branch: refs/heads/ignite-3258
Commit: e271e799c94fb90e5aa1c674ccbe45b47aff285a
Parents: 672b495
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Jun 6 16:04:07 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Jun 6 16:04:07 2016 +0300
----------------------------------------------------------------------
...zySecondaryFileSystemPositionedReadable.java | 77 ++++++++++++++++++++
.../processors/igfs/IgfsMetaManager.java | 18 ++++-
.../processors/igfs/IgfsAbstractSelfTest.java | 3 +
3 files changed, 96 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e271e799/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLazySecondaryFileSystemPositionedReadable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLazySecondaryFileSystemPositionedReadable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLazySecondaryFileSystemPositionedReadable.java
new file mode 100644
index 0000000..0a57c34
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsLazySecondaryFileSystemPositionedReadable.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.igfs;
+
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
+import org.apache.ignite.internal.util.typedef.internal.S;
+
+import java.io.IOException;
+
+/**
+ * Lazy readable entity which is opened on demand.
+ */
+public class IgfsLazySecondaryFileSystemPositionedReadable implements IgfsSecondaryFileSystemPositionedReadable {
+ /** File system. */
+ private final IgfsSecondaryFileSystem fs;
+
+ /** Path. */
+ private final IgfsPath path;
+
+ /** Buffer size. */
+ private final int bufSize;
+
+ /** Target stream. */
+ private IgfsSecondaryFileSystemPositionedReadable target;
+
+ /**
+ * Constructor.
+ *
+ * @param fs File system.
+ * @param path Path.
+ * @param bufSize Buffer size.
+ */
+ public IgfsLazySecondaryFileSystemPositionedReadable(IgfsSecondaryFileSystem fs, IgfsPath path, int bufSize) {
+ assert fs != null;
+ assert path != null;
+
+ this.fs = fs;
+ this.path = path;
+ this.bufSize = bufSize;
+ }
+
+ /** {@inheritDoc} */
+ @Override public int read(long pos, byte[] buf, int off, int len) throws IOException {
+ if (target == null)
+ target = fs.open(path, bufSize);
+
+ return target.read(pos, buf, off, len);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void close() throws IOException {
+ if (target != null)
+ target.close();
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(IgfsLazySecondaryFileSystemPositionedReadable.class, this);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e271e799/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
index fa748f8..1dd4c53 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManager.java
@@ -2144,7 +2144,7 @@ public class IgfsMetaManager extends IgfsManager {
throw fsException(new IgfsPathIsDirectoryException("Failed to open file (not a file): " +
path));
- return new IgfsSecondaryInputStreamDescriptor(info, fs.open(path, bufSize));
+ return new IgfsSecondaryInputStreamDescriptor(info, lazySecondaryReader(fs, path, bufSize));
}
// If failed, try synchronize.
@@ -2160,7 +2160,8 @@ public class IgfsMetaManager extends IgfsManager {
throw fsException(new IgfsPathIsDirectoryException("Failed to open file " +
"(not a file): " + path));
- return new IgfsSecondaryInputStreamDescriptor(infos.get(path), fs.open(path, bufSize));
+ return new IgfsSecondaryInputStreamDescriptor(infos.get(path),
+ lazySecondaryReader(fs, path, bufSize));
}
@Override public IgfsSecondaryInputStreamDescriptor onFailure(@Nullable Exception err)
@@ -2184,6 +2185,19 @@ public class IgfsMetaManager extends IgfsManager {
}
/**
+ * Create lazy secondary file system reader.
+ *
+ * @param fs File system.
+ * @param path Path.
+ * @param bufSize Buffer size.
+ * @return Lazy reader.
+ */
+ private static IgfsLazySecondaryFileSystemPositionedReadable lazySecondaryReader(IgfsSecondaryFileSystem fs,
+ IgfsPath path, int bufSize) {
+ return new IgfsLazySecondaryFileSystemPositionedReadable(fs, path, bufSize);
+ }
+
+ /**
* Synchronizes with secondary file system.
*
* @param fs File system.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e271e799/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
index 3fb7b91..76a038d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java
@@ -1082,6 +1082,9 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
createFile(igfs.asSecondary(), FILE, true, chunk);
checkFileContent(igfs, FILE, chunk);
+
+ // Read again when the whole file is in memory.
+ checkFileContent(igfs, FILE, chunk);
}
/**