ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject ignite git commit: IGNITE-4399: IGFS: Merged IgfsSecondaryFileSystem and IgfsSecondaryFileSystemV2 interfaces. This closes #1346.
Date Wed, 21 Dec 2016 11:54:43 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2.0 0a3364453 -> c893da70a


IGNITE-4399: IGFS: Merged IgfsSecondaryFileSystem and IgfsSecondaryFileSystemV2 interfaces.
This closes #1346.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c893da70
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c893da70
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c893da70

Branch: refs/heads/ignite-2.0
Commit: c893da70a9757b16b0799adc8eaa29fa1b03d06e
Parents: 0a33644
Author: tledkov-gridgain <tledkov@gridgain.com>
Authored: Wed Dec 21 14:54:33 2016 +0300
Committer: devozerov <vozerov@gridgain.com>
Committed: Wed Dec 21 14:54:33 2016 +0300

----------------------------------------------------------------------
 .../igfs/secondary/IgfsSecondaryFileSystem.java | 10 +++++
 .../local/LocalIgfsSecondaryFileSystem.java     | 34 +++++++++++++++--
 .../internal/processors/igfs/IgfsImpl.java      | 14 ++-----
 .../processors/igfs/IgfsMetaManager.java        |  2 +-
 .../igfs/IgfsSecondaryFileSystemImpl.java       |  3 +-
 .../igfs/IgfsSecondaryFileSystemV2.java         | 40 --------------------
 .../local/LocalFileSystemIgfsFile.java          | 10 +++--
 .../processors/igfs/IgfsAbstractSelfTest.java   | 16 ++++----
 .../igfs/IgfsDualAbstractSelfTest.java          | 12 +++---
 ...SecondaryFileSystemDualAbstractSelfTest.java |  5 ---
 ...IgfsLocalSecondaryFileSystemTestAdapter.java |  7 +++-
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |  4 +-
 .../HadoopIgfsSecondaryFileSystemDelegate.java  |  4 +-
 13 files changed, 78 insertions(+), 83 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
index 47a0dbd..37c9c7d 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/IgfsSecondaryFileSystem.java
@@ -192,4 +192,14 @@ public interface IgfsSecondaryFileSystem {
      * @throws IgniteException In case of error.
      */
     public long usedSpaceSize() throws IgniteException;
+
+    /**
+     * Set times for the given path.
+     *
+     * @param path Path.
+     * @param accessTime Access time.
+     * @param modificationTime Modification time.
+     * @throws IgniteException If failed.
+     */
+    public void setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteException;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
index ef00bea..18d31de 100644
--- a/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/igfs/secondary/local/LocalIgfsSecondaryFileSystem.java
@@ -17,6 +17,9 @@
 
 package org.apache.ignite.igfs.secondary.local;
 
+import java.nio.file.attribute.BasicFileAttributeView;
+import java.nio.file.attribute.FileTime;
+import java.util.concurrent.TimeUnit;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.igfs.IgfsException;
 import org.apache.ignite.igfs.IgfsFile;
@@ -343,10 +346,14 @@ public class LocalIgfsSecondaryFileSystem implements IgfsSecondaryFileSystem,
Li
 
         Map<String, String> props = LocalFileSystemUtils.posixAttributesToMap(attrs);
 
-        if (isDir)
-            return new LocalFileSystemIgfsFile(path, false, true, 0, file.lastModified(),
0, props);
-        else
-            return new LocalFileSystemIgfsFile(path, file.isFile(), false, 0, file.lastModified(),
file.length(), props);
+        if (isDir) {
+            return new LocalFileSystemIgfsFile(path, false, true, 0,
+                attrs.lastAccessTime().toMillis(), attrs.lastModifiedTime().toMillis(), 0,
props);
+        }
+        else {
+            return new LocalFileSystemIgfsFile(path, file.isFile(), false, 0,
+                attrs.lastAccessTime().toMillis(), attrs.lastModifiedTime().toMillis(), file.length(),
props);
+        }
     }
 
     /** {@inheritDoc} */
@@ -366,6 +373,25 @@ public class LocalIgfsSecondaryFileSystem implements IgfsSecondaryFileSystem,
Li
     }
 
     /** {@inheritDoc} */
+    @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime)
throws IgniteException {
+        Path p = fileForPath(path).toPath();
+
+        if (!Files.exists(p))
+            throw new IgfsPathNotFoundException("Failed to set times (path not found): "
+ path);
+
+        try {
+            Files.getFileAttributeView(p, BasicFileAttributeView.class)
+                .setTimes(
+                    (modificationTime >= 0) ? FileTime.from(modificationTime, TimeUnit.MILLISECONDS)
: null,
+                    (accessTime >= 0) ? FileTime.from(accessTime, TimeUnit.MILLISECONDS)
: null,
+                    null);
+        }
+        catch (IOException e) {
+            throw new IgniteException("Failed to set times for path: " + path, e);
+        }
+    }
+
+    /** {@inheritDoc} */
     @Override public void start() throws IgniteException {
         if (workDir != null)
             workDir = new File(workDir).getAbsolutePath();

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index 6b23e80..01e434f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -1229,19 +1229,11 @@ public final class IgfsImpl implements IgfsEx {
             @Override public Void call() throws Exception {
                 IgfsMode mode = resolveMode(path);
 
-                if (mode == PROXY) {
-                    if (secondaryFs instanceof IgfsSecondaryFileSystemV2)
-                        ((IgfsSecondaryFileSystemV2)secondaryFs).setTimes(path, accessTime,
modificationTime);
-                    else
-                        throw new UnsupportedOperationException("setTimes is not supported
in PROXY mode for " +
-                            "this secondary file system,");
-                }
+                if (mode == PROXY)
+                    secondaryFs.setTimes(path, accessTime, modificationTime);
                 else {
-                    boolean useSecondary =
-                        IgfsUtils.isDualMode(mode) && secondaryFs instanceof IgfsSecondaryFileSystemV2;
-
                     meta.updateTimes(path, accessTime, modificationTime,
-                        useSecondary ? (IgfsSecondaryFileSystemV2) secondaryFs : null);
+                        IgfsUtils.isDualMode(mode) ? secondaryFs : null);
                 }
 
                 return null;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/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 ffa502b..4f579e8 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
@@ -2793,7 +2793,7 @@ public class IgfsMetaManager extends IgfsManager {
      * @throws IgniteCheckedException If failed.
      */
     public void updateTimes(IgfsPath path, long accessTime, long modificationTime,
-        IgfsSecondaryFileSystemV2 secondaryFs) throws IgniteCheckedException {
+        IgfsSecondaryFileSystem secondaryFs) throws IgniteCheckedException {
         while (true) {
             if (busyLock.enterBusy()) {
                 try {

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
index 526e60d..4e14b46 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemImpl.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.igfs;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.igfs.IgfsFile;
 import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
 import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
 import org.jetbrains.annotations.Nullable;
 
@@ -30,7 +31,7 @@ import java.util.Map;
 /**
  * Secondary file system over native IGFS.
  */
-class IgfsSecondaryFileSystemImpl implements IgfsSecondaryFileSystemV2 {
+class IgfsSecondaryFileSystemImpl implements IgfsSecondaryFileSystem {
     /** Delegate. */
     private final IgfsEx igfs;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemV2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemV2.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemV2.java
deleted file mode 100644
index 3775574..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemV2.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.IgniteException;
-import org.apache.ignite.igfs.IgfsPath;
-import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
-
-/**
- * Extended version of secondary file system with missing methods.
- *
- * @deprecated Will be removed in Apache Ignite 2.0. Methods will be merged to {@link IgfsSecondaryFileSystem}.
- */
-@Deprecated
-public interface IgfsSecondaryFileSystemV2 extends IgfsSecondaryFileSystem {
-    /**
-     * Set times for the given path.
-     *
-     * @param path Path.
-     * @param accessTime Access time.
-     * @param modificationTime Modification time.
-     * @throws IgniteException If failed.
-     */
-    public void setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteException;
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemIgfsFile.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemIgfsFile.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemIgfsFile.java
index 400ac34..02a5015 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemIgfsFile.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/secondary/local/LocalFileSystemIgfsFile.java
@@ -40,6 +40,9 @@ public class LocalFileSystemIgfsFile implements IgfsFile {
     /** Modification time. */
     private final long modTime;
 
+    /** Access time. */
+    private final long accessTime;
+
     /** Length. */
     private final long len;
 
@@ -51,19 +54,20 @@ public class LocalFileSystemIgfsFile implements IgfsFile {
      * @param isFile Path is a file.
      * @param isDir Path is a directory.
      * @param blockSize Block size in bytes.
+     * @param accessTime Access time in millis.
      * @param modTime Modification time in millis.
      * @param len File length in bytes.
      * @param props Properties.
      */
     public LocalFileSystemIgfsFile(IgfsPath path, boolean isFile, boolean isDir, int blockSize,
-        long modTime, long len, Map<String, String> props) {
-
+        long accessTime, long modTime, long len, Map<String, String> props) {
         assert !isDir || blockSize == 0 : "blockSize must be 0 for dirs. [blockSize=" + blockSize
+ ']';
         assert !isDir || len == 0 : "length must be 0 for dirs. [length=" + len + ']';
 
         this.path = path;
         flags = IgfsUtils.flags(isDir, isFile);
         this.blockSize = blockSize;
+        this.accessTime = accessTime;
         this.modTime = modTime;
         this.len = len;
         this.props = props;
@@ -96,7 +100,7 @@ public class LocalFileSystemIgfsFile implements IgfsFile {
 
     /** {@inheritDoc} */
     @Override public long accessTime() {
-        return 0;
+        return accessTime;
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/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 128239d..04f3c8e 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
@@ -863,13 +863,13 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
             }
 
             // Change only access time.
-            igfs.setTimes(path, info.accessTime() + 1, -1);
+            igfs.setTimes(path, info.accessTime() + 1000, -1);
 
             newInfo = igfs.info(path);
 
             assert newInfo != null;
 
-            assertEquals(info.accessTime() + 1, newInfo.accessTime());
+            assertEquals(info.accessTime() + 1000, newInfo.accessTime());
             assertEquals(info.modificationTime(), newInfo.modificationTime());
 
             if (dual) {
@@ -880,14 +880,14 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
             }
 
             // Change only modification time.
-            igfs.setTimes(path, -1, info.modificationTime() + 1);
+            igfs.setTimes(path, -1, info.modificationTime() + 1000);
 
             newInfo = igfs.info(path);
 
             assert newInfo != null;
 
-            assertEquals(info.accessTime() + 1, newInfo.accessTime());
-            assertEquals(info.modificationTime() + 1, newInfo.modificationTime());
+            assertEquals(info.accessTime() + 1000, newInfo.accessTime());
+            assertEquals(info.modificationTime() + 1000, newInfo.modificationTime());
 
             if (dual) {
                 T2<Long, Long> newSecondaryTimes = igfsSecondary.times(path.toString());
@@ -897,14 +897,14 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest
{
             }
 
             // Change both.
-            igfs.setTimes(path, info.accessTime() + 2, info.modificationTime() + 2);
+            igfs.setTimes(path, info.accessTime() + 2000, info.modificationTime() + 2000);
 
             newInfo = igfs.info(path);
 
             assert newInfo != null;
 
-            assertEquals(info.accessTime() + 2, newInfo.accessTime());
-            assertEquals(info.modificationTime() + 2, newInfo.modificationTime());
+            assertEquals(info.accessTime() + 2000, newInfo.accessTime());
+            assertEquals(info.modificationTime() + 2000, newInfo.modificationTime());
 
             if (dual) {
                 T2<Long, Long> newSecondaryTimes = igfsSecondary.times(path.toString());

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java
index 1d6010d..bea318d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java
@@ -1587,18 +1587,20 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest
{
         if (!timesSupported())
             return;
 
-        create(igfs, paths(DIR), null);
+        create(igfs, paths(DIR, SUBDIR), null);
 
         createFile(igfsSecondary, FILE, chunk);
 
-        igfs.setTimes(FILE, Long.MAX_VALUE - 1, Long.MAX_VALUE);
+        final long MAX_ALIGN_ON_SECOND = (long)Integer.MAX_VALUE * 1000;
+
+        igfs.setTimes(FILE, MAX_ALIGN_ON_SECOND - 1000, MAX_ALIGN_ON_SECOND);
 
         IgfsFile info = igfs.info(FILE);
 
         assert info != null;
 
-        assertEquals(Long.MAX_VALUE - 1, info.accessTime());
-        assertEquals(Long.MAX_VALUE, info.modificationTime());
+        assertEquals(MAX_ALIGN_ON_SECOND - 1000, info.accessTime());
+        assertEquals(MAX_ALIGN_ON_SECOND, info.modificationTime());
 
         T2<Long, Long> secondaryTimes = igfsSecondary.times(FILE.toString());
 
@@ -1606,7 +1608,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest
{
         assertEquals(info.modificationTime(), (long) secondaryTimes.get2());
 
         try {
-            igfs.setTimes(FILE2, Long.MAX_VALUE, Long.MAX_VALUE);
+            igfs.setTimes(FILE2, MAX_ALIGN_ON_SECOND, MAX_ALIGN_ON_SECOND);
 
             fail("Exception is not thrown for missing file.");
         } catch (Exception ignore) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemDualAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemDualAbstractSelfTest.java
index 8a23954..62d1552 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemDualAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemDualAbstractSelfTest.java
@@ -120,11 +120,6 @@ public abstract class IgfsLocalSecondaryFileSystemDualAbstractSelfTest
extends I
         return !U.isWindows();
     }
 
-    /** {@inheritDoc} */
-    @Override protected boolean timesSupported() {
-        return false;
-    }
-
     /**
      *
      * @throws Exception If failed.

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemTestAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemTestAdapter.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemTestAdapter.java
index 8f6af83..2b10f6e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemTestAdapter.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemTestAdapter.java
@@ -17,6 +17,8 @@
 
 package org.apache.ignite.internal.processors.igfs;
 
+import java.nio.file.attribute.BasicFileAttributeView;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.PosixFileAttributeView;
 import java.nio.file.attribute.PosixFileAttributes;
 import java.nio.file.attribute.PosixFilePermission;
@@ -122,7 +124,10 @@ public class IgfsLocalSecondaryFileSystemTestAdapter implements IgfsSecondaryFil
 
     /** {@inheritDoc} */
     @Override public T2<Long, Long> times(String path) throws IOException {
-        throw new UnsupportedOperationException("times");
+        BasicFileAttributes attrs = Files.getFileAttributeView(path(path), BasicFileAttributeView.class)
+            .readAttributes();
+
+        return new T2<>(attrs.lastAccessTime().toMillis(), attrs.lastModifiedTime().toMillis());
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
index c9d08c5..d9215db 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
@@ -23,6 +23,7 @@ import org.apache.ignite.IgniteFileSystem;
 import org.apache.ignite.igfs.IgfsFile;
 import org.apache.ignite.igfs.IgfsPath;
 import org.apache.ignite.igfs.IgfsUserContext;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
 import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.processors.hadoop.HadoopClassLoader;
@@ -31,7 +32,6 @@ import org.apache.ignite.internal.processors.hadoop.HadoopPayloadAware;
 import org.apache.ignite.internal.processors.hadoop.delegate.HadoopDelegateUtils;
 import org.apache.ignite.internal.processors.hadoop.delegate.HadoopIgfsSecondaryFileSystemDelegate;
 import org.apache.ignite.internal.processors.igfs.IgfsKernalContextAware;
-import org.apache.ignite.internal.processors.igfs.IgfsSecondaryFileSystemV2;
 import org.apache.ignite.lang.IgniteOutClosure;
 import org.apache.ignite.lifecycle.LifecycleAware;
 import org.jetbrains.annotations.Nullable;
@@ -46,7 +46,7 @@ import java.util.concurrent.Callable;
  * <p>
  * Target {@code FileSystem}'s are created on per-user basis using passed {@link HadoopFileSystemFactory}.
  */
-public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSystemV2, IgfsKernalContextAware,
+public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSystem, IgfsKernalContextAware,
     LifecycleAware, HadoopPayloadAware {
     /** The default user name. It is used if no user context is set. */
     private String dfltUsrName;

http://git-wip-us.apache.org/repos/asf/ignite/blob/c893da70/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/delegate/HadoopIgfsSecondaryFileSystemDelegate.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/delegate/HadoopIgfsSecondaryFileSystemDelegate.java
b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/delegate/HadoopIgfsSecondaryFileSystemDelegate.java
index e381272..3eb4deb 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/delegate/HadoopIgfsSecondaryFileSystemDelegate.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/delegate/HadoopIgfsSecondaryFileSystemDelegate.java
@@ -17,12 +17,12 @@
 
 package org.apache.ignite.internal.processors.hadoop.delegate;
 
-import org.apache.ignite.internal.processors.igfs.IgfsSecondaryFileSystemV2;
+import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
 import org.apache.ignite.lifecycle.LifecycleAware;
 
 /**
  * Interface to secondary file system implementation.
  */
-public interface HadoopIgfsSecondaryFileSystemDelegate extends IgfsSecondaryFileSystemV2,
LifecycleAware {
+public interface HadoopIgfsSecondaryFileSystemDelegate extends IgfsSecondaryFileSystem, LifecycleAware
{
     // No-op.
 }


Mime
View raw message