You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/04/20 12:22:29 UTC
[3/5] ignite git commit: IGNITE-3549: IGFS: Switched "accessTime" and
"modification" time in setTimes() method. This closes #1830.
IGNITE-3549: IGFS: Switched "accessTime" and "modification" time in setTimes() method. This closes #1830.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/457dcdbb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/457dcdbb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/457dcdbb
Branch: refs/heads/ignite-1794
Commit: 457dcdbba78bcbd63f50c5f83433c4935651fe17
Parents: f440480
Author: tledkov-gridgain <tl...@gridgain.com>
Authored: Thu Apr 20 13:32:06 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Apr 20 13:32:06 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteFileSystem.java | 4 ++--
.../igfs/secondary/IgfsSecondaryFileSystem.java | 4 ++--
.../local/LocalIgfsSecondaryFileSystem.java | 2 +-
.../internal/processors/igfs/IgfsAsyncImpl.java | 4 ++--
.../ignite/internal/processors/igfs/IgfsImpl.java | 6 +++---
.../internal/processors/igfs/IgfsIpcHandler.java | 2 +-
.../internal/processors/igfs/IgfsMetaManager.java | 6 +++---
.../igfs/IgfsSecondaryFileSystemImpl.java | 4 ++--
.../igfs/client/IgfsClientSetTimesCallable.java | 2 +-
.../DefaultIgfsSecondaryFileSystemTestAdapter.java | 2 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 17 ++++++++---------
.../processors/igfs/IgfsDualAbstractSelfTest.java | 6 +++---
.../IgfsLocalSecondaryFileSystemTestAdapter.java | 2 +-
.../ignite/internal/processors/igfs/IgfsMock.java | 2 +-
.../IgfsSecondaryFileSystemInjectionSelfTest.java | 2 +-
.../igfs/IgfsSecondaryFileSystemTestAdapter.java | 2 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 4 ++--
.../HadoopIgfsSecondaryFileSystemDelegateImpl.java | 2 +-
.../hadoop/impl/igfs/HadoopIgfsInProc.java | 2 +-
.../HadoopIgfsSecondaryFileSystemTestAdapter.java | 2 +-
20 files changed, 38 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
index 9c3f9dd..d611871 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java
@@ -202,13 +202,13 @@ public interface IgniteFileSystem extends IgniteAsyncSupport {
* corresponding time will not be changed.
*
* @param path Path to update.
- * @param accessTime Optional last access time to set. Value {@code -1} does not update access time.
* @param modificationTime Optional last modification time to set. Value {@code -1} does not update
* modification time.
+ * @param accessTime Optional last access time to set. Value {@code -1} does not update access time.
* @throws IgfsPathNotFoundException If target was not found.
* @throws IgniteException If error occurred.
*/
- public void setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteException;
+ public void setTimes(IgfsPath path, long modificationTime, long accessTime) throws IgniteException;
/**
* Gets affinity block locations for data blocks of the file, i.e. the nodes, on which the blocks
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/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 76ba454..4de0cb5 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
@@ -199,11 +199,11 @@ public interface IgfsSecondaryFileSystem {
* Set times for the given path.
*
* @param path Path.
- * @param accessTime Access time.
* @param modificationTime Modification time.
+ * @param accessTime Access time.
* @throws IgniteException If failed.
*/
- public void setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteException;
+ public void setTimes(IgfsPath path, long modificationTime, long accessTime) throws IgniteException;
/**
* Get affinity block locations for data blocks of the file. In case {@code maxLen} parameter is set and
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/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 209c6d3..f5ddb1c 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
@@ -395,7 +395,7 @@ public class LocalIgfsSecondaryFileSystem implements IgfsSecondaryFileSystem, Li
}
/** {@inheritDoc} */
- @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteException {
+ @Override public void setTimes(IgfsPath path, long modificationTime, long accessTime) throws IgniteException {
Path p = fileForPath(path).toPath();
if (!Files.exists(p))
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
index 4df6f59..812fd3b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsAsyncImpl.java
@@ -258,8 +258,8 @@ public class IgfsAsyncImpl extends AsyncSupportAdapter<IgniteFileSystem> impleme
}
/** {@inheritDoc} */
- @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) {
- igfs.setTimes(path, accessTime, modificationTime);
+ @Override public void setTimes(IgfsPath path, long modificationTime, long accessTime) {
+ igfs.setTimes(path, modificationTime, accessTime);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/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 2057c71..8712756 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
@@ -1186,7 +1186,7 @@ public final class IgfsImpl implements IgfsEx {
}
/** {@inheritDoc} */
- @Override public void setTimes(final IgfsPath path, final long accessTime, final long modificationTime) {
+ @Override public void setTimes(final IgfsPath path, final long modificationTime, final long accessTime) {
A.notNull(path, "path");
if (accessTime == -1 && modificationTime == -1)
@@ -1204,9 +1204,9 @@ public final class IgfsImpl implements IgfsEx {
IgfsMode mode = resolveMode(path);
if (mode == PROXY)
- secondaryFs.setTimes(path, accessTime, modificationTime);
+ secondaryFs.setTimes(path, modificationTime, accessTime);
else {
- meta.updateTimes(path, accessTime, modificationTime,
+ meta.updateTimes(path, modificationTime, accessTime,
IgfsUtils.isDualMode(mode) ? secondaryFs : null);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
index 203f383..4e7801d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsIpcHandler.java
@@ -382,7 +382,7 @@ class IgfsIpcHandler implements IgfsServerHandler {
break;
case SET_TIMES:
- igfs.setTimes(req.path(), req.accessTime(), req.modificationTime());
+ igfs.setTimes(req.path(), req.modificationTime(), req.accessTime());
res.response(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/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 77272e1..a26239c 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
@@ -2800,7 +2800,7 @@ public class IgfsMetaManager extends IgfsManager {
* @param secondaryFs Secondary file system.
* @throws IgniteCheckedException If failed.
*/
- public void updateTimes(IgfsPath path, long accessTime, long modificationTime,
+ public void updateTimes(IgfsPath path, long modificationTime, long accessTime,
IgfsSecondaryFileSystem secondaryFs) throws IgniteCheckedException {
while (true) {
if (busyLock.enterBusy()) {
@@ -2829,7 +2829,7 @@ public class IgfsMetaManager extends IgfsManager {
if (pathIds.allExists()) {
// All files are in place. Update both primary and secondary file systems.
if (secondaryFs != null)
- secondaryFs.setTimes(path, accessTime, modificationTime);
+ secondaryFs.setTimes(path, modificationTime, accessTime);
IgniteUuid targetId = pathIds.lastExistingId();
IgfsEntryInfo targetInfo = lockInfos.get(targetId);
@@ -2846,7 +2846,7 @@ public class IgfsMetaManager extends IgfsManager {
else {
// Propagate call to the secondary FS, as we might haven't cache this part yet.
if (secondaryFs != null) {
- secondaryFs.setTimes(path, accessTime, modificationTime);
+ secondaryFs.setTimes(path, modificationTime, accessTime);
return;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/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 1c135fe..332b03d 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
@@ -119,8 +119,8 @@ class IgfsSecondaryFileSystemImpl implements IgfsSecondaryFileSystem {
}
/** {@inheritDoc} */
- @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteException {
- igfs.setTimes(path, accessTime, modificationTime);
+ @Override public void setTimes(IgfsPath path, long modificationTime, long accessTime) throws IgniteException {
+ igfs.setTimes(path, modificationTime, accessTime);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
index 0914c3e..6a78f6d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/client/IgfsClientSetTimesCallable.java
@@ -65,7 +65,7 @@ public class IgfsClientSetTimesCallable extends IgfsClientAbstractCallable<Void>
/** {@inheritDoc} */
@Override protected Void call0(IgfsContext ctx) throws Exception {
- ctx.igfs().setTimes(path, accessTime, modificationTime);
+ ctx.igfs().setTimes(path, modificationTime, accessTime);
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/DefaultIgfsSecondaryFileSystemTestAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/DefaultIgfsSecondaryFileSystemTestAdapter.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/DefaultIgfsSecondaryFileSystemTestAdapter.java
index 93e0827..63a8016 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/DefaultIgfsSecondaryFileSystemTestAdapter.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/DefaultIgfsSecondaryFileSystemTestAdapter.java
@@ -107,7 +107,7 @@ public class DefaultIgfsSecondaryFileSystemTestAdapter implements IgfsSecondaryF
if (info == null)
throw new IOException("Path not found: " + path);
- return new T2<>(info.accessTime(), info.modificationTime());
+ return new T2<>(info.modificationTime(), info.accessTime());
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/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 6122e5c..2e8269c 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
@@ -852,7 +852,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
}
// Change only access time.
- igfs.setTimes(path, info.accessTime() + 1000, -1);
+ igfs.setTimes(path, -1, info.accessTime() + 1000);
newInfo = igfs.info(path);
@@ -864,12 +864,12 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
if (dual) {
T2<Long, Long> newSecondaryTimes = igfsSecondary.times(path.toString());
- assertEquals(newInfo.accessTime(), (long) newSecondaryTimes.get1());
- assertEquals(secondaryTimes.get2(), newSecondaryTimes.get2());
+ assertEquals(newInfo.accessTime(), (long) newSecondaryTimes.get2());
+ assertEquals(secondaryTimes.get1(), newSecondaryTimes.get1());
}
// Change only modification time.
- igfs.setTimes(path, -1, info.modificationTime() + 1000);
+ igfs.setTimes(path, info.modificationTime() + 1000, -1);
newInfo = igfs.info(path);
@@ -881,12 +881,11 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
if (dual) {
T2<Long, Long> newSecondaryTimes = igfsSecondary.times(path.toString());
- assertEquals(newInfo.accessTime(), (long) newSecondaryTimes.get1());
- assertEquals(newInfo.modificationTime(), (long) newSecondaryTimes.get2());
+ assertEquals(newInfo.accessTime(), (long) newSecondaryTimes.get2());
}
// Change both.
- igfs.setTimes(path, info.accessTime() + 2000, info.modificationTime() + 2000);
+ igfs.setTimes(path, info.modificationTime() + 2000, info.accessTime() + 2000);
newInfo = igfs.info(path);
@@ -898,8 +897,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsAbstractBaseSelfTest {
if (dual) {
T2<Long, Long> newSecondaryTimes = igfsSecondary.times(path.toString());
- assertEquals(newInfo.accessTime(), (long) newSecondaryTimes.get1());
- assertEquals(newInfo.modificationTime(), (long) newSecondaryTimes.get2());
+ assertEquals(newInfo.modificationTime(), (long) newSecondaryTimes.get1());
+ assertEquals(newInfo.accessTime(), (long) newSecondaryTimes.get2());
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/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 12f46da..bc3ef31 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
@@ -1562,7 +1562,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
final long MAX_ALIGN_ON_SECOND = (long)Integer.MAX_VALUE * 1000;
- igfs.setTimes(FILE, MAX_ALIGN_ON_SECOND - 1000, MAX_ALIGN_ON_SECOND);
+ igfs.setTimes(FILE, MAX_ALIGN_ON_SECOND, MAX_ALIGN_ON_SECOND - 1000);
IgfsFile info = igfs.info(FILE);
@@ -1573,8 +1573,8 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
T2<Long, Long> secondaryTimes = igfsSecondary.times(FILE.toString());
- assertEquals(info.accessTime(), (long) secondaryTimes.get1());
- assertEquals(info.modificationTime(), (long) secondaryTimes.get2());
+ assertEquals(info.modificationTime(), (long) secondaryTimes.get1());
+ assertEquals(info.accessTime(), (long) secondaryTimes.get2());
try {
igfs.setTimes(FILE2, MAX_ALIGN_ON_SECOND, MAX_ALIGN_ON_SECOND);
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/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 2b10f6e..905ca13 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
@@ -127,7 +127,7 @@ public class IgfsLocalSecondaryFileSystemTestAdapter implements IgfsSecondaryFil
BasicFileAttributes attrs = Files.getFileAttributeView(path(path), BasicFileAttributeView.class)
.readAttributes();
- return new T2<>(attrs.lastAccessTime().toMillis(), attrs.lastModifiedTime().toMillis());
+ return new T2<>(attrs.lastModifiedTime().toMillis(), attrs.lastAccessTime().toMillis());
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMock.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMock.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMock.java
index 9a950ad..93bb802 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMock.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMock.java
@@ -214,7 +214,7 @@ public class IgfsMock implements IgfsEx {
}
/** {@inheritDoc} */
- @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteException {
+ @Override public void setTimes(IgfsPath path, long modificationTime, long accessTime) throws IgniteException {
throwUnsupported();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
index c5df409..e17c2df 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemInjectionSelfTest.java
@@ -248,7 +248,7 @@ public class IgfsSecondaryFileSystemInjectionSelfTest extends GridCommonAbstract
}
/** {@inheritDoc} */
- @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteException {
+ @Override public void setTimes(IgfsPath path, long modificationTime, long accessTime) throws IgniteException {
// No-op.
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemTestAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemTestAdapter.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemTestAdapter.java
index fe913df..20afd67 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemTestAdapter.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryFileSystemTestAdapter.java
@@ -104,7 +104,7 @@ public interface IgfsSecondaryFileSystemTestAdapter {
* Get times for path.
*
* @param path Path.
- * @return Times for path.
+ * @return Times for path (modification time, access time).
* @throws IOException If failed.
*/
T2<Long, Long> times(String path) throws IOException;
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/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 82f641f..6eca1c2 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
@@ -246,8 +246,8 @@ public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSys
}
/** {@inheritDoc} */
- @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteException {
- target.setTimes(path, accessTime, modificationTime);
+ @Override public void setTimes(IgfsPath path, long modificationTime, long accessTime) throws IgniteException {
+ target.setTimes(path, modificationTime, accessTime);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/delegate/HadoopIgfsSecondaryFileSystemDelegateImpl.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/delegate/HadoopIgfsSecondaryFileSystemDelegateImpl.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/delegate/HadoopIgfsSecondaryFileSystemDelegateImpl.java
index 9c7febf..55d8521 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/delegate/HadoopIgfsSecondaryFileSystemDelegateImpl.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/delegate/HadoopIgfsSecondaryFileSystemDelegateImpl.java
@@ -376,7 +376,7 @@ public class HadoopIgfsSecondaryFileSystemDelegateImpl implements HadoopIgfsSeco
}
/** {@inheritDoc} */
- @Override public void setTimes(IgfsPath path, long accessTime, long modificationTime) throws IgniteException {
+ @Override public void setTimes(IgfsPath path, long modificationTime, long accessTime) throws IgniteException {
try {
// We don't use FileSystem#getUsed() since it counts only the files
// in the filesystem root, not all the files recursively.
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
index 0577c73..e09e102 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsInProc.java
@@ -297,7 +297,7 @@ public class HadoopIgfsInProc implements HadoopIgfsEx {
try {
IgfsUserContext.doAs(user, new IgniteOutClosure<Void>() {
@Override public Void apply() {
- igfs.setTimes(path, accessTime, modificationTime);
+ igfs.setTimes(path, modificationTime, accessTime);
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/457dcdbb/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsSecondaryFileSystemTestAdapter.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsSecondaryFileSystemTestAdapter.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsSecondaryFileSystemTestAdapter.java
index 453d0c7..06f1234 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsSecondaryFileSystemTestAdapter.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/HadoopIgfsSecondaryFileSystemTestAdapter.java
@@ -132,7 +132,7 @@ public class HadoopIgfsSecondaryFileSystemTestAdapter implements IgfsSecondaryFi
@Override public T2<Long, Long> times(String path) throws IOException {
FileStatus status = get().getFileStatus(new Path(path));
- return new T2<>(status.getAccessTime(), status.getModificationTime());
+ return new T2<>(status.getModificationTime(), status.getAccessTime());
}
/** {@inheritDoc} */