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/03/16 20:42:33 UTC
[1/6] ignite git commit: Started splitting "info" classes.
Repository: ignite
Updated Branches:
refs/heads/ignite-2813 ff9f62546 -> e55866fd0
Started splitting "info" classes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4de5a4e7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4de5a4e7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4de5a4e7
Branch: refs/heads/ignite-2813
Commit: 4de5a4e7d6666a52c8b73ef4f96d7d18ffe8d32b
Parents: ff9f625
Author: thatcoach <pp...@list.ru>
Authored: Wed Mar 16 21:47:24 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Wed Mar 16 21:47:24 2016 +0300
----------------------------------------------------------------------
.../processors/igfs/IgfsDirectoryInfo.java | 45 +++++++
.../internal/processors/igfs/IgfsEntryInfo.java | 132 +++++++++++++++++++
.../internal/processors/igfs/IgfsFileInfo.java | 117 +++-------------
.../processors/igfs/IgfsMetaManager.java | 68 +++++-----
.../igfs/IgfsDataManagerSelfTest.java | 12 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 2 +-
6 files changed, 231 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4de5a4e7/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
new file mode 100644
index 0000000..06cf555
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
@@ -0,0 +1,45 @@
+/*
+ * 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 java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+/**
+ * IGFS directory info.
+ */
+public class IgfsDirectoryInfo extends IgfsEntryInfo implements Externalizable {
+ /**
+ * Default constructor.
+ */
+ public IgfsDirectoryInfo() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4de5a4e7/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
new file mode 100644
index 0000000..3412cc1
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
@@ -0,0 +1,132 @@
+/*
+ * 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.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * Base IGFS entry.
+ */
+public abstract class IgfsEntryInfo implements Externalizable {
+ /** ID. */
+ protected IgniteUuid id;
+
+ /** Properties. */
+ protected Map<String, String> props;
+
+ /** Last access time. */
+ protected long accessTime;
+
+ /** Last modification time. */
+ protected long modificationTime;
+
+ /** Original file path. This is a helper field used only during real file delete. */
+ protected IgfsPath path;
+
+ /**
+ * Default constructor.
+ */
+ protected IgfsEntryInfo() {
+ // No-op.
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param id ID.
+ * @param props Properties.
+ * @param accessTime Access time.
+ * @param modificationTime Modification time.
+ */
+ protected IgfsEntryInfo(IgniteUuid id, @Nullable Map<String, String> props, long accessTime,
+ long modificationTime) {
+ assert id != null;
+
+ this.id = id;
+ this.props = props == null || props.isEmpty() ? null : props;
+ this.accessTime = accessTime;
+ this.modificationTime = modificationTime;
+ }
+
+ /**
+ * Gets this item ID.
+ *
+ * @return This item ID.
+ */
+ public IgniteUuid id() {
+ return id;
+ }
+
+ /**
+ * Get properties of the file.
+ *
+ * @return Properties of the file.
+ */
+ public Map<String, String> properties() {
+ return props == null ? Collections.<String, String>emptyMap() : Collections.unmodifiableMap(props);
+ }
+
+ /**
+ * @return Last access time.
+ */
+ public long accessTime() {
+ return accessTime;
+ }
+
+ /**
+ * @return Last modification time.
+ */
+ public long modificationTime() {
+ return modificationTime;
+ }
+
+ /**
+ * @return Original file path. This is a helper field used only in some operations like delete.
+ */
+ public IgfsPath path() {
+ return path;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void writeExternal(ObjectOutput out) throws IOException {
+ U.writeGridUuid(out, id);
+ U.writeStringMap(out, props);
+ out.writeLong(accessTime);
+ out.writeLong(modificationTime);
+ out.writeObject(path);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ id = U.readGridUuid(in);
+ props = U.readStringMap(in);
+ accessTime = in.readLong();
+ modificationTime = in.readLong();
+ path = (IgfsPath)in.readObject();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4de5a4e7/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
index 60f119d..9e046aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
@@ -17,12 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Collections;
-import java.util.Map;
import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
@@ -31,25 +25,26 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.Map;
+
/**
- * Unmodifiable file information.
+ * IGFS file info.
*/
-public final class IgfsFileInfo implements Externalizable {
+public final class IgfsFileInfo extends IgfsEntryInfo implements Externalizable {
/** */
private static final long serialVersionUID = 0L;
- /** Info ID. */
- private IgniteUuid id;
-
/** File length in bytes. */
private long len;
/** File block size, {@code zero} for directories. */
private int blockSize;
- /** File properties. */
- private Map<String, String> props;
-
/** File lock ID. */
private IgniteUuid lockId;
@@ -59,12 +54,6 @@ public final class IgfsFileInfo implements Externalizable {
/** File affinity map. */
private IgfsFileMap fileMap;
- /** Last access time. Modified on-demand. */
- private long accessTime;
-
- /** Last modification time. */
- private long modificationTime;
-
/** Directory listing. */
@GridToStringInclude
private Map<String, IgfsListingEntry> listing;
@@ -72,9 +61,6 @@ public final class IgfsFileInfo implements Externalizable {
/** Whether data blocks of this entry should never be excluded. */
private boolean evictExclude;
- /** Original file path. This is a helper field used only during real file delete. */
- private IgfsPath path;
-
/**
* {@link Externalizable} support.
*/
@@ -83,27 +69,6 @@ public final class IgfsFileInfo implements Externalizable {
}
/**
- * Create file.
- *
- * @param id File ID.
- * @param blockSize Block size.
- * @param len Length.
- * @param affKey Affinity key.
- * @param lockId Lock ID.
- * @param evictExclude Evict exclude flag.
- * @param props Properties.
- * @param accessTime Access time.
- * @param modificationTime Modification time.
- * @return File info.
- */
- public static IgfsFileInfo createFile(IgniteUuid id, int blockSize, long len, @Nullable IgniteUuid affKey,
- @Nullable IgniteUuid lockId, boolean evictExclude, @Nullable Map<String, String> props, long accessTime,
- long modificationTime) {
- return new IgfsFileInfo(false, id, blockSize, len, affKey, null, props, null, lockId,
- accessTime, modificationTime, evictExclude);
- }
-
- /**
* Update length.
*
* @param len New length.
@@ -251,7 +216,8 @@ public final class IgfsFileInfo implements Externalizable {
@Nullable Map<String, IgfsListingEntry> listing, @Nullable Map<String, String> props,
@Nullable IgfsFileMap fileMap, @Nullable IgniteUuid lockId, long accessTime,
long modificationTime, boolean evictExclude) {
- assert id != null;
+ super(id, props, accessTime, modificationTime);
+
assert F.isEmpty(listing) || isDir;
if (isDir) {
@@ -263,7 +229,6 @@ public final class IgfsFileInfo implements Externalizable {
assert blockSize > 0 : "File block size should be positive: " + blockSize;
}
- this.id = id;
this.len = isDir ? 0 : len;
this.blockSize = isDir ? 0 : blockSize;
this.affKey = affKey;
@@ -273,26 +238,11 @@ public final class IgfsFileInfo implements Externalizable {
fileMap = new IgfsFileMap();
this.fileMap = fileMap;
- this.accessTime = accessTime;
- this.modificationTime = modificationTime;
-
- // Always make a copy of passed properties collection to escape concurrent modifications.
- this.props = props == null || props.isEmpty() ? null : props;
-
this.lockId = lockId;
this.evictExclude = evictExclude;
}
/**
- * Gets this item ID.
- *
- * @return This item ID.
- */
- public IgniteUuid id() {
- return id;
- }
-
- /**
* @return {@code True} if this is a file.
*/
public boolean isFile() {
@@ -338,20 +288,6 @@ public final class IgfsFileInfo implements Externalizable {
}
/**
- * @return Last access time.
- */
- public long accessTime() {
- return accessTime;
- }
-
- /**
- * @return Last modification time.
- */
- public long modificationTime() {
- return modificationTime;
- }
-
- /**
* @return Directory listing.
*/
public Map<String, IgfsListingEntry> listing() {
@@ -405,16 +341,6 @@ public final class IgfsFileInfo implements Externalizable {
}
/**
- * Get properties of the file.
- *
- * @return Properties of the file.
- */
- public Map<String, String> properties() {
- return props == null || props.isEmpty() ? Collections.<String, String>emptyMap() :
- Collections.unmodifiableMap(props);
- }
-
- /**
* Get lock ID.
*
* @return Lock ID if file is locked or {@code null} if file is free of locks.
@@ -432,44 +358,31 @@ public final class IgfsFileInfo implements Externalizable {
return evictExclude;
}
- /**
- * @return Original file path. This is a helper field used only in some operations like delete.
- */
- public IgfsPath path() {
- return path;
- }
-
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
- U.writeGridUuid(out, id);
+ super.writeExternal(out);
+
out.writeInt(blockSize);
out.writeLong(len);
- U.writeStringMap(out, props);
U.writeGridUuid(out, lockId);
U.writeGridUuid(out, affKey);
out.writeObject(listing);
out.writeObject(fileMap);
- out.writeLong(accessTime);
- out.writeLong(modificationTime);
out.writeBoolean(evictExclude);
- out.writeObject(path);
}
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- id = U.readGridUuid(in);
+ super.readExternal(in);
+
blockSize = in.readInt();
len = in.readLong();
- props = U.readStringMap(in);
lockId = U.readGridUuid(in);
affKey = U.readGridUuid(in);
listing = (Map<String, IgfsListingEntry>)in.readObject();
fileMap = (IgfsFileMap)in.readObject();
- accessTime = in.readLong();
- modificationTime = in.readLong();
evictExclude = in.readBoolean();
- path = (IgfsPath)in.readObject();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4de5a4e7/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 b5b1ab4..c84b5fc 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
@@ -17,31 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.concurrent.CountDownLatch;
-import javax.cache.processor.EntryProcessor;
-import javax.cache.processor.EntryProcessorException;
-import javax.cache.processor.MutableEntry;
-
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteInterruptedException;
@@ -84,13 +59,34 @@ import org.apache.ignite.lang.IgniteClosure;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_CREATED;
-import static org.apache.ignite.events.EventType.EVT_IGFS_DIR_RENAMED;
-import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_CREATED;
-import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_RENAMED;
-import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_OPENED_WRITE;
-import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
-import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.EntryProcessorException;
+import javax.cache.processor.MutableEntry;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.concurrent.CountDownLatch;
+
+import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import static org.apache.ignite.transactions.TransactionIsolation.*;
/**
* Cache based structure (meta data) manager.
@@ -1993,7 +1989,7 @@ public class IgfsMetaManager extends IgfsManager {
throw fsException("Failed to open output stream to the file created in " +
"the secondary file system because the path points to a directory: " + path);
- IgfsFileInfo newInfo = IgfsFileInfo.createFile(
+ IgfsFileInfo newInfo = IgfsUtils.createFile(
IgniteUuid.randomUuid(),
status.blockSize(),
status.length(),
@@ -2631,7 +2627,7 @@ public class IgfsMetaManager extends IgfsManager {
status.accessTime(),
status.modificationTime()
) :
- IgfsFileInfo.createFile(
+ IgfsUtils.createFile(
IgniteUuid.randomUuid(),
igfsCtx.configuration().getBlockSize(),
status.length(),
@@ -3438,7 +3434,7 @@ public class IgfsMetaManager extends IgfsManager {
// Make a new locked info:
long t = System.currentTimeMillis();
- final IgfsFileInfo newFileInfo = IgfsFileInfo.createFile(
+ final IgfsFileInfo newFileInfo = IgfsUtils.createFile(
IgniteUuid.randomUuid(),
cfg.getBlockSize(),
0L,
@@ -3783,7 +3779,7 @@ public class IgfsMetaManager extends IgfsManager {
/** {@inheritDoc} */
@Override public IgfsFileInfo process(MutableEntry<IgniteUuid, IgfsFileInfo> entry, Object... args)
throws EntryProcessorException {
- IgfsFileInfo info = IgfsFileInfo.createFile(
+ IgfsFileInfo info = IgfsUtils.createFile(
entry.getKey(),
blockSize,
0L,
http://git-wip-us.apache.org/repos/asf/ignite/blob/4de5a4e7/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
index c5276a9..2af4cc3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
@@ -168,7 +168,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
- IgfsFileInfo info = IgfsFileInfo.createFile(IgniteUuid.randomUuid(), 200, 0L, null,
+ IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), 200, 0L, null,
IgfsUtils.DELETE_LOCK_ID, false, null, t, t);
assertNull(mgr.dataBlock(info, path, 0, null).get());
@@ -253,7 +253,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
- IgfsFileInfo info = IgfsFileInfo.createFile(IgniteUuid.randomUuid(), blockSize, 0L, null,
+ IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 0L, null,
IgfsUtils.DELETE_LOCK_ID, false, null, t, t);
assertNull(mgr.dataBlock(info, path, 0, null).get());
@@ -344,7 +344,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
- IgfsFileInfo info = IgfsFileInfo.createFile(IgniteUuid.randomUuid(), blockSize, 0L, null,
+ IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 0L, null,
IgfsUtils.DELETE_LOCK_ID, false, null, t, t);
IgfsFileAffinityRange range = new IgfsFileAffinityRange();
@@ -415,7 +415,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
//IgfsFileInfo info = new IgfsFileInfo(blockSize, 0);
- IgfsFileInfo info = IgfsFileInfo.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
+ IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
null, t, t);
for (int pos = 0; pos < 5 * grpSize; pos++) {
@@ -466,7 +466,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
- IgfsFileInfo info = IgfsFileInfo.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
+ IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
null, t, t);
Collection<IgfsBlockLocation> affinity = mgr.affinity(info, 0, info.length());
@@ -500,7 +500,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
- IgfsFileInfo info = IgfsFileInfo.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
+ IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
null, t, t);
IgniteUuid affKey = IgniteUuid.randomUuid();
http://git-wip-us.apache.org/repos/asf/ignite/blob/4de5a4e7/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 d1879b2..0d69a2d 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
@@ -360,7 +360,7 @@ public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSys
s.getAccessTime(),
s.getModificationTime()
) :
- IgfsFileInfo.createFile(
+ IgfsUtils.createFile(
IgniteUuid.randomUuid(),
(int)s.getBlockSize(),
s.getLen(),
[4/6] ignite git commit: Main part of refactoring - applied new
scheme.
Posted by vo...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/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 c84b5fc..67ca475 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
@@ -117,7 +117,7 @@ public class IgfsMetaManager extends IgfsManager {
private CountDownLatch metaCacheStartLatch;
/** File ID to file info projection. */
- private IgniteInternalCache<IgniteUuid, IgfsFileInfo> id2InfoPrj;
+ private IgniteInternalCache<IgniteUuid, IgfsEntryInfo> id2InfoPrj;
/** Predefined key for sampling mode value. */
private GridCacheInternal sampling;
@@ -175,7 +175,7 @@ public class IgfsMetaManager extends IgfsManager {
}
});
- id2InfoPrj = (IgniteInternalCache<IgniteUuid, IgfsFileInfo>)metaCache.<IgniteUuid, IgfsFileInfo>cache();
+ id2InfoPrj = (IgniteInternalCache<IgniteUuid, IgfsEntryInfo>)metaCache.<IgniteUuid, IgfsEntryInfo>cache();
locNode = igfsCtx.kernalContext().discovery().localNode();
@@ -395,13 +395,13 @@ public class IgfsMetaManager extends IgfsManager {
* @return File info.
* @throws IgniteCheckedException If failed.
*/
- @Nullable public IgfsFileInfo info(@Nullable IgniteUuid fileId) throws IgniteCheckedException {
+ @Nullable public IgfsEntryInfo info(@Nullable IgniteUuid fileId) throws IgniteCheckedException {
if (busyLock.enterBusy()) {
try {
if (fileId == null)
return null;
- IgfsFileInfo info = getInfo(fileId);
+ IgfsEntryInfo info = getInfo(fileId);
// Force root ID always exist in cache.
if (info == null && IgfsUtils.ROOT_ID.equals(fileId))
@@ -424,7 +424,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Files details.
* @throws IgniteCheckedException If failed.
*/
- public Map<IgniteUuid, IgfsFileInfo> infos(Collection<IgniteUuid> fileIds) throws IgniteCheckedException {
+ public Map<IgniteUuid, IgfsEntryInfo> infos(Collection<IgniteUuid> fileIds) throws IgniteCheckedException {
if (busyLock.enterBusy()) {
try {
validTxState(false);
@@ -434,7 +434,7 @@ public class IgfsMetaManager extends IgfsManager {
if (F.isEmpty(fileIds))
return Collections.emptyMap();
- Map<IgniteUuid, IgfsFileInfo> map = getInfos(fileIds);
+ Map<IgniteUuid, IgfsEntryInfo> map = getInfos(fileIds);
// Force root ID always exist in cache.
if (fileIds.contains(IgfsUtils.ROOT_ID) && !map.containsKey(IgfsUtils.ROOT_ID)) {
@@ -461,7 +461,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Locked file info or {@code null} if file cannot be locked or doesn't exist.
* @throws IgniteCheckedException If the file with such id does not exist, or on another failure.
*/
- public @Nullable IgfsFileInfo lock(IgniteUuid fileId, boolean delete) throws IgniteCheckedException {
+ public @Nullable IgfsEntryInfo lock(IgniteUuid fileId, boolean delete) throws IgniteCheckedException {
if (busyLock.enterBusy()) {
try {
validTxState(false);
@@ -472,7 +472,7 @@ public class IgfsMetaManager extends IgfsManager {
try {
// Lock file ID for this transaction.
- IgfsFileInfo oldInfo = info(fileId);
+ IgfsEntryInfo oldInfo = info(fileId);
if (oldInfo == null)
return null;
@@ -480,7 +480,7 @@ public class IgfsMetaManager extends IgfsManager {
if (oldInfo.lockId() != null)
return null; // The file is already locked, we cannot lock it.
- IgfsFileInfo newInfo = invokeLock(fileId, delete);
+ IgfsEntryInfo newInfo = invokeLock(fileId, delete);
tx.commit();
@@ -521,7 +521,7 @@ public class IgfsMetaManager extends IgfsManager {
* @param modificationTime Modification time to write to file info.
* @throws IgniteCheckedException If failed.
*/
- public void unlock(final IgfsFileInfo info, final long modificationTime) throws IgniteCheckedException {
+ public void unlock(final IgfsEntryInfo info, final long modificationTime) throws IgniteCheckedException {
validTxState(false);
assert info != null;
@@ -544,7 +544,7 @@ public class IgfsMetaManager extends IgfsManager {
IgniteUuid fileId = info.id();
// Lock file ID for this transaction.
- IgfsFileInfo oldInfo = info(fileId);
+ IgfsEntryInfo oldInfo = info(fileId);
if (oldInfo == null)
throw fsException(new IgfsPathNotFoundException("Failed to unlock file (file not " +
@@ -583,7 +583,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Locked file details. Resulting map doesn't contain details for not-existent files.
* @throws IgniteCheckedException If failed.
*/
- private Map<IgniteUuid, IgfsFileInfo> lockIds(IgniteUuid... fileIds) throws IgniteCheckedException {
+ private Map<IgniteUuid, IgfsEntryInfo> lockIds(IgniteUuid... fileIds) throws IgniteCheckedException {
validTxState(true);
assert fileIds != null && fileIds.length > 0;
@@ -623,7 +623,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Map with lock info.
* @throws IgniteCheckedException If failed.
*/
- private Map<IgniteUuid, IgfsFileInfo> lockIds(Collection<IgniteUuid> fileIds) throws IgniteCheckedException {
+ private Map<IgniteUuid, IgfsEntryInfo> lockIds(Collection<IgniteUuid> fileIds) throws IgniteCheckedException {
assert isSorted(fileIds);
validTxState(true);
@@ -631,7 +631,7 @@ public class IgfsMetaManager extends IgfsManager {
log.debug("Locking file ids: " + fileIds);
// Lock files and get their infos.
- Map<IgniteUuid, IgfsFileInfo> map = getInfos(fileIds);
+ Map<IgniteUuid, IgfsEntryInfo> map = getInfos(fileIds);
if (log.isDebugEnabled())
log.debug("Locked file ids: " + fileIds);
@@ -654,15 +654,15 @@ public class IgfsMetaManager extends IgfsManager {
* @return Value of created or existing system entry.
* @throws IgniteCheckedException On error.
*/
- private IgfsFileInfo createSystemDirectoryIfAbsent(IgniteUuid id)
+ private IgfsEntryInfo createSystemDirectoryIfAbsent(IgniteUuid id)
throws IgniteCheckedException {
assert IgfsUtils.isRootOrTrashId(id);
long time = System.currentTimeMillis();
- IgfsFileInfo info = IgfsUtils.createDirectory(id);
+ IgfsEntryInfo info = IgfsUtils.createDirectory(id);
- IgfsFileInfo oldInfo = id2InfoPrj.getAndPutIfAbsent(id, info);
+ IgfsEntryInfo oldInfo = id2InfoPrj.getAndPutIfAbsent(id, info);
if (oldInfo != null)
info = oldInfo;
@@ -697,7 +697,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return First qualified file info.
* @throws IgniteCheckedException If failed to get file for fragmentizer.
*/
- public IgfsFileInfo fileForFragmentizer(Collection<IgniteUuid> exclude) throws IgniteCheckedException {
+ public IgfsEntryInfo fileForFragmentizer(Collection<IgniteUuid> exclude) throws IgniteCheckedException {
if (busyLock.enterBusy()) {
try {
return fileForFragmentizer0(IgfsUtils.ROOT_ID, exclude);
@@ -718,9 +718,9 @@ public class IgfsMetaManager extends IgfsManager {
* @return First qualified file info.
* @throws IgniteCheckedException If failed to get file for fragmentizer.
*/
- private IgfsFileInfo fileForFragmentizer0(IgniteUuid parentId, Collection<IgniteUuid> exclude)
+ private IgfsEntryInfo fileForFragmentizer0(IgniteUuid parentId, Collection<IgniteUuid> exclude)
throws IgniteCheckedException {
- IgfsFileInfo info = info(parentId);
+ IgfsEntryInfo info = info(parentId);
// Check if file was concurrently deleted.
if (info == null)
@@ -732,7 +732,7 @@ public class IgfsMetaManager extends IgfsManager {
for (IgfsListingEntry entry : listing.values()) {
if (entry.isFile()) {
- IgfsFileInfo fileInfo = info(entry.fileId());
+ IgfsEntryInfo fileInfo = info(entry.fileId());
if (fileInfo != null) {
if (!exclude.contains(fileInfo.id()) &&
@@ -742,7 +742,7 @@ public class IgfsMetaManager extends IgfsManager {
}
}
else {
- IgfsFileInfo fileInfo = fileForFragmentizer0(entry.fileId(), exclude);
+ IgfsEntryInfo fileInfo = fileForFragmentizer0(entry.fileId(), exclude);
if (fileInfo != null)
return fileInfo;
@@ -764,7 +764,7 @@ public class IgfsMetaManager extends IgfsManager {
throws IgniteCheckedException {
assert fileId != null;
- IgfsFileInfo info = skipTx ? id2InfoPrj.getAllOutTx(Collections.singleton(fileId)).get(fileId) :
+ IgfsEntryInfo info = skipTx ? id2InfoPrj.getAllOutTx(Collections.singleton(fileId)).get(fileId) :
getInfo(fileId);
return info == null ? Collections.<String, IgfsListingEntry>emptyMap() : info.listing();
@@ -779,7 +779,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return File id already stored in meta cache or {@code null} if passed file info was stored.
* @throws IgniteCheckedException If failed.
*/
- private IgniteUuid putIfAbsentNonTx(IgniteUuid parentId, String fileName, IgfsFileInfo newFileInfo)
+ private IgniteUuid putIfAbsentNonTx(IgniteUuid parentId, String fileName, IgfsEntryInfo newFileInfo)
throws IgniteCheckedException {
if (log.isDebugEnabled())
log.debug("Locking parent id [parentId=" + parentId + ", fileName=" + fileName + ", newFileInfo=" +
@@ -788,7 +788,7 @@ public class IgfsMetaManager extends IgfsManager {
validTxState(true);
// Lock only parent file ID.
- IgfsFileInfo parentInfo = info(parentId);
+ IgfsEntryInfo parentInfo = info(parentId);
if (parentInfo == null)
throw fsException(new IgfsPathNotFoundException("Failed to lock parent directory (not found): " +
@@ -815,7 +815,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return File info of renamed entry.
* @throws IgniteCheckedException In case of exception.
*/
- public IgfsFileInfo move(IgfsPath srcPath, IgfsPath dstPath) throws IgniteCheckedException {
+ public IgfsEntryInfo move(IgfsPath srcPath, IgfsPath dstPath) throws IgniteCheckedException {
if (busyLock.enterBusy()) {
try {
validTxState(false);
@@ -847,7 +847,7 @@ public class IgfsMetaManager extends IgfsManager {
try {
// 3. Obtain the locks.
- final Map<IgniteUuid, IgfsFileInfo> allInfos = lockIds(allIds);
+ final Map<IgniteUuid, IgfsEntryInfo> allInfos = lockIds(allIds);
// 4. Verify integrity of source directory.
if (!verifyPathIntegrity(srcPath, srcPathIds, allInfos)) {
@@ -865,16 +865,16 @@ public class IgfsMetaManager extends IgfsManager {
// 6. Calculate source and destination targets which will be changed.
IgniteUuid srcTargetId = srcPathIds.get(srcPathIds.size() - 2);
- IgfsFileInfo srcTargetInfo = allInfos.get(srcTargetId);
+ IgfsEntryInfo srcTargetInfo = allInfos.get(srcTargetId);
String srcName = srcPath.name();
IgniteUuid dstTargetId;
- IgfsFileInfo dstTargetInfo;
+ IgfsEntryInfo dstTargetInfo;
String dstName;
if (dstLeafId != null) {
// Destination leaf exists. Check if it is an empty directory.
- IgfsFileInfo dstLeafInfo = allInfos.get(dstLeafId);
+ IgfsEntryInfo dstLeafInfo = allInfos.get(dstLeafId);
assert dstLeafInfo != null;
@@ -917,7 +917,7 @@ public class IgfsMetaManager extends IgfsManager {
IgfsPath realNewPath = new IgfsPath(dstDirPath, dstName);
- IgfsFileInfo moved = allInfos.get(srcPathIds.get(srcPathIds.size() - 1));
+ IgfsEntryInfo moved = allInfos.get(srcPathIds.get(srcPathIds.size() - 1));
// Set the new path to the info to simplify event creation:
return moved.path(realNewPath);
@@ -945,7 +945,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return verification result.
*/
private static boolean verifyPathIntegrity(IgfsPath path, List<IgniteUuid> expIds,
- Map<IgniteUuid, IgfsFileInfo> infos) {
+ Map<IgniteUuid, IgfsEntryInfo> infos) {
List<String> pathParts = path.components();
assert pathParts.size() < expIds.size();
@@ -955,7 +955,7 @@ public class IgfsMetaManager extends IgfsManager {
// If parent ID is null, it doesn't exist.
if (parentId != null) {
- IgfsFileInfo parentInfo = infos.get(parentId);
+ IgfsEntryInfo parentInfo = infos.get(parentId);
// If parent info is null, it doesn't exist.
if (parentInfo != null) {
@@ -999,9 +999,9 @@ public class IgfsMetaManager extends IgfsManager {
}
// Lock file ID and parent IDs for this transaction.
- Map<IgniteUuid, IgfsFileInfo> infoMap = lockIds(srcParentId, fileId, destParentId);
+ Map<IgniteUuid, IgfsEntryInfo> infoMap = lockIds(srcParentId, fileId, destParentId);
- IgfsFileInfo srcInfo = infoMap.get(srcParentId);
+ IgfsEntryInfo srcInfo = infoMap.get(srcParentId);
if (srcInfo == null)
throw fsException(new IgfsPathNotFoundException("Failed to lock source directory (not found?)" +
@@ -1010,7 +1010,7 @@ public class IgfsMetaManager extends IgfsManager {
if (!srcInfo.isDirectory())
throw fsException(new IgfsPathIsNotDirectoryException("Source is not a directory: " + srcInfo));
- IgfsFileInfo destInfo = infoMap.get(destParentId);
+ IgfsEntryInfo destInfo = infoMap.get(destParentId);
if (destInfo == null)
throw fsException(new IgfsPathNotFoundException("Failed to lock destination directory (not found?)" +
@@ -1019,7 +1019,7 @@ public class IgfsMetaManager extends IgfsManager {
if (!destInfo.isDirectory())
throw fsException(new IgfsPathIsNotDirectoryException("Destination is not a directory: " + destInfo));
- IgfsFileInfo fileInfo = infoMap.get(fileId);
+ IgfsEntryInfo fileInfo = infoMap.get(fileId);
if (fileInfo == null)
throw fsException(new IgfsPathNotFoundException("Failed to lock target file (not found?) [fileId=" +
@@ -1060,7 +1060,7 @@ public class IgfsMetaManager extends IgfsManager {
try {
// NB: We may lock root because its id is less than any other id:
- final IgfsFileInfo rootInfo = lockIds(IgfsUtils.ROOT_ID, trashId).get(IgfsUtils.ROOT_ID);
+ final IgfsEntryInfo rootInfo = lockIds(IgfsUtils.ROOT_ID, trashId).get(IgfsUtils.ROOT_ID);
assert rootInfo != null;
@@ -1074,7 +1074,7 @@ public class IgfsMetaManager extends IgfsManager {
// Construct new info and move locked entries from root to it.
Map<String, IgfsListingEntry> transferListing = new HashMap<>(rootListingMap);
- IgfsFileInfo newInfo = IgfsUtils.createDirectory(
+ IgfsEntryInfo newInfo = IgfsUtils.createDirectory(
IgniteUuid.randomUuid(),
transferListing,
(Map<String,String>)null
@@ -1141,20 +1141,20 @@ public class IgfsMetaManager extends IgfsManager {
final IgniteInternalTx tx = startTx();
try {
- final Map<IgniteUuid, IgfsFileInfo> infoMap = lockIds(allIds);
+ final Map<IgniteUuid, IgfsEntryInfo> infoMap = lockIds(allIds);
// Directory starure was changed concurrently, so the original path no longer exists:
if (!verifyPathIntegrity(path, pathIdList, infoMap))
return null;
- final IgfsFileInfo victimInfo = infoMap.get(victimId);
+ final IgfsEntryInfo victimInfo = infoMap.get(victimId);
if (!recursive && victimInfo.hasChildren())
// Throw exception if not empty and not recursive.
throw new IgfsDirectoryNotEmptyException("Failed to remove directory (directory is not " +
"empty and recursive flag is not set).");
- IgfsFileInfo destInfo = infoMap.get(trashId);
+ IgfsEntryInfo destInfo = infoMap.get(trashId);
assert destInfo != null;
@@ -1165,7 +1165,7 @@ public class IgfsMetaManager extends IgfsManager {
assert !destInfo.hasChild(destFileName) : "Failed to add file name into the " +
"destination directory (file already exists) [destName=" + destFileName + ']';
- IgfsFileInfo srcParentInfo = infoMap.get(pathIdList.get(pathIdList.size() - 2));
+ IgfsEntryInfo srcParentInfo = infoMap.get(pathIdList.get(pathIdList.size() - 2));
assert srcParentInfo != null;
@@ -1226,7 +1226,7 @@ public class IgfsMetaManager extends IgfsManager {
// Handle special case when we deleting root directory.
assert IgfsUtils.ROOT_ID.equals(id);
- IgfsFileInfo rootInfo = getInfo(IgfsUtils.ROOT_ID);
+ IgfsEntryInfo rootInfo = getInfo(IgfsUtils.ROOT_ID);
if (rootInfo == null)
return null; // Root was never created.
@@ -1252,7 +1252,7 @@ public class IgfsMetaManager extends IgfsManager {
transferListing.putAll(rootListing);
- IgfsFileInfo newInfo = IgfsUtils.createDirectory(
+ IgfsEntryInfo newInfo = IgfsUtils.createDirectory(
IgniteUuid.randomUuid(),
transferListing,
(Map<String,String>)null
@@ -1314,9 +1314,9 @@ public class IgfsMetaManager extends IgfsManager {
for (IgfsListingEntry childEntry : listing.values())
allIds[i++] = childEntry.fileId();
- Map<IgniteUuid, IgfsFileInfo> locks = lockIds(allIds);
+ Map<IgniteUuid, IgfsEntryInfo> locks = lockIds(allIds);
- IgfsFileInfo parentInfo = locks.get(parentId);
+ IgfsEntryInfo parentInfo = locks.get(parentId);
// Ensure parent is still in place.
if (parentInfo != null) {
@@ -1331,7 +1331,7 @@ public class IgfsMetaManager extends IgfsManager {
String childName = entry.getKey();
IgniteUuid childId = entry.getValue().fileId();
- IgfsFileInfo entryInfo = locks.get(childId);
+ IgfsEntryInfo entryInfo = locks.get(childId);
if (entryInfo != null) {
// File must be locked for deletion:
@@ -1395,9 +1395,9 @@ public class IgfsMetaManager extends IgfsManager {
try {
boolean res = false;
- Map<IgniteUuid, IgfsFileInfo> infos = lockIds(parentId, id);
+ Map<IgniteUuid, IgfsEntryInfo> infos = lockIds(parentId, id);
- IgfsFileInfo victim = infos.get(id);
+ IgfsEntryInfo victim = infos.get(id);
if (victim == null)
return res;
@@ -1407,7 +1407,7 @@ public class IgfsMetaManager extends IgfsManager {
// Proceed only in case both parent and child exist.
if (infos.containsKey(parentId) && infos.containsKey(id)) {
- IgfsFileInfo parentInfo = infos.get(parentId);
+ IgfsEntryInfo parentInfo = infos.get(parentId);
assert parentInfo != null;
@@ -1452,7 +1452,7 @@ public class IgfsMetaManager extends IgfsManager {
for (int i = 0; i < IgfsUtils.TRASH_CONCURRENCY; i++) {
IgniteUuid trashId = IgfsUtils.trashId(i);
- IgfsFileInfo trashInfo = getInfo(trashId);
+ IgfsEntryInfo trashInfo = getInfo(trashId);
if (trashInfo != null && trashInfo.hasChildren()) {
for (IgfsListingEntry entry : trashInfo.listing().values())
@@ -1478,7 +1478,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Updated file info or {@code null} if such file ID not found.
* @throws IgniteCheckedException If operation failed.
*/
- @Nullable private IgfsFileInfo updatePropertiesNonTx(final IgniteUuid fileId, Map<String, String> props)
+ @Nullable private IgfsEntryInfo updatePropertiesNonTx(final IgniteUuid fileId, Map<String, String> props)
throws IgniteCheckedException {
assert fileId != null;
assert !F.isEmpty(props) : "Expects not-empty file's properties";
@@ -1489,7 +1489,7 @@ public class IgfsMetaManager extends IgfsManager {
log.debug("Update file properties [fileId=" + fileId + ", props=" + props + ']');
try {
- final IgfsFileInfo oldInfo = info(fileId);
+ final IgfsEntryInfo oldInfo = info(fileId);
if (oldInfo == null)
return null;
@@ -1509,7 +1509,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Updated file info or {@code null} if such file ID not found.
* @throws IgniteCheckedException If operation failed.
*/
- @Nullable public IgfsFileInfo updateProperties(IgniteUuid fileId, Map<String, String> props)
+ @Nullable public IgfsEntryInfo updateProperties(IgniteUuid fileId, Map<String, String> props)
throws IgniteCheckedException {
if (busyLock.enterBusy()) {
try {
@@ -1518,7 +1518,7 @@ public class IgfsMetaManager extends IgfsManager {
IgniteInternalTx tx = startTx();
try {
- IgfsFileInfo info = updatePropertiesNonTx(fileId, props);
+ IgfsEntryInfo info = updatePropertiesNonTx(fileId, props);
tx.commit();
@@ -1546,7 +1546,7 @@ public class IgfsMetaManager extends IgfsManager {
* @param affRange Affinity range.
* @return New file info.
*/
- public IgfsFileInfo reserveSpace(IgfsPath path, IgniteUuid fileId, long space, IgfsFileAffinityRange affRange)
+ public IgfsEntryInfo reserveSpace(IgfsPath path, IgniteUuid fileId, long space, IgfsFileAffinityRange affRange)
throws IgniteCheckedException {
validTxState(false);
@@ -1559,12 +1559,12 @@ public class IgfsMetaManager extends IgfsManager {
try {
// Lock file ID for this transaction.
- IgfsFileInfo oldInfo = info(fileId);
+ IgfsEntryInfo oldInfo = info(fileId);
if (oldInfo == null)
throw fsException("File has been deleted concurrently [path=" + path + ", id=" + fileId + ']');
- IgfsFileInfo newInfo = invokeAndGet(fileId, new FileReserveSpaceProcessor(space, affRange));
+ IgfsEntryInfo newInfo = invokeAndGet(fileId, new FileReserveSpaceProcessor(space, affRange));
tx.commit();
@@ -1594,8 +1594,8 @@ public class IgfsMetaManager extends IgfsManager {
* @return Updated file info or {@code null} if such file ID not found.
* @throws IgniteCheckedException If failed.
*/
- @Nullable public IgfsFileInfo updateInfo(IgniteUuid fileId,
- EntryProcessor<IgniteUuid, IgfsFileInfo, IgfsFileInfo> proc) throws IgniteCheckedException {
+ @Nullable public IgfsEntryInfo updateInfo(IgniteUuid fileId,
+ EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo> proc) throws IgniteCheckedException {
validTxState(false);
assert fileId != null;
assert proc != null;
@@ -1609,12 +1609,12 @@ public class IgfsMetaManager extends IgfsManager {
try {
// Lock file ID for this transaction.
- IgfsFileInfo oldInfo = info(fileId);
+ IgfsEntryInfo oldInfo = info(fileId);
if (oldInfo == null)
return null; // File not found.
- IgfsFileInfo newInfo = invokeAndGet(fileId, proc);
+ IgfsEntryInfo newInfo = invokeAndGet(fileId, proc);
if (newInfo == null)
throw fsException("Failed to update file info with null value" +
@@ -1671,13 +1671,13 @@ public class IgfsMetaManager extends IgfsManager {
IgniteInternalTx tx = startTx();
try {
- final Map<IgniteUuid, IgfsFileInfo> lockedInfos = lockIds(b.idSet);
+ final Map<IgniteUuid, IgfsEntryInfo> lockedInfos = lockIds(b.idSet);
// If the path was changed, we close the current Tx and repeat the procedure again
// starting from taking the path ids.
if (verifyPathIntegrity(b.existingPath, b.idList, lockedInfos)) {
// Locked path okay, trying to proceed with the remainder creation.
- IgfsFileInfo lowermostExistingInfo = lockedInfos.get(b.lowermostExistingId);
+ IgfsEntryInfo lowermostExistingInfo = lockedInfos.get(b.lowermostExistingId);
// Check only the lowermost directory in the existing directory chain
// because others are already checked in #verifyPathIntegrity() above.
@@ -1806,7 +1806,7 @@ public class IgfsMetaManager extends IgfsManager {
* @param name Name in parent.
* @throws IgniteCheckedException If failed.
*/
- private void createNewEntry(IgfsFileInfo info, IgniteUuid parentId, String name) throws IgniteCheckedException {
+ private void createNewEntry(IgfsEntryInfo info, IgniteUuid parentId, String name) throws IgniteCheckedException {
validTxState(true);
if (!id2InfoPrj.putIfAbsent(info.id(), info))
@@ -1842,7 +1842,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Resulting file info.
* @throws IgniteCheckedException If failed.
*/
- private IgfsFileInfo invokeLock(IgniteUuid id, boolean delete) throws IgniteCheckedException {
+ private IgfsEntryInfo invokeLock(IgniteUuid id, boolean delete) throws IgniteCheckedException {
return invokeAndGet(id, new FileLockProcessor(createFileLockId(delete)));
}
@@ -1867,7 +1867,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return New file info.
* @throws IgniteCheckedException If failed.
*/
- private IgfsFileInfo invokeAndGet(IgniteUuid id, EntryProcessor<IgniteUuid, IgfsFileInfo, IgfsFileInfo> proc)
+ private IgfsEntryInfo invokeAndGet(IgniteUuid id, EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo> proc)
throws IgniteCheckedException {
validTxState(true);
@@ -1881,7 +1881,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Info.
* @throws IgniteCheckedException If failed.
*/
- @Nullable private IgfsFileInfo getInfo(IgniteUuid id) throws IgniteCheckedException {
+ @Nullable private IgfsEntryInfo getInfo(IgniteUuid id) throws IgniteCheckedException {
return id2InfoPrj.get(id);
}
@@ -1892,7 +1892,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Infos map.
* @throws IgniteCheckedException If failed.
*/
- private Map<IgniteUuid, IgfsFileInfo> getInfos(Collection<IgniteUuid> ids) throws IgniteCheckedException {
+ private Map<IgniteUuid, IgfsEntryInfo> getInfos(Collection<IgniteUuid> ids) throws IgniteCheckedException {
return id2InfoPrj.getAll(ids);
}
@@ -1936,7 +1936,7 @@ public class IgfsMetaManager extends IgfsManager {
private OutputStream out;
@Override public IgfsSecondaryOutputStreamDescriptor onSuccess(Map<IgfsPath,
- IgfsFileInfo> infos) throws Exception {
+ IgfsEntryInfo> infos) throws Exception {
validTxState(true);
assert !infos.isEmpty();
@@ -1951,7 +1951,7 @@ public class IgfsMetaManager extends IgfsManager {
assert parentPath != null;
- IgfsFileInfo parentInfo = infos.get(parentPath);
+ IgfsEntryInfo parentInfo = infos.get(parentPath);
// Delegate to the secondary file system.
out = simpleCreate ? fs.create(path, overwrite) :
@@ -1989,7 +1989,7 @@ public class IgfsMetaManager extends IgfsManager {
throw fsException("Failed to open output stream to the file created in " +
"the secondary file system because the path points to a directory: " + path);
- IgfsFileInfo newInfo = IgfsUtils.createFile(
+ IgfsEntryInfo newInfo = IgfsUtils.createFile(
IgniteUuid.randomUuid(),
status.blockSize(),
status.length(),
@@ -2005,7 +2005,7 @@ public class IgfsMetaManager extends IgfsManager {
IgniteUuid oldId = putIfAbsentNonTx(parentInfo.id(), path.name(), newInfo);
if (oldId != null) {
- IgfsFileInfo oldInfo = info(oldId);
+ IgfsEntryInfo oldInfo = info(oldId);
assert oldInfo != null; // Otherwise cache is in inconsistent state.
@@ -2081,10 +2081,10 @@ public class IgfsMetaManager extends IgfsManager {
private OutputStream out;
@Override public IgfsSecondaryOutputStreamDescriptor onSuccess(Map<IgfsPath,
- IgfsFileInfo> infos) throws Exception {
+ IgfsEntryInfo> infos) throws Exception {
validTxState(true);
- final IgfsFileInfo info = infos.get(path);
+ final IgfsEntryInfo info = infos.get(path);
if (info.isDirectory())
throw fsException("Failed to open output stream to the file in the " +
@@ -2117,7 +2117,7 @@ public class IgfsMetaManager extends IgfsManager {
}
// Set lock and return.
- IgfsFileInfo lockedInfo = invokeLock(info.id(), false);
+ IgfsEntryInfo lockedInfo = invokeLock(info.id(), false);
return new IgfsSecondaryOutputStreamDescriptor(infos.get(path.parent()).id(),
lockedInfo, out);
@@ -2163,7 +2163,7 @@ public class IgfsMetaManager extends IgfsManager {
assert path != null;
// First, try getting file info without any transactions and synchronization.
- IgfsFileInfo info = info(fileId(path));
+ IgfsEntryInfo info = info(fileId(path));
if (info != null) {
if (!info.isFile())
@@ -2177,8 +2177,8 @@ public class IgfsMetaManager extends IgfsManager {
SynchronizationTask<IgfsSecondaryInputStreamDescriptor> task =
new SynchronizationTask<IgfsSecondaryInputStreamDescriptor>() {
@Override public IgfsSecondaryInputStreamDescriptor onSuccess(
- Map<IgfsPath, IgfsFileInfo> infos) throws Exception {
- IgfsFileInfo info = infos.get(path);
+ Map<IgfsPath, IgfsEntryInfo> infos) throws Exception {
+ IgfsEntryInfo info = infos.get(path);
if (info == null)
throw fsException(new IgfsPathNotFoundException("File not found: " + path));
@@ -2217,7 +2217,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return File info or {@code null} if file not found.
* @throws IgniteCheckedException If sync task failed.
*/
- @Nullable public IgfsFileInfo synchronizeFileDual(final IgfsSecondaryFileSystem fs, final IgfsPath path)
+ @Nullable public IgfsEntryInfo synchronizeFileDual(final IgfsSecondaryFileSystem fs, final IgfsPath path)
throws IgniteCheckedException {
assert fs != null;
assert path != null;
@@ -2225,20 +2225,20 @@ public class IgfsMetaManager extends IgfsManager {
if (busyLock.enterBusy()) {
try {
// First, try getting file info without any transactions and synchronization.
- IgfsFileInfo info = info(fileId(path));
+ IgfsEntryInfo info = info(fileId(path));
if (info != null)
return info;
// If failed, try synchronize.
- SynchronizationTask<IgfsFileInfo> task =
- new SynchronizationTask<IgfsFileInfo>() {
- @Override public IgfsFileInfo onSuccess(Map<IgfsPath, IgfsFileInfo> infos)
+ SynchronizationTask<IgfsEntryInfo> task =
+ new SynchronizationTask<IgfsEntryInfo>() {
+ @Override public IgfsEntryInfo onSuccess(Map<IgfsPath, IgfsEntryInfo> infos)
throws Exception {
return infos.get(path);
}
- @Override public IgfsFileInfo onFailure(@Nullable Exception err) throws IgniteCheckedException {
+ @Override public IgfsEntryInfo onFailure(@Nullable Exception err) throws IgniteCheckedException {
throw new IgniteCheckedException("Failed to synchronize path due to secondary file " +
"system exception: " + path, err);
}
@@ -2280,7 +2280,7 @@ public class IgfsMetaManager extends IgfsManager {
final Deque<IgfsEvent> pendingEvts = new LinkedList<>();
SynchronizationTask<Boolean> task = new SynchronizationTask<Boolean>() {
- @Override public Boolean onSuccess(Map<IgfsPath, IgfsFileInfo> infos) throws Exception {
+ @Override public Boolean onSuccess(Map<IgfsPath, IgfsEntryInfo> infos) throws Exception {
fs.mkdirs(path, props);
assert !infos.isEmpty();
@@ -2295,7 +2295,7 @@ public class IgfsMetaManager extends IgfsManager {
assert parentPath != null;
- IgfsFileInfo parentPathInfo = infos.get(parentPath);
+ IgfsEntryInfo parentPathInfo = infos.get(parentPath);
synchronize(fs, parentPath, parentPathInfo, path, true, null);
@@ -2364,11 +2364,11 @@ public class IgfsMetaManager extends IgfsManager {
final Collection<IgfsEvent> pendingEvts = new LinkedList<>();
SynchronizationTask<Boolean> task = new SynchronizationTask<Boolean>() {
- @Override public Boolean onSuccess(Map<IgfsPath, IgfsFileInfo> infos) throws Exception {
- IgfsFileInfo srcInfo = infos.get(src);
- IgfsFileInfo srcParentInfo = infos.get(src.parent());
- IgfsFileInfo destInfo = infos.get(dest);
- IgfsFileInfo destParentInfo = dest.parent() != null ? infos.get(dest.parent()) : null;
+ @Override public Boolean onSuccess(Map<IgfsPath, IgfsEntryInfo> infos) throws Exception {
+ IgfsEntryInfo srcInfo = infos.get(src);
+ IgfsEntryInfo srcParentInfo = infos.get(src.parent());
+ IgfsEntryInfo destInfo = infos.get(dest);
+ IgfsEntryInfo destParentInfo = dest.parent() != null ? infos.get(dest.parent()) : null;
// Source path and destination (or destination parent) must exist.
if (srcInfo == null)
@@ -2458,8 +2458,8 @@ public class IgfsMetaManager extends IgfsManager {
final IgniteUuid trashId = IgfsUtils.randomTrashId();
SynchronizationTask<Boolean> task = new SynchronizationTask<Boolean>() {
- @Override public Boolean onSuccess(Map<IgfsPath, IgfsFileInfo> infos) throws Exception {
- IgfsFileInfo info = infos.get(path);
+ @Override public Boolean onSuccess(Map<IgfsPath, IgfsEntryInfo> infos) throws Exception {
+ IgfsEntryInfo info = infos.get(path);
if (info == null)
return false; // File doesn't exist in the secondary file system.
@@ -2516,7 +2516,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Update file info.
* @throws IgniteCheckedException If update failed.
*/
- public IgfsFileInfo updateDual(final IgfsSecondaryFileSystem fs, final IgfsPath path,
+ public IgfsEntryInfo updateDual(final IgfsSecondaryFileSystem fs, final IgfsPath path,
final Map<String, String> props) throws IgniteCheckedException {
assert fs != null;
assert path != null;
@@ -2524,8 +2524,8 @@ public class IgfsMetaManager extends IgfsManager {
if (busyLock.enterBusy()) {
try {
- SynchronizationTask<IgfsFileInfo> task = new SynchronizationTask<IgfsFileInfo>() {
- @Override public IgfsFileInfo onSuccess(Map<IgfsPath, IgfsFileInfo> infos) throws Exception {
+ SynchronizationTask<IgfsEntryInfo> task = new SynchronizationTask<IgfsEntryInfo>() {
+ @Override public IgfsEntryInfo onSuccess(Map<IgfsPath, IgfsEntryInfo> infos) throws Exception {
if (infos.get(path) == null)
return null;
@@ -2534,7 +2534,7 @@ public class IgfsMetaManager extends IgfsManager {
return updatePropertiesNonTx(infos.get(path).id(), props);
}
- @Override public IgfsFileInfo onFailure(@Nullable Exception err) throws IgniteCheckedException {
+ @Override public IgfsEntryInfo onFailure(@Nullable Exception err) throws IgniteCheckedException {
U.error(log, "Path update in DUAL mode failed [path=" + path + ", properties=" + props + ']',
err);
@@ -2565,12 +2565,12 @@ public class IgfsMetaManager extends IgfsManager {
* @return File info of the end path.
* @throws IgniteCheckedException If failed.
*/
- private IgfsFileInfo synchronize(IgfsSecondaryFileSystem fs,
+ private IgfsEntryInfo synchronize(IgfsSecondaryFileSystem fs,
IgfsPath startPath,
- IgfsFileInfo startPathInfo,
+ IgfsEntryInfo startPathInfo,
IgfsPath endPath,
boolean strict,
- @Nullable Map<IgfsPath, IgfsFileInfo> created)
+ @Nullable Map<IgfsPath, IgfsEntryInfo> created)
throws IgniteCheckedException
{
assert fs != null;
@@ -2578,7 +2578,7 @@ public class IgfsMetaManager extends IgfsManager {
validTxState(true);
- IgfsFileInfo parentInfo = startPathInfo;
+ IgfsEntryInfo parentInfo = startPathInfo;
List<String> components = endPath.components();
@@ -2619,7 +2619,7 @@ public class IgfsMetaManager extends IgfsManager {
}
// Recreate the path locally.
- IgfsFileInfo curInfo = status.isDirectory() ?
+ IgfsEntryInfo curInfo = status.isDirectory() ?
IgfsUtils.createDirectory(
IgniteUuid.randomUuid(),
null,
@@ -2767,7 +2767,7 @@ public class IgfsMetaManager extends IgfsManager {
lockArr[idx++] = id;
}
- Map<IgniteUuid, IgfsFileInfo> idToInfo = lockIds(lockArr);
+ Map<IgniteUuid, IgfsEntryInfo> idToInfo = lockIds(lockArr);
if (extraLockIds != null) {
for (IgniteUuid id : extraLockIds)
@@ -2810,9 +2810,9 @@ public class IgfsMetaManager extends IgfsManager {
continue; // Release all locks and try again.
else {
// Perform synchronization.
- Map<IgfsPath, IgfsFileInfo> infos = new HashMap<>();
+ Map<IgfsPath, IgfsEntryInfo> infos = new HashMap<>();
- TreeMap<IgfsPath, IgfsFileInfo> created = new TreeMap<>();
+ TreeMap<IgfsPath, IgfsEntryInfo> created = new TreeMap<>();
for (IgfsPath path : paths) {
IgfsPath parentPath = path.parent();
@@ -2829,7 +2829,7 @@ public class IgfsMetaManager extends IgfsManager {
assert firstParentPath != null;
assert pathToId.get(firstParentPath) != null;
- IgfsFileInfo info = synchronize(fs,
+ IgfsEntryInfo info = synchronize(fs,
firstParentPath,
idToInfo.get(pathToId.get(firstParentPath)),
path,
@@ -2947,15 +2947,15 @@ public class IgfsMetaManager extends IgfsManager {
IgniteInternalTx tx = startTx();
try {
- Map<IgniteUuid, IgfsFileInfo> infoMap = lockIds(fileId, parentId);
+ Map<IgniteUuid, IgfsEntryInfo> infoMap = lockIds(fileId, parentId);
- IgfsFileInfo fileInfo = infoMap.get(fileId);
+ IgfsEntryInfo fileInfo = infoMap.get(fileId);
if (fileInfo == null)
throw fsException(new IgfsPathNotFoundException("Failed to update times " +
"(path was not found): " + fileName));
- IgfsFileInfo parentInfo = infoMap.get(parentId);
+ IgfsEntryInfo parentInfo = infoMap.get(parentId);
if (parentInfo == null)
throw fsException(new IgfsPathNotFoundException("Failed to update times " +
@@ -3015,7 +3015,7 @@ public class IgfsMetaManager extends IgfsManager {
* @return Task result.
* @throws Exception If failed.
*/
- public T onSuccess(Map<IgfsPath, IgfsFileInfo> infos) throws Exception;
+ public T onSuccess(Map<IgfsPath, IgfsEntryInfo> infos) throws Exception;
/**
* Callback handler in case synchronization failed.
@@ -3041,7 +3041,7 @@ public class IgfsMetaManager extends IgfsManager {
private IgfsPath parentPath;
/** Parent path info. */
- private IgfsFileInfo parentInfo;
+ private IgfsEntryInfo parentInfo;
/**
* Constructor.
@@ -3051,7 +3051,7 @@ public class IgfsMetaManager extends IgfsManager {
* @param parentPath Parent path.
* @param parentInfo Parent info.
*/
- PathDescriptor(IgfsPath path, List<IgniteUuid> ids, IgfsPath parentPath, IgfsFileInfo parentInfo) {
+ PathDescriptor(IgfsPath path, List<IgniteUuid> ids, IgfsPath parentPath, IgfsEntryInfo parentInfo) {
assert path != null;
assert ids != null && !ids.isEmpty();
assert parentPath == null && parentInfo == null || parentPath != null && parentInfo != null;
@@ -3088,7 +3088,7 @@ public class IgfsMetaManager extends IgfsManager {
* @param newParentPath New parent path.
* @param newParentInfo New parent info.
*/
- private void updateParent(IgfsPath newParentPath, IgfsFileInfo newParentInfo) {
+ private void updateParent(IgfsPath newParentPath, IgfsEntryInfo newParentInfo) {
assert newParentPath != null;
assert newParentInfo != null;
assert path.isSubDirectoryOf(newParentPath);
@@ -3113,7 +3113,7 @@ public class IgfsMetaManager extends IgfsManager {
*
* @return Parent path info.
*/
- private IgfsFileInfo parentInfo() {
+ private IgfsEntryInfo parentInfo() {
return parentInfo;
}
}
@@ -3122,7 +3122,7 @@ public class IgfsMetaManager extends IgfsManager {
* Remove entry from directory listing.
*/
@GridInternal
- private static final class ListingRemoveProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, Void>,
+ private static final class ListingRemoveProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -3152,9 +3152,9 @@ public class IgfsMetaManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public Void process(MutableEntry<IgniteUuid, IgfsFileInfo> e, Object... args)
+ @Override public Void process(MutableEntry<IgniteUuid, IgfsEntryInfo> e, Object... args)
throws EntryProcessorException {
- IgfsFileInfo fileInfo = e.getValue();
+ IgfsEntryInfo fileInfo = e.getValue();
assert fileInfo != null;
assert fileInfo.isDirectory();
@@ -3194,7 +3194,7 @@ public class IgfsMetaManager extends IgfsManager {
* Update directory listing closure.
*/
@GridInternal
- private static final class ListingAddProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, Void>,
+ private static final class ListingAddProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -3228,8 +3228,8 @@ public class IgfsMetaManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public Void process(MutableEntry<IgniteUuid, IgfsFileInfo> e, Object... args) {
- IgfsFileInfo fileInfo = e.getValue();
+ @Override public Void process(MutableEntry<IgniteUuid, IgfsEntryInfo> e, Object... args) {
+ IgfsEntryInfo fileInfo = e.getValue();
assert fileInfo != null : "File info not found for the child: " + entry.fileId();
assert fileInfo.isDirectory();
@@ -3271,7 +3271,7 @@ public class IgfsMetaManager extends IgfsManager {
* Update path closure.
*/
@GridInternal
- private static final class UpdatePathProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, Void>,
+ private static final class UpdatePathProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -3294,10 +3294,10 @@ public class IgfsMetaManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public Void process(MutableEntry<IgniteUuid, IgfsFileInfo> e, Object... args) {
- IgfsFileInfo info = e.getValue();
+ @Override public Void process(MutableEntry<IgniteUuid, IgfsEntryInfo> e, Object... args) {
+ IgfsEntryInfo info = e.getValue();
- IgfsFileInfo newInfo = info.path(path);
+ IgfsEntryInfo newInfo = info.path(path);
e.setValue(newInfo);
@@ -3332,7 +3332,7 @@ public class IgfsMetaManager extends IgfsManager {
* @param simpleCreate Whether new file should be created in secondary FS using create(Path, boolean) method.
* @return Tuple containing the created file info and its parent id.
*/
- IgniteBiTuple<IgfsFileInfo, IgniteUuid> create(
+ IgniteBiTuple<IgfsEntryInfo, IgniteUuid> create(
final IgfsPath path,
final boolean append,
final boolean overwrite,
@@ -3365,7 +3365,7 @@ public class IgfsMetaManager extends IgfsManager {
// may need to delete the old file:
b.idSet.add(trashId);
- final Map<IgniteUuid, IgfsFileInfo> lockedInfos = lockIds(b.idSet);
+ final Map<IgniteUuid, IgfsEntryInfo> lockedInfos = lockIds(b.idSet);
assert !overwrite || lockedInfos.get(trashId) != null; // TRASH must exist at this point.
@@ -3373,7 +3373,7 @@ public class IgfsMetaManager extends IgfsManager {
// starting from taking the path ids.
if (verifyPathIntegrity(b.existingPath, b.idList, lockedInfos)) {
// Locked path okay, trying to proceed with the remainder creation.
- final IgfsFileInfo lowermostExistingInfo = lockedInfos.get(b.lowermostExistingId);
+ final IgfsEntryInfo lowermostExistingInfo = lockedInfos.get(b.lowermostExistingId);
if (b.existingIdCnt == b.components.size() + 1) {
// Full requestd path exists.
@@ -3401,9 +3401,9 @@ public class IgfsMetaManager extends IgfsManager {
+ "[fileName=" + name + ", fileId=" + lowermostExistingInfo.id()
+ ", lockId=" + lockId + ']');
- IgfsFileInfo lockedInfo = invokeLock(lowermostExistingInfo.id(), false);
+ IgfsEntryInfo lockedInfo = invokeLock(lowermostExistingInfo.id(), false);
- IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = new T2<>(lockedInfo, parentId);
+ IgniteBiTuple<IgfsEntryInfo, IgniteUuid> t2 = new T2<>(lockedInfo, parentId);
tx.commit();
@@ -3434,7 +3434,7 @@ public class IgfsMetaManager extends IgfsManager {
// Make a new locked info:
long t = System.currentTimeMillis();
- final IgfsFileInfo newFileInfo = IgfsUtils.createFile(
+ final IgfsEntryInfo newFileInfo = IgfsUtils.createFile(
IgniteUuid.randomUuid(),
cfg.getBlockSize(),
0L,
@@ -3450,7 +3450,7 @@ public class IgfsMetaManager extends IgfsManager {
createNewEntry(newFileInfo, parentId, name);
- IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = new T2<>(newFileInfo, parentId);
+ IgniteBiTuple<IgfsEntryInfo, IgniteUuid> t2 = new T2<>(newFileInfo, parentId);
tx.commit();
@@ -3483,7 +3483,7 @@ public class IgfsMetaManager extends IgfsManager {
assert b.leafInfo != null;
assert b.leafParentId != null;
- IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = new T2<>(b.leafInfo, b.leafParentId);
+ IgniteBiTuple<IgfsEntryInfo, IgniteUuid> t2 = new T2<>(b.leafInfo, b.leafParentId);
tx.commit();
@@ -3535,7 +3535,7 @@ public class IgfsMetaManager extends IgfsManager {
private final IgfsPath existingPath;
/** The created leaf info. */
- private IgfsFileInfo leafInfo;
+ private IgfsEntryInfo leafInfo;
/** The leaf parent id. */
private IgniteUuid leafParentId;
@@ -3726,7 +3726,7 @@ public class IgfsMetaManager extends IgfsManager {
/**
* File create processor.
*/
- private static class FileCreateProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, IgfsFileInfo>,
+ private static class FileCreateProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -3777,9 +3777,9 @@ public class IgfsMetaManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public IgfsFileInfo process(MutableEntry<IgniteUuid, IgfsFileInfo> entry, Object... args)
+ @Override public IgfsEntryInfo process(MutableEntry<IgniteUuid, IgfsEntryInfo> entry, Object... args)
throws EntryProcessorException {
- IgfsFileInfo info = IgfsUtils.createFile(
+ IgfsEntryInfo info = IgfsUtils.createFile(
entry.getKey(),
blockSize,
0L,
@@ -3820,7 +3820,7 @@ public class IgfsMetaManager extends IgfsManager {
/**
* Directory create processor.
*/
- private static class DirectoryCreateProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, IgfsFileInfo>,
+ private static class DirectoryCreateProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -3871,10 +3871,10 @@ public class IgfsMetaManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public IgfsFileInfo process(MutableEntry<IgniteUuid, IgfsFileInfo> entry, Object... args)
+ @Override public IgfsEntryInfo process(MutableEntry<IgniteUuid, IgfsEntryInfo> entry, Object... args)
throws EntryProcessorException {
- IgfsFileInfo info = IgfsUtils.createDirectory(
+ IgfsEntryInfo info = IgfsUtils.createDirectory(
entry.getKey(),
null,
props,
@@ -3920,7 +3920,7 @@ public class IgfsMetaManager extends IgfsManager {
/**
* File lock entry processor.
*/
- private static class FileLockProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, IgfsFileInfo>,
+ private static class FileLockProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -3945,11 +3945,11 @@ public class IgfsMetaManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public IgfsFileInfo process(MutableEntry<IgniteUuid, IgfsFileInfo> entry, Object... args)
+ @Override public IgfsEntryInfo process(MutableEntry<IgniteUuid, IgfsEntryInfo> entry, Object... args)
throws EntryProcessorException {
- IgfsFileInfo oldInfo = entry.getValue();
+ IgfsEntryInfo oldInfo = entry.getValue();
- IgfsFileInfo newInfo = oldInfo.lock(lockId);
+ IgfsEntryInfo newInfo = oldInfo.lock(lockId);
entry.setValue(newInfo);
@@ -3970,7 +3970,7 @@ public class IgfsMetaManager extends IgfsManager {
/**
* File unlock entry processor.
*/
- private static class FileUnlockProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, Void>,
+ private static class FileUnlockProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -3995,9 +3995,9 @@ public class IgfsMetaManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public Void process(MutableEntry<IgniteUuid, IgfsFileInfo> entry, Object... args)
+ @Override public Void process(MutableEntry<IgniteUuid, IgfsEntryInfo> entry, Object... args)
throws EntryProcessorException {
- IgfsFileInfo old = entry.getValue();
+ IgfsEntryInfo old = entry.getValue();
entry.setValue(old.unlock(modificationTime));
@@ -4018,7 +4018,7 @@ public class IgfsMetaManager extends IgfsManager {
/**
* File reserve space entry processor.
*/
- private static class FileReserveSpaceProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, IgfsFileInfo>,
+ private static class FileReserveSpaceProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -4048,15 +4048,15 @@ public class IgfsMetaManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public IgfsFileInfo process(MutableEntry<IgniteUuid, IgfsFileInfo> entry, Object... args)
+ @Override public IgfsEntryInfo process(MutableEntry<IgniteUuid, IgfsEntryInfo> entry, Object... args)
throws EntryProcessorException {
- IgfsFileInfo oldInfo = entry.getValue();
+ IgfsEntryInfo oldInfo = entry.getValue();
IgfsFileMap newMap = new IgfsFileMap(oldInfo.fileMap());
newMap.addRange(affRange);
- IgfsFileInfo newInfo = oldInfo.length(oldInfo.length() + space).fileMap(newMap);
+ IgfsEntryInfo newInfo = oldInfo.length(oldInfo.length() + space).fileMap(newMap);
entry.setValue(newInfo);
@@ -4079,7 +4079,7 @@ public class IgfsMetaManager extends IgfsManager {
/**
* Update properties processor.
*/
- private static class UpdatePropertiesProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, IgfsFileInfo>,
+ private static class UpdatePropertiesProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -4104,9 +4104,9 @@ public class IgfsMetaManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public IgfsFileInfo process(MutableEntry<IgniteUuid, IgfsFileInfo> entry, Object... args)
+ @Override public IgfsEntryInfo process(MutableEntry<IgniteUuid, IgfsEntryInfo> entry, Object... args)
throws EntryProcessorException {
- IgfsFileInfo oldInfo = entry.getValue();
+ IgfsEntryInfo oldInfo = entry.getValue();
Map<String, String> tmp = oldInfo.properties();
@@ -4121,7 +4121,7 @@ public class IgfsMetaManager extends IgfsManager {
tmp.put(e.getKey(), e.getValue());
}
- IgfsFileInfo newInfo = oldInfo.properties(tmp);
+ IgfsEntryInfo newInfo = oldInfo.properties(tmp);
entry.setValue(newInfo);
@@ -4142,7 +4142,7 @@ public class IgfsMetaManager extends IgfsManager {
/**
* Update times entry processor.
*/
- private static class UpdateTimesProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, Void>,
+ private static class UpdateTimesProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, Void>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -4172,10 +4172,10 @@ public class IgfsMetaManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public Void process(MutableEntry<IgniteUuid, IgfsFileInfo> entry, Object... args)
+ @Override public Void process(MutableEntry<IgniteUuid, IgfsEntryInfo> entry, Object... args)
throws EntryProcessorException {
- IgfsFileInfo oldInfo = entry.getValue();
+ IgfsEntryInfo oldInfo = entry.getValue();
entry.setValue(oldInfo.accessModificationTime(accessTime, modificationTime));
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
index 3bf1011..d7fa122 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsOutputStreamImpl.java
@@ -17,10 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.DataInput;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.igfs.IgfsException;
import org.apache.ignite.igfs.IgfsMode;
@@ -33,9 +29,12 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC;
-import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
-import static org.apache.ignite.igfs.IgfsMode.PROXY;
+import java.io.DataInput;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static org.apache.ignite.igfs.IgfsMode.*;
/**
* Output stream to store data into grid cache with separate blocks.
@@ -55,7 +54,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
/** File descriptor. */
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
- private IgfsFileInfo fileInfo;
+ private IgfsEntryInfo fileInfo;
/** Parent ID. */
private final IgniteUuid parentId;
@@ -102,7 +101,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
* @param batch Optional secondary file system batch.
* @param metrics Local IGFS metrics.
*/
- IgfsOutputStreamImpl(IgfsContext igfsCtx, IgfsPath path, IgfsFileInfo fileInfo, IgniteUuid parentId,
+ IgfsOutputStreamImpl(IgfsContext igfsCtx, IgfsPath path, IgfsEntryInfo fileInfo, IgniteUuid parentId,
int bufSize, IgfsMode mode, @Nullable IgfsFileWorkerBatch batch, IgfsLocalMetrics metrics) {
super(path, optimizeBufferSize(bufSize, fileInfo));
@@ -143,7 +142,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
* @return Optimized buffer size.
*/
@SuppressWarnings("IfMayBeConditional")
- private static int optimizeBufferSize(int bufSize, IgfsFileInfo fileInfo) {
+ private static int optimizeBufferSize(int bufSize, IgfsEntryInfo fileInfo) {
assert bufSize > 0;
if (fileInfo == null)
@@ -292,7 +291,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
if (space > 0) {
data.awaitAllAcksReceived(fileInfo.id());
- IgfsFileInfo fileInfo0 = meta.reserveSpace(path, fileInfo.id(), space, streamRange);
+ IgfsEntryInfo fileInfo0 = meta.reserveSpace(path, fileInfo.id(), space, streamRange);
if (fileInfo0 == null)
throw new IOException("File was concurrently deleted: " + path);
@@ -407,7 +406,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStreamAdapter {
* @param fileInfo File info to build initial range for.
* @return Affinity range.
*/
- private IgfsFileAffinityRange initialStreamRange(IgfsFileInfo fileInfo) {
+ private IgfsFileAffinityRange initialStreamRange(IgfsEntryInfo fileInfo) {
if (!igfsCtx.configuration().isFragmentizerEnabled())
return null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryInputStreamDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryInputStreamDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryInputStreamDescriptor.java
index 54c0525..76d6be8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryInputStreamDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryInputStreamDescriptor.java
@@ -24,7 +24,7 @@ import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadabl
*/
public class IgfsSecondaryInputStreamDescriptor {
/** File info in the primary file system. */
- private final IgfsFileInfo info;
+ private final IgfsEntryInfo info;
/** Secondary file system input stream wrapper. */
private final IgfsSecondaryFileSystemPositionedReadable secReader;
@@ -35,7 +35,7 @@ public class IgfsSecondaryInputStreamDescriptor {
* @param info File info in the primary file system.
* @param secReader Secondary file system reader.
*/
- IgfsSecondaryInputStreamDescriptor(IgfsFileInfo info, IgfsSecondaryFileSystemPositionedReadable secReader) {
+ IgfsSecondaryInputStreamDescriptor(IgfsEntryInfo info, IgfsSecondaryFileSystemPositionedReadable secReader) {
assert info != null;
assert secReader != null;
@@ -46,7 +46,7 @@ public class IgfsSecondaryInputStreamDescriptor {
/**
* @return File info in the primary file system.
*/
- IgfsFileInfo info() {
+ IgfsEntryInfo info() {
return info;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryOutputStreamDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryOutputStreamDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryOutputStreamDescriptor.java
index dd6372f..507ccfc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryOutputStreamDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsSecondaryOutputStreamDescriptor.java
@@ -17,9 +17,10 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.OutputStream;
import org.apache.ignite.lang.IgniteUuid;
+import java.io.OutputStream;
+
/**
* Descriptor of an output stream opened to the secondary file system.
*/
@@ -28,7 +29,7 @@ public class IgfsSecondaryOutputStreamDescriptor {
private final IgniteUuid parentId;
/** File info in the primary file system. */
- private final IgfsFileInfo info;
+ private final IgfsEntryInfo info;
/** Output stream to the secondary file system. */
private final OutputStream out;
@@ -40,7 +41,7 @@ public class IgfsSecondaryOutputStreamDescriptor {
* @param info File info in the primary file system.
* @param out Output stream to the secondary file system.
*/
- IgfsSecondaryOutputStreamDescriptor(IgniteUuid parentId, IgfsFileInfo info, OutputStream out) {
+ IgfsSecondaryOutputStreamDescriptor(IgniteUuid parentId, IgfsEntryInfo info, OutputStream out) {
assert parentId != null;
assert info != null;
assert out != null;
@@ -60,7 +61,7 @@ public class IgfsSecondaryOutputStreamDescriptor {
/**
* @return File info in the primary file system.
*/
- IgfsFileInfo info() {
+ IgfsEntryInfo info() {
return info;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
index db04612..bd3c0b8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java
@@ -17,11 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.lang.reflect.Constructor;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ThreadLocalRandom;
-
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSystemProperties;
@@ -44,9 +39,14 @@ import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.transactions.Transaction;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_CACHE_RETRIES_COUNT;
-import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
-import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+import java.lang.reflect.Constructor;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
+
+import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import static org.apache.ignite.transactions.TransactionIsolation.*;
/**
* Common IGFS utility methods.
@@ -261,7 +261,7 @@ public class IgfsUtils {
* @param id ID.
* @return File info.
*/
- public static IgfsFileInfo createDirectory(IgniteUuid id) {
+ public static IgfsDirectoryInfo createDirectory(IgniteUuid id) {
return createDirectory(id, null, null);
}
@@ -273,7 +273,7 @@ public class IgfsUtils {
* @param props Properties.
* @return File info.
*/
- public static IgfsFileInfo createDirectory(
+ public static IgfsDirectoryInfo createDirectory(
IgniteUuid id,
@Nullable Map<String, IgfsListingEntry> listing,
@Nullable Map<String, String> props) {
@@ -292,13 +292,13 @@ public class IgfsUtils {
* @param modificationTime Modification time.
* @return File info.
*/
- public static IgfsFileInfo createDirectory(
+ public static IgfsDirectoryInfo createDirectory(
IgniteUuid id,
@Nullable Map<String, IgfsListingEntry> listing,
@Nullable Map<String,String> props,
long createTime,
long modificationTime) {
- return new IgfsFileInfo(true, id, 0, 0, null, listing, props, null, null, createTime, modificationTime, false);
+ return new IgfsDirectoryInfo(id, listing, props, createTime, modificationTime);
}
/**
@@ -318,7 +318,7 @@ public class IgfsUtils {
public static IgfsFileInfo createFile(IgniteUuid id, int blockSize, long len, @Nullable IgniteUuid affKey,
@Nullable IgniteUuid lockId, boolean evictExclude, @Nullable Map<String, String> props, long accessTime,
long modificationTime) {
- return new IgfsFileInfo(false, id, blockSize, len, affKey, null, props, null, lockId,
- accessTime, modificationTime, evictExclude);
+ return new IgfsFileInfo(id, blockSize, len, affKey, props, null, lockId, accessTime, modificationTime,
+ evictExclude);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
index 22f427a..70a6666 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
@@ -22,8 +22,8 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.FileSystemConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.processors.igfs.IgfsCommonAbstractTest;
+import org.apache.ignite.internal.processors.igfs.IgfsEntryInfo;
import org.apache.ignite.internal.processors.igfs.IgfsEx;
-import org.apache.ignite.internal.processors.igfs.IgfsFileInfo;
import org.apache.ignite.internal.processors.igfs.IgfsMetaManager;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
@@ -31,9 +31,8 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
/**
* Fragmentizer abstract self test.
@@ -139,7 +138,7 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
if (fileId == null)
throw new IgfsPathNotFoundException("File not found: " + path);
- IgfsFileInfo fileInfo = meta.info(fileId);
+ IgfsEntryInfo fileInfo = meta.info(fileId);
do {
if (fileInfo == null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/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 52d8bd5..7e1a97a 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
@@ -17,27 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CyclicBarrier;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
@@ -79,15 +58,33 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMemoryMode.ONHEAP_TIERED;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
-import static org.apache.ignite.igfs.IgfsMode.PROXY;
-import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_GROUP_NAME;
-import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_PERMISSION;
-import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_USER_NAME;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMemoryMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.igfs.IgfsMode.*;
+import static org.apache.ignite.internal.processors.igfs.IgfsEx.*;
/**
* Test fo regular igfs operations.
@@ -3099,7 +3096,7 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest {
* @param igfs The IGFS instance.
* @return The data cache.
*/
- protected static GridCacheAdapter<IgniteUuid, IgfsFileInfo> getMetaCache(IgniteFileSystem igfs) {
+ protected static GridCacheAdapter<IgniteUuid, IgfsEntryInfo> getMetaCache(IgniteFileSystem igfs) {
String dataCacheName = igfs.configuration().getMetaCacheName();
IgniteEx igniteEx = ((IgfsEx)igfs).context().kernalContext().grid();
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
index 2af4cc3..03b1232 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
@@ -17,12 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.nio.ByteBuffer;
-import java.security.SecureRandom;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.concurrent.Callable;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
@@ -44,10 +38,16 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-import static org.apache.ignite.testframework.GridTestUtils.sleepAndIncrement;
+import java.nio.ByteBuffer;
+import java.security.SecureRandom;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.concurrent.Callable;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.testframework.GridTestUtils.*;
/**
* {@link IgfsDataManager} test case.
@@ -168,7 +168,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
- IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), 200, 0L, null,
+ IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), 200, 0L, null,
IgfsUtils.DELETE_LOCK_ID, false, null, t, t);
assertNull(mgr.dataBlock(info, path, 0, null).get());
@@ -253,7 +253,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
- IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 0L, null,
+ IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 0L, null,
IgfsUtils.DELETE_LOCK_ID, false, null, t, t);
assertNull(mgr.dataBlock(info, path, 0, null).get());
@@ -344,7 +344,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
- IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 0L, null,
+ IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 0L, null,
IgfsUtils.DELETE_LOCK_ID, false, null, t, t);
IgfsFileAffinityRange range = new IgfsFileAffinityRange();
@@ -415,7 +415,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
//IgfsFileInfo info = new IgfsFileInfo(blockSize, 0);
- IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
+ IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
null, t, t);
for (int pos = 0; pos < 5 * grpSize; pos++) {
@@ -466,7 +466,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
- IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
+ IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
null, t, t);
Collection<IgfsBlockLocation> affinity = mgr.affinity(info, 0, info.length());
@@ -500,7 +500,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
long t = System.currentTimeMillis();
- IgfsFileInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
+ IgfsEntryInfo info = IgfsUtils.createFile(IgniteUuid.randomUuid(), blockSize, 1024 * 1024, null, null, false,
null, t, t);
IgniteUuid affKey = IgniteUuid.randomUuid();
@@ -544,7 +544,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
* @param info File info.
* @param affinity Affinity block locations to check.
*/
- private void checkAffinity(int blockSize, IgfsFileInfo info, Iterable<IgfsBlockLocation> affinity) {
+ private void checkAffinity(int blockSize, IgfsEntryInfo info, Iterable<IgfsBlockLocation> affinity) {
for (IgfsBlockLocation loc : affinity) {
info("Going to check IGFS block location: " + loc);
@@ -576,7 +576,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
* @param data Data to store.
* @param msg Expected failure message.
*/
- private void expectsStoreFail(final IgfsFileInfo reserved, final byte[] data, @Nullable String msg) {
+ private void expectsStoreFail(final IgfsEntryInfo reserved, final byte[] data, @Nullable String msg) {
GridTestUtils.assertThrows(log, new Callable() {
@Override public Object call() throws Exception {
IgfsFileAffinityRange range = new IgfsFileAffinityRange();
@@ -594,7 +594,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
* @param fileInfo File to delete data for.
* @param msg Expected failure message.
*/
- private void expectsDeleteFail(final IgfsFileInfo fileInfo, @Nullable String msg) {
+ private void expectsDeleteFail(final IgfsEntryInfo fileInfo, @Nullable String msg) {
GridTestUtils.assertThrows(log, new Callable() {
@Override public Object call() throws Exception {
mgr.delete(fileInfo);
@@ -612,7 +612,7 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
* @param len File part length to get affinity for.
* @param msg Expected failure message.
*/
- private void expectsAffinityFail(final IgfsFileInfo info, final long start, final long len,
+ private void expectsAffinityFail(final IgfsEntryInfo info, final long start, final long len,
@Nullable String msg) {
GridTestUtils.assertThrows(log, new Callable() {
@Override public Object call() throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/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 0731436..8079563 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
@@ -17,13 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CyclicBarrier;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.igfs.IgfsFile;
@@ -36,9 +29,16 @@ import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
-import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC;
-import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC;
-import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_PERMISSION;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CyclicBarrier;
+
+import static org.apache.ignite.igfs.IgfsMode.*;
+import static org.apache.ignite.internal.processors.igfs.IgfsEx.*;
/**
* Tests for IGFS working in mode when remote file system exists: DUAL_SYNC, DUAL_ASYNC.
@@ -1254,7 +1254,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest {
// Wait for a while for prefetch to finish.
IgfsMetaManager meta = igfs.context().meta();
- IgfsFileInfo info = meta.info(meta.fileId(FILE));
+ IgfsEntryInfo info = meta.info(meta.fileId(FILE));
assert info != null;
[2/6] ignite git commit: WIP on refactoring.
Posted by vo...@apache.org.
WIP on refactoring.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12be73ee
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12be73ee
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12be73ee
Branch: refs/heads/ignite-2813
Commit: 12be73eeb4f7ef642dfaf001c26786ba02e92744
Parents: 4de5a4e
Author: thatcoach <pp...@list.ru>
Authored: Wed Mar 16 21:55:58 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Wed Mar 16 21:55:58 2016 +0300
----------------------------------------------------------------------
.../processors/igfs/IgfsDirectoryInfo.java | 362 ++++++++++++++++++-
.../internal/processors/igfs/IgfsEntryInfo.java | 15 +
.../internal/processors/igfs/IgfsFileInfo.java | 14 +-
3 files changed, 378 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/12be73ee/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
index 06cf555..dc5478f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
@@ -17,29 +17,387 @@
package org.apache.ignite.internal.processors.igfs;
+import org.apache.ignite.igfs.IgfsPath;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+import org.jetbrains.annotations.Nullable;
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.Map;
/**
* IGFS directory info.
*/
-public class IgfsDirectoryInfo extends IgfsEntryInfo implements Externalizable {
+public class IgfsDirectoryInfo extends IgfsEntryInfo {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /** File length in bytes. */
+ private long len;
+
+ /** File block size, {@code zero} for directories. */
+ private int blockSize;
+
+ /** File lock ID. */
+ private IgniteUuid lockId;
+
+ /** Affinity key used for single-node file collocation. */
+ private IgniteUuid affKey;
+
+ /** File affinity map. */
+ private IgfsFileMap fileMap;
+
+ /** Directory listing. */
+ @GridToStringInclude
+ private Map<String, IgfsListingEntry> listing;
+
+ /** Whether data blocks of this entry should never be excluded. */
+ private boolean evictExclude;
+
/**
- * Default constructor.
+ * {@link Externalizable} support.
*/
public IgfsDirectoryInfo() {
// No-op.
}
+ /**
+ * Update length.
+ *
+ * @param len New length.
+ * @return Updated file info.
+ */
+ public IgfsDirectoryInfo length(long len) {
+ IgfsDirectoryInfo res = copy();
+
+ res.len = len;
+
+ return res;
+ }
+
+ /**
+ * Update properties.
+ *
+ * @param props Properties.
+ * @return Updated file info.
+ */
+ public IgfsDirectoryInfo properties(@Nullable Map<String, String> props) {
+ IgfsDirectoryInfo res = copy();
+
+ res.props = props;
+
+ return res;
+ }
+
+ /**
+ * Update path.
+ *
+ * @param path Path.
+ * @return Updated file info.
+ */
+ public IgfsDirectoryInfo path(IgfsPath path) {
+ IgfsDirectoryInfo res = copy();
+
+ res.path = path;
+
+ return res;
+ }
+
+ /**
+ * Update listing.
+ *
+ * @param listing Listing.
+ * @return Updated file info.
+ */
+ public IgfsDirectoryInfo listing(@Nullable Map<String, IgfsListingEntry> listing) {
+ IgfsDirectoryInfo res = copy();
+
+ res.listing = listing;
+
+ return res;
+ }
+
+ /**
+ * Update access and modification time.
+ *
+ * @param accessTime Access time.
+ * @param modificationTime Modification time.
+ * @return Updated file info.
+ */
+ public IgfsDirectoryInfo accessModificationTime(long accessTime, long modificationTime) {
+ IgfsDirectoryInfo res = copy();
+
+ res.accessTime = accessTime;
+ res.modificationTime = modificationTime;
+
+ return res;
+ }
+
+ /**
+ * Lock file.
+ *
+ * @param lockId Lock ID.
+ * @return Update file info.
+ */
+ public IgfsDirectoryInfo lock(IgniteUuid lockId) {
+ assert lockId != null;
+ assert this.lockId == null;
+
+ IgfsDirectoryInfo res = copy();
+
+ res.lockId = lockId;
+
+ return res;
+ }
+
+ /**
+ * Unlock file.
+ *
+ * @param modificationTime Modification time.
+ * @return Updated file info.
+ */
+ public IgfsDirectoryInfo unlock(long modificationTime) {
+ IgfsDirectoryInfo res = copy();
+
+ res.lockId = null;
+ res.modificationTime = modificationTime;
+
+ return res;
+ }
+
+ /**
+ * Update file map.
+ *
+ * @param fileMap File affinity map.
+ * @return Updated file info.
+ */
+ public IgfsDirectoryInfo fileMap(IgfsFileMap fileMap) {
+ IgfsDirectoryInfo res = copy();
+
+ res.fileMap = fileMap;
+
+ return res;
+ }
+
+ /**
+ * Copy file info.
+ *
+ * @return Copy.
+ */
+ private IgfsDirectoryInfo copy() {
+ return new IgfsDirectoryInfo(isDirectory(), id, blockSize, len, affKey, listing, props,
+ fileMap(), lockId, accessTime, modificationTime, evictExclude);
+ }
+
+ /**
+ * Constructs file info.
+ *
+ * @param isDir Constructs directory info if {@code true} or file info if {@code false}.
+ * @param id ID or {@code null} to generate it automatically.
+ * @param blockSize Block size.
+ * @param len Size of a file.
+ * @param affKey Affinity key for data blocks.
+ * @param listing Directory listing.
+ * @param props File properties.
+ * @param fileMap File map.
+ * @param lockId Lock ID.
+ * @param accessTime Last access time.
+ * @param modificationTime Last modification time.
+ * @param evictExclude Evict exclude flag.
+ */
+ IgfsDirectoryInfo(boolean isDir, IgniteUuid id, int blockSize, long len, @Nullable IgniteUuid affKey,
+ @Nullable Map<String, IgfsListingEntry> listing, @Nullable Map<String, String> props,
+ @Nullable IgfsFileMap fileMap, @Nullable IgniteUuid lockId, long accessTime,
+ long modificationTime, boolean evictExclude) {
+ super(id, props, accessTime, modificationTime);
+
+ assert F.isEmpty(listing) || isDir;
+
+ if (isDir) {
+ assert len == 0 : "Directory length should be zero: " + len;
+ assert blockSize == 0 : "Directory block size should be zero: " + blockSize;
+ }
+ else {
+ assert len >= 0 : "File length cannot be negative: " + len;
+ assert blockSize > 0 : "File block size should be positive: " + blockSize;
+ }
+
+ this.len = isDir ? 0 : len;
+ this.blockSize = isDir ? 0 : blockSize;
+ this.affKey = affKey;
+ this.listing = listing;
+
+ if (fileMap == null && !isDir)
+ fileMap = new IgfsFileMap();
+
+ this.fileMap = fileMap;
+ this.lockId = lockId;
+ this.evictExclude = evictExclude;
+ }
+
+ /** {@inheritDoc} */
+ public boolean isFile() {
+ return false;
+ }
+
+ /**
+ * Get file size.
+ *
+ * @return File size.
+ */
+ public long length() {
+ assert isFile();
+
+ return len;
+ }
+
+ /**
+ * Get single data block size to store this file.
+ *
+ * @return Single data block size to store this file.
+ */
+ public int blockSize() {
+ assert isFile();
+
+ return blockSize;
+ }
+
+ /**
+ * @return Number of data blocks to store this file.
+ */
+ public long blocksCount() {
+ assert isFile();
+
+ return (len + blockSize() - 1) / blockSize();
+ }
+
+ /**
+ * @return Directory listing.
+ */
+ public Map<String, IgfsListingEntry> listing() {
+ return listing != null ? listing : Collections.<String, IgfsListingEntry>emptyMap();
+ }
+
+ /**
+ * @return {@code True} if at least one child exists.
+ */
+ public boolean hasChildren() {
+ return !F.isEmpty(listing);
+ }
+
+ /**
+ * @param name Child name.
+ * @return {@code True} if child with such name exists.
+ */
+ public boolean hasChild(String name) {
+ return listing != null && listing.containsKey(name);
+ }
+
+ /**
+ * @param name Child name.
+ * @param expId Expected child ID.
+ * @return {@code True} if child with such name exists.
+ */
+ public boolean hasChild(String name, IgniteUuid expId) {
+ if (listing != null) {
+ IgfsListingEntry entry = listing.get(name);
+
+ if (entry != null)
+ return F.eq(expId, entry.fileId());
+ }
+
+ return false;
+ }
+
+ /**
+ * @return Affinity key used for single-node file collocation. If {@code null}, usual
+ * mapper procedure is used for block affinity detection.
+ */
+ @Nullable public IgniteUuid affinityKey() {
+ return affKey;
+ }
+
+ /**
+ * @return File affinity map.
+ */
+ public IgfsFileMap fileMap() {
+ return fileMap;
+ }
+
+ /**
+ * Get lock ID.
+ *
+ * @return Lock ID if file is locked or {@code null} if file is free of locks.
+ */
+ @Nullable public IgniteUuid lockId() {
+ return lockId;
+ }
+
+ /**
+ * Get evict exclude flag.
+ *
+ * @return Evict exclude flag.
+ */
+ public boolean evictExclude() {
+ return evictExclude;
+ }
+
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
+ super.writeExternal(out);
+ out.writeInt(blockSize);
+ out.writeLong(len);
+ U.writeGridUuid(out, lockId);
+ U.writeGridUuid(out, affKey);
+ out.writeObject(listing);
+ out.writeObject(fileMap);
+ out.writeBoolean(evictExclude);
}
/** {@inheritDoc} */
+ @SuppressWarnings("unchecked")
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ super.readExternal(in);
+
+ blockSize = in.readInt();
+ len = in.readLong();
+ lockId = U.readGridUuid(in);
+ affKey = U.readGridUuid(in);
+ listing = (Map<String, IgfsListingEntry>)in.readObject();
+ fileMap = (IgfsFileMap)in.readObject();
+ evictExclude = in.readBoolean();
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return id.hashCode() ^ blockSize ^ (int)(len ^ (len >>> 32)) ^ (props == null ? 0 : props.hashCode()) ^
+ (lockId == null ? 0 : lockId.hashCode());
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object obj) {
+ if (obj == this)
+ return true;
+
+ if (obj == null || getClass() != obj.getClass())
+ return false;
+ IgfsDirectoryInfo that = (IgfsDirectoryInfo)obj;
+
+ return id.equals(that.id) && blockSize == that.blockSize && len == that.len && F.eq(affKey, that.affKey) &&
+ F.eq(props, that.props) && F.eq(lockId, that.lockId);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(IgfsDirectoryInfo.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/12be73ee/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
index 3412cc1..8e26cf3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
@@ -33,6 +33,9 @@ import java.util.Map;
* Base IGFS entry.
*/
public abstract class IgfsEntryInfo implements Externalizable {
+ /** */
+ private static final long serialVersionUID = 0L;
+
/** ID. */
protected IgniteUuid id;
@@ -112,6 +115,18 @@ public abstract class IgfsEntryInfo implements Externalizable {
return path;
}
+ /**
+ * @return {@code True} if this is a file.
+ */
+ public abstract boolean isFile();
+
+ /**
+ * @return {@code True} if this is a directory.
+ */
+ public boolean isDirectory() {
+ return !isFile();
+ }
+
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
U.writeGridUuid(out, id);
http://git-wip-us.apache.org/repos/asf/ignite/blob/12be73ee/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
index 9e046aa..0589c1a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
@@ -35,7 +35,7 @@ import java.util.Map;
/**
* IGFS file info.
*/
-public final class IgfsFileInfo extends IgfsEntryInfo implements Externalizable {
+public final class IgfsFileInfo extends IgfsEntryInfo {
/** */
private static final long serialVersionUID = 0L;
@@ -242,21 +242,13 @@ public final class IgfsFileInfo extends IgfsEntryInfo implements Externalizable
this.evictExclude = evictExclude;
}
- /**
- * @return {@code True} if this is a file.
- */
+ /** {@inheritDoc} */
public boolean isFile() {
+ // TODO: Cleanup.
return blockSize > 0;
}
/**
- * @return {@code True} if this is a directory.
- */
- public boolean isDirectory() {
- return blockSize == 0;
- }
-
- /**
* Get file size.
*
* @return File size.
[6/6] ignite git commit: Minor revert to GridAbstractTest.
Posted by vo...@apache.org.
Minor revert to GridAbstractTest.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e55866fd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e55866fd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e55866fd
Branch: refs/heads/ignite-2813
Commit: e55866fd0fdaba838eda335c82c9caa8c41a8302
Parents: 9480b0a
Author: thatcoach <pp...@list.ru>
Authored: Wed Mar 16 22:36:57 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Wed Mar 16 22:36:57 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/testframework/junits/GridAbstractTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e55866fd/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 7cedae1..96a9e8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -538,10 +538,10 @@ public abstract class GridAbstractTest extends TestCase {
}
try {
-// List<Integer> jvmIds = IgniteNodeRunner.killAll();
-//
-// if (!jvmIds.isEmpty())
-// log.info("Next processes of IgniteNodeRunner were killed: " + jvmIds);
+ List<Integer> jvmIds = IgniteNodeRunner.killAll();
+
+ if (!jvmIds.isEmpty())
+ log.info("Next processes of IgniteNodeRunner were killed: " + jvmIds);
beforeTestsStarted();
}
[5/6] ignite git commit: Main part of refactoring - applied new
scheme.
Posted by vo...@apache.org.
Main part of refactoring - applied new scheme.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9480b0a3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9480b0a3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9480b0a3
Branch: refs/heads/ignite-2813
Commit: 9480b0a308b9f8a607491e643cb0a4853e8f3d75
Parents: 12be73e
Author: thatcoach <pp...@list.ru>
Authored: Wed Mar 16 22:35:43 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Wed Mar 16 22:35:43 2016 +0300
----------------------------------------------------------------------
.../processors/igfs/IgfsDataManager.java | 110 +++----
.../processors/igfs/IgfsDeleteWorker.java | 31 +-
.../processors/igfs/IgfsDirectoryInfo.java | 271 +++-------------
.../internal/processors/igfs/IgfsEntryInfo.java | 158 +++++++++
.../internal/processors/igfs/IgfsFileImpl.java | 15 +-
.../internal/processors/igfs/IgfsFileInfo.java | 220 +++----------
.../igfs/IgfsFragmentizerManager.java | 26 +-
.../internal/processors/igfs/IgfsImpl.java | 28 +-
.../processors/igfs/IgfsInputStreamAdapter.java | 5 +-
.../processors/igfs/IgfsInputStreamImpl.java | 32 +-
.../processors/igfs/IgfsListingEntry.java | 12 +-
.../processors/igfs/IgfsMetaManager.java | 318 +++++++++----------
.../processors/igfs/IgfsOutputStreamImpl.java | 23 +-
.../IgfsSecondaryInputStreamDescriptor.java | 6 +-
.../IgfsSecondaryOutputStreamDescriptor.java | 9 +-
.../internal/processors/igfs/IgfsUtils.java | 28 +-
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 9 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 59 ++--
.../igfs/IgfsDataManagerSelfTest.java | 40 +--
.../igfs/IgfsDualAbstractSelfTest.java | 22 +-
.../processors/igfs/IgfsFileInfoSelfTest.java | 11 +-
.../igfs/IgfsMetaManagerSelfTest.java | 57 ++--
.../processors/igfs/IgfsProcessorSelfTest.java | 38 +--
.../processors/igfs/IgfsSizeSelfTest.java | 40 +--
.../processors/igfs/IgfsStreamsSelfTest.java | 33 +-
.../testframework/junits/GridAbstractTest.java | 67 ++--
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 8 +-
.../igfs/HadoopIgfsDualAbstractSelfTest.java | 26 +-
28 files changed, 757 insertions(+), 945 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
index b77b926..9368f35 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDataManager.java
@@ -17,35 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.DataInput;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Deque;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import javax.cache.processor.EntryProcessor;
-import javax.cache.processor.MutableEntry;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.IgniteException;
@@ -87,12 +58,41 @@ import org.apache.ignite.thread.IgniteThreadPoolExecutor;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
-import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
-import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
-import static org.apache.ignite.internal.GridTopic.TOPIC_IGFS;
-import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
-import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
-import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+import javax.cache.processor.EntryProcessor;
+import javax.cache.processor.MutableEntry;
+import java.io.DataInput;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.internal.GridTopic.*;
+import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import static org.apache.ignite.transactions.TransactionIsolation.*;
/**
* Cache based file's data container.
@@ -368,7 +368,7 @@ public class IgfsDataManager extends IgfsManager {
* @return Requested data block or {@code null} if nothing found.
* @throws IgniteCheckedException If failed.
*/
- @Nullable public IgniteInternalFuture<byte[]> dataBlock(final IgfsFileInfo fileInfo, final IgfsPath path,
+ @Nullable public IgniteInternalFuture<byte[]> dataBlock(final IgfsEntryInfo fileInfo, final IgfsPath path,
final long blockIdx, @Nullable final IgfsSecondaryFileSystemPositionedReadable secReader)
throws IgniteCheckedException {
//assert validTxState(any); // Allow this method call for any transaction state.
@@ -476,7 +476,7 @@ public class IgfsDataManager extends IgfsManager {
* @param fileInfo File info of file opened to write.
* @return Future that will be completed when all ack messages are received or when write failed.
*/
- public IgniteInternalFuture<Boolean> writeStart(IgfsFileInfo fileInfo) {
+ public IgniteInternalFuture<Boolean> writeStart(IgfsEntryInfo fileInfo) {
WriteCompletionFuture fut = new WriteCompletionFuture(fileInfo.id());
WriteCompletionFuture oldFut = pendingWrites.putIfAbsent(fileInfo.id(), fut);
@@ -495,7 +495,7 @@ public class IgfsDataManager extends IgfsManager {
*
* @param fileInfo File info being written.
*/
- public void writeClose(IgfsFileInfo fileInfo) {
+ public void writeClose(IgfsEntryInfo fileInfo) {
WriteCompletionFuture fut = pendingWrites.get(fileInfo.id());
if (fut != null)
@@ -524,7 +524,7 @@ public class IgfsDataManager extends IgfsManager {
* @throws IgniteCheckedException If failed.
*/
@Nullable public byte[] storeDataBlocks(
- IgfsFileInfo fileInfo,
+ IgfsEntryInfo fileInfo,
long reservedLen,
@Nullable byte[] remainder,
int remainderLen,
@@ -557,7 +557,7 @@ public class IgfsDataManager extends IgfsManager {
* @throws IOException If store failed.
*/
@Nullable public byte[] storeDataBlocks(
- IgfsFileInfo fileInfo,
+ IgfsEntryInfo fileInfo,
long reservedLen,
@Nullable byte[] remainder,
int remainderLen,
@@ -579,7 +579,7 @@ public class IgfsDataManager extends IgfsManager {
* @param fileInfo File details to remove data for.
* @return Delete future that will be completed when file is actually erased.
*/
- public IgniteInternalFuture<Object> delete(IgfsFileInfo fileInfo) {
+ public IgniteInternalFuture<Object> delete(IgfsEntryInfo fileInfo) {
if (!fileInfo.isFile()) {
if (log.isDebugEnabled())
log.debug("Cannot delete content of not-data file: " + fileInfo);
@@ -595,7 +595,7 @@ public class IgfsDataManager extends IgfsManager {
* @param fileInfo File info.
* @return Block key.
*/
- public IgfsBlockKey blockKey(long blockIdx, IgfsFileInfo fileInfo) {
+ public IgfsBlockKey blockKey(long blockIdx, IgfsEntryInfo fileInfo) {
if (fileInfo.affinityKey() != null)
return new IgfsBlockKey(fileInfo.id(), fileInfo.affinityKey(), fileInfo.evictExclude(), blockIdx);
@@ -616,7 +616,7 @@ public class IgfsDataManager extends IgfsManager {
* @param range Range to clean up.
* @param cleanNonColocated {@code True} if all blocks should be cleaned.
*/
- public void cleanBlocks(IgfsFileInfo fileInfo, IgfsFileAffinityRange range, boolean cleanNonColocated) {
+ public void cleanBlocks(IgfsEntryInfo fileInfo, IgfsFileAffinityRange range, boolean cleanNonColocated) {
long startIdx = range.startOffset() / fileInfo.blockSize();
long endIdx = range.endOffset() / fileInfo.blockSize();
@@ -646,7 +646,7 @@ public class IgfsDataManager extends IgfsManager {
* @param fileInfo File info to move data for.
* @param range Range to move.
*/
- public void spreadBlocks(IgfsFileInfo fileInfo, IgfsFileAffinityRange range) {
+ public void spreadBlocks(IgfsEntryInfo fileInfo, IgfsFileAffinityRange range) {
long startIdx = range.startOffset() / fileInfo.blockSize();
long endIdx = range.endOffset() / fileInfo.blockSize();
@@ -721,7 +721,7 @@ public class IgfsDataManager extends IgfsManager {
* @return Affinity blocks locations.
* @throws IgniteCheckedException If failed.
*/
- public Collection<IgfsBlockLocation> affinity(IgfsFileInfo info, long start, long len)
+ public Collection<IgfsBlockLocation> affinity(IgfsEntryInfo info, long start, long len)
throws IgniteCheckedException {
return affinity(info, start, len, 0);
}
@@ -736,7 +736,7 @@ public class IgfsDataManager extends IgfsManager {
* @return Affinity blocks locations.
* @throws IgniteCheckedException If failed.
*/
- public Collection<IgfsBlockLocation> affinity(IgfsFileInfo info, long start, long len, long maxLen)
+ public Collection<IgfsBlockLocation> affinity(IgfsEntryInfo info, long start, long len, long maxLen)
throws IgniteCheckedException {
assert validTxState(false);
assert info.isFile() : "Failed to get affinity (not a file): " + info;
@@ -845,7 +845,7 @@ public class IgfsDataManager extends IgfsManager {
* @param maxLen Maximum allowed split length.
* @param res Result collection to add regions to.
*/
- private void affinity0(IgfsFileInfo info, long start, long len, long maxLen, Deque<IgfsBlockLocation> res) {
+ private void affinity0(IgfsEntryInfo info, long start, long len, long maxLen, Deque<IgfsBlockLocation> res) {
long firstGrpIdx = start / grpBlockSize;
long limitGrpIdx = (start + len + grpBlockSize - 1) / grpBlockSize;
@@ -1327,7 +1327,7 @@ public class IgfsDataManager extends IgfsManager {
*/
private IgfsBlockKey createBlockKey(
long block,
- IgfsFileInfo fileInfo,
+ IgfsEntryInfo fileInfo,
IgfsFileAffinityRange locRange
) {
// If affinityKey is present, return block key as is.
@@ -1373,7 +1373,7 @@ public class IgfsDataManager extends IgfsManager {
* @return Data remainder if {@code flush} flag is {@code false}.
*/
@Nullable public byte[] storeDataBlocks(
- IgfsFileInfo fileInfo,
+ IgfsEntryInfo fileInfo,
long reservedLen,
@Nullable byte[] remainder,
final int remainderLen,
@@ -1632,10 +1632,10 @@ public class IgfsDataManager extends IgfsManager {
*/
private class AsyncDeleteWorker extends GridWorker {
/** File info for stop request. */
- private final IgfsFileInfo stopInfo;
+ private final IgfsEntryInfo stopInfo;
/** Delete requests queue. */
- private BlockingQueue<IgniteBiTuple<GridFutureAdapter<Object>, IgfsFileInfo>> delReqs =
+ private BlockingQueue<IgniteBiTuple<GridFutureAdapter<Object>, IgfsEntryInfo>> delReqs =
new LinkedBlockingQueue<>();
/**
@@ -1662,7 +1662,7 @@ public class IgfsDataManager extends IgfsManager {
* @param info File info to delete.
* @return Future which completes when entry is actually removed.
*/
- private IgniteInternalFuture<Object> deleteAsync(IgfsFileInfo info) {
+ private IgniteInternalFuture<Object> deleteAsync(IgfsEntryInfo info) {
GridFutureAdapter<Object> fut = new GridFutureAdapter<>();
delReqs.offer(F.t(fut, info));
@@ -1674,10 +1674,10 @@ public class IgfsDataManager extends IgfsManager {
@Override protected void body() throws InterruptedException, IgniteInterruptedCheckedException {
try {
while (!isCancelled()) {
- IgniteBiTuple<GridFutureAdapter<Object>, IgfsFileInfo> req = delReqs.take();
+ IgniteBiTuple<GridFutureAdapter<Object>, IgfsEntryInfo> req = delReqs.take();
GridFutureAdapter<Object> fut = req.get1();
- IgfsFileInfo fileInfo = req.get2();
+ IgfsEntryInfo fileInfo = req.get2();
// Identity check.
if (fileInfo == stopInfo) {
@@ -1738,7 +1738,7 @@ public class IgfsDataManager extends IgfsManager {
if (log.isDebugEnabled())
log.debug("Stopping asynchronous igfs file delete thread: " + name());
- IgniteBiTuple<GridFutureAdapter<Object>, IgfsFileInfo> req = delReqs.poll();
+ IgniteBiTuple<GridFutureAdapter<Object>, IgfsEntryInfo> req = delReqs.poll();
while (req != null) {
req.get1().onCancelled();
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
index ffddd3e..5c5e8cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDeleteWorker.java
@@ -17,13 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
@@ -37,8 +30,16 @@ import org.apache.ignite.internal.util.typedef.internal.LT;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
-import static org.apache.ignite.events.EventType.EVT_IGFS_FILE_PURGED;
-import static org.apache.ignite.internal.GridTopic.TOPIC_IGFS;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static org.apache.ignite.events.EventType.*;
+import static org.apache.ignite.internal.GridTopic.*;
/**
* IGFS worker for removal from the trash directory.
@@ -162,7 +163,7 @@ public class IgfsDeleteWorker extends IgfsThread {
* @param trashId Trash ID.
*/
private void delete(IgniteUuid trashId) {
- IgfsFileInfo info = null;
+ IgfsEntryInfo info = null;
try {
info = meta.info(trashId);
@@ -220,7 +221,7 @@ public class IgfsDeleteWorker extends IgfsThread {
assert id != null;
while (true) {
- IgfsFileInfo info = meta.info(id);
+ IgfsEntryInfo info = meta.info(id);
if (info != null) {
if (info.isDirectory()) {
@@ -234,7 +235,7 @@ public class IgfsDeleteWorker extends IgfsThread {
assert info.isFile();
// Lock the file with special lock Id to prevent concurrent writing:
- IgfsFileInfo lockedInfo = meta.lock(id, true);
+ IgfsEntryInfo lockedInfo = meta.lock(id, true);
if (lockedInfo == null)
return false; // File is locked, we cannot delete it.
@@ -271,7 +272,7 @@ public class IgfsDeleteWorker extends IgfsThread {
assert id != null;
while (true) {
- IgfsFileInfo info = meta.info(id);
+ IgfsEntryInfo info = meta.info(id);
if (info != null) {
assert info.isDirectory();
@@ -298,12 +299,12 @@ public class IgfsDeleteWorker extends IgfsThread {
failedFiles++;
}
else {
- IgfsFileInfo fileInfo = meta.info(entry.getValue().fileId());
+ IgfsEntryInfo fileInfo = meta.info(entry.getValue().fileId());
if (fileInfo != null) {
assert fileInfo.isFile();
- IgfsFileInfo lockedInfo = meta.lock(fileInfo.id(), true);
+ IgfsEntryInfo lockedInfo = meta.lock(fileInfo.id(), true);
if (lockedInfo == null)
// File is already locked:
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
index dc5478f..01c8ff9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsDirectoryInfo.java
@@ -17,11 +17,9 @@
package org.apache.ignite.internal.processors.igfs;
-import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
@@ -39,28 +37,10 @@ public class IgfsDirectoryInfo extends IgfsEntryInfo {
/** */
private static final long serialVersionUID = 0L;
- /** File length in bytes. */
- private long len;
-
- /** File block size, {@code zero} for directories. */
- private int blockSize;
-
- /** File lock ID. */
- private IgniteUuid lockId;
-
- /** Affinity key used for single-node file collocation. */
- private IgniteUuid affKey;
-
- /** File affinity map. */
- private IgfsFileMap fileMap;
-
/** Directory listing. */
@GridToStringInclude
private Map<String, IgfsListingEntry> listing;
- /** Whether data blocks of this entry should never be excluded. */
- private boolean evictExclude;
-
/**
* {@link Externalizable} support.
*/
@@ -74,49 +54,12 @@ public class IgfsDirectoryInfo extends IgfsEntryInfo {
* @param len New length.
* @return Updated file info.
*/
- public IgfsDirectoryInfo length(long len) {
- IgfsDirectoryInfo res = copy();
-
- res.len = len;
-
- return res;
+ public IgfsEntryInfo length(long len) {
+ throw new UnsupportedOperationException("length");
}
- /**
- * Update properties.
- *
- * @param props Properties.
- * @return Updated file info.
- */
- public IgfsDirectoryInfo properties(@Nullable Map<String, String> props) {
- IgfsDirectoryInfo res = copy();
-
- res.props = props;
-
- return res;
- }
-
- /**
- * Update path.
- *
- * @param path Path.
- * @return Updated file info.
- */
- public IgfsDirectoryInfo path(IgfsPath path) {
- IgfsDirectoryInfo res = copy();
-
- res.path = path;
-
- return res;
- }
-
- /**
- * Update listing.
- *
- * @param listing Listing.
- * @return Updated file info.
- */
- public IgfsDirectoryInfo listing(@Nullable Map<String, IgfsListingEntry> listing) {
+ /** {@inheritDoc} */
+ @Override public IgfsDirectoryInfo listing(@Nullable Map<String, IgfsListingEntry> listing) {
IgfsDirectoryInfo res = copy();
res.listing = listing;
@@ -124,122 +67,40 @@ public class IgfsDirectoryInfo extends IgfsEntryInfo {
return res;
}
- /**
- * Update access and modification time.
- *
- * @param accessTime Access time.
- * @param modificationTime Modification time.
- * @return Updated file info.
- */
- public IgfsDirectoryInfo accessModificationTime(long accessTime, long modificationTime) {
- IgfsDirectoryInfo res = copy();
-
- res.accessTime = accessTime;
- res.modificationTime = modificationTime;
-
- return res;
- }
-
- /**
- * Lock file.
- *
- * @param lockId Lock ID.
- * @return Update file info.
- */
- public IgfsDirectoryInfo lock(IgniteUuid lockId) {
- assert lockId != null;
- assert this.lockId == null;
-
- IgfsDirectoryInfo res = copy();
-
- res.lockId = lockId;
-
- return res;
- }
-
- /**
- * Unlock file.
- *
- * @param modificationTime Modification time.
- * @return Updated file info.
- */
- public IgfsDirectoryInfo unlock(long modificationTime) {
- IgfsDirectoryInfo res = copy();
-
- res.lockId = null;
- res.modificationTime = modificationTime;
-
- return res;
+ /** {@inheritDoc} */
+ @Override public IgfsEntryInfo lock(IgniteUuid lockId) {
+ throw new UnsupportedOperationException("lock");
}
- /**
- * Update file map.
- *
- * @param fileMap File affinity map.
- * @return Updated file info.
- */
- public IgfsDirectoryInfo fileMap(IgfsFileMap fileMap) {
- IgfsDirectoryInfo res = copy();
-
- res.fileMap = fileMap;
-
- return res;
+ /** {@inheritDoc} */
+ @Override public IgfsEntryInfo unlock(long modificationTime) {
+ throw new UnsupportedOperationException("unlock");
}
- /**
- * Copy file info.
- *
- * @return Copy.
- */
- private IgfsDirectoryInfo copy() {
- return new IgfsDirectoryInfo(isDirectory(), id, blockSize, len, affKey, listing, props,
- fileMap(), lockId, accessTime, modificationTime, evictExclude);
+ /** {@inheritDoc} */
+ @Override public IgfsEntryInfo fileMap(IgfsFileMap fileMap) {
+ throw new UnsupportedOperationException("fileMap");
}
/**
* Constructs file info.
*
- * @param isDir Constructs directory info if {@code true} or file info if {@code false}.
* @param id ID or {@code null} to generate it automatically.
- * @param blockSize Block size.
- * @param len Size of a file.
- * @param affKey Affinity key for data blocks.
* @param listing Directory listing.
* @param props File properties.
- * @param fileMap File map.
- * @param lockId Lock ID.
* @param accessTime Last access time.
* @param modificationTime Last modification time.
- * @param evictExclude Evict exclude flag.
*/
- IgfsDirectoryInfo(boolean isDir, IgniteUuid id, int blockSize, long len, @Nullable IgniteUuid affKey,
- @Nullable Map<String, IgfsListingEntry> listing, @Nullable Map<String, String> props,
- @Nullable IgfsFileMap fileMap, @Nullable IgniteUuid lockId, long accessTime,
- long modificationTime, boolean evictExclude) {
+ IgfsDirectoryInfo(IgniteUuid id, @Nullable Map<String, IgfsListingEntry> listing,
+ @Nullable Map<String, String> props, long accessTime, long modificationTime) {
super(id, props, accessTime, modificationTime);
- assert F.isEmpty(listing) || isDir;
-
- if (isDir) {
- assert len == 0 : "Directory length should be zero: " + len;
- assert blockSize == 0 : "Directory block size should be zero: " + blockSize;
- }
- else {
- assert len >= 0 : "File length cannot be negative: " + len;
- assert blockSize > 0 : "File block size should be positive: " + blockSize;
- }
-
- this.len = isDir ? 0 : len;
- this.blockSize = isDir ? 0 : blockSize;
- this.affKey = affKey;
this.listing = listing;
+ }
- if (fileMap == null && !isDir)
- fileMap = new IgfsFileMap();
-
- this.fileMap = fileMap;
- this.lockId = lockId;
- this.evictExclude = evictExclude;
+ /** {@inheritDoc} */
+ protected IgfsDirectoryInfo copy() {
+ return new IgfsDirectoryInfo(id, listing, props, accessTime, modificationTime);
}
/** {@inheritDoc} */
@@ -247,64 +108,37 @@ public class IgfsDirectoryInfo extends IgfsEntryInfo {
return false;
}
- /**
- * Get file size.
- *
- * @return File size.
- */
+ /** {@inheritDoc} */
public long length() {
- assert isFile();
-
- return len;
+ return 0;
}
- /**
- * Get single data block size to store this file.
- *
- * @return Single data block size to store this file.
- */
+ /** {@inheritDoc} */
public int blockSize() {
- assert isFile();
-
- return blockSize;
+ return 0;
}
- /**
- * @return Number of data blocks to store this file.
- */
+ /** {@inheritDoc} */
public long blocksCount() {
- assert isFile();
-
- return (len + blockSize() - 1) / blockSize();
+ return 0;
}
- /**
- * @return Directory listing.
- */
+ /** {@inheritDoc} */
public Map<String, IgfsListingEntry> listing() {
return listing != null ? listing : Collections.<String, IgfsListingEntry>emptyMap();
}
- /**
- * @return {@code True} if at least one child exists.
- */
+ /** {@inheritDoc} */
public boolean hasChildren() {
return !F.isEmpty(listing);
}
- /**
- * @param name Child name.
- * @return {@code True} if child with such name exists.
- */
+ /** {@inheritDoc} */
public boolean hasChild(String name) {
return listing != null && listing.containsKey(name);
}
- /**
- * @param name Child name.
- * @param expId Expected child ID.
- * @return {@code True} if child with such name exists.
- */
+ /** {@inheritDoc} */
public boolean hasChild(String name, IgniteUuid expId) {
if (listing != null) {
IgfsListingEntry entry = listing.get(name);
@@ -316,50 +150,31 @@ public class IgfsDirectoryInfo extends IgfsEntryInfo {
return false;
}
- /**
- * @return Affinity key used for single-node file collocation. If {@code null}, usual
- * mapper procedure is used for block affinity detection.
- */
+ /** {@inheritDoc} */
@Nullable public IgniteUuid affinityKey() {
- return affKey;
+ return null;
}
- /**
- * @return File affinity map.
- */
+ /** {@inheritDoc} */
public IgfsFileMap fileMap() {
- return fileMap;
+ return null;
}
- /**
- * Get lock ID.
- *
- * @return Lock ID if file is locked or {@code null} if file is free of locks.
- */
+ /** {@inheritDoc} */
@Nullable public IgniteUuid lockId() {
- return lockId;
+ return null;
}
- /**
- * Get evict exclude flag.
- *
- * @return Evict exclude flag.
- */
+ /** {@inheritDoc} */
public boolean evictExclude() {
- return evictExclude;
+ return true;
}
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
super.writeExternal(out);
- out.writeInt(blockSize);
- out.writeLong(len);
- U.writeGridUuid(out, lockId);
- U.writeGridUuid(out, affKey);
out.writeObject(listing);
- out.writeObject(fileMap);
- out.writeBoolean(evictExclude);
}
/** {@inheritDoc} */
@@ -367,19 +182,12 @@ public class IgfsDirectoryInfo extends IgfsEntryInfo {
@Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
super.readExternal(in);
- blockSize = in.readInt();
- len = in.readLong();
- lockId = U.readGridUuid(in);
- affKey = U.readGridUuid(in);
listing = (Map<String, IgfsListingEntry>)in.readObject();
- fileMap = (IgfsFileMap)in.readObject();
- evictExclude = in.readBoolean();
}
/** {@inheritDoc} */
@Override public int hashCode() {
- return id.hashCode() ^ blockSize ^ (int)(len ^ (len >>> 32)) ^ (props == null ? 0 : props.hashCode()) ^
- (lockId == null ? 0 : lockId.hashCode());
+ return id.hashCode() ^ (props == null ? 0 : props.hashCode());
}
/** {@inheritDoc} */
@@ -392,8 +200,7 @@ public class IgfsDirectoryInfo extends IgfsEntryInfo {
IgfsDirectoryInfo that = (IgfsDirectoryInfo)obj;
- return id.equals(that.id) && blockSize == that.blockSize && len == that.len && F.eq(affKey, that.affKey) &&
- F.eq(props, that.props) && F.eq(lockId, that.lockId);
+ return id.equals(that.id) && F.eq(props, that.props);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
index 8e26cf3..c5b1111 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsEntryInfo.java
@@ -121,12 +121,170 @@ public abstract class IgfsEntryInfo implements Externalizable {
public abstract boolean isFile();
/**
+ * Update length.
+ *
+ * @param len New length.
+ * @return Updated file info.
+ */
+ public abstract IgfsEntryInfo length(long len);
+
+ /**
+ * Update listing.
+ *
+ * @param listing Listing.
+ * @return Updated file info.
+ */
+ public abstract IgfsEntryInfo listing(@Nullable Map<String, IgfsListingEntry> listing);
+
+ /**
+ * Update properties.
+ *
+ * @param props Properties.
+ * @return Updated file info.
+ */
+ public IgfsEntryInfo properties(@Nullable Map<String, String> props) {
+ IgfsEntryInfo res = copy();
+
+ res.props = props;
+
+ return res;
+ }
+
+ /**
+ * Update path.
+ *
+ * @param path Path.
+ * @return Updated file info.
+ */
+ public IgfsEntryInfo path(IgfsPath path) {
+ IgfsEntryInfo res = copy();
+
+ res.path = path;
+
+ return res;
+ }
+
+ /**
+ * Update access and modification time.
+ *
+ * @param accessTime Access time.
+ * @param modificationTime Modification time.
+ * @return Updated file info.
+ */
+ public IgfsEntryInfo accessModificationTime(long accessTime, long modificationTime) {
+ IgfsEntryInfo res = copy();
+
+ res.accessTime = accessTime;
+ res.modificationTime = modificationTime;
+
+ return res;
+ }
+
+ /**
+ * Lock file.
+ *
+ * @param lockId Lock ID.
+ * @return Update file info.
+ */
+ public abstract IgfsEntryInfo lock(IgniteUuid lockId);
+
+ /**
+ * Unlock file.
+ *
+ * @param modificationTime Modification time.
+ * @return Updated file info.
+ */
+ public abstract IgfsEntryInfo unlock(long modificationTime);
+
+ /**
+ * Update file map.
+ *
+ * @param fileMap File affinity map.
+ * @return Updated file info.
+ */
+ public abstract IgfsEntryInfo fileMap(IgfsFileMap fileMap);
+
+ /**
+ * Copy file info.
+ *
+ * @return Copy.
+ */
+ protected abstract IgfsEntryInfo copy();
+
+ /**
* @return {@code True} if this is a directory.
*/
public boolean isDirectory() {
return !isFile();
}
+ /**
+ * Get file size.
+ *
+ * @return File size.
+ */
+ public abstract long length();
+
+ /**
+ * Get single data block size to store this file.
+ *
+ * @return Single data block size to store this file.
+ */
+ public abstract int blockSize();
+
+ /**
+ * @return Number of data blocks to store this file.
+ */
+ public abstract long blocksCount();
+
+ /**
+ * @return Directory listing.
+ */
+ public abstract Map<String, IgfsListingEntry> listing();
+
+ /**
+ * @return {@code True} if at least one child exists.
+ */
+ public abstract boolean hasChildren();
+
+ /**
+ * @param name Child name.
+ * @return {@code True} if child with such name exists.
+ */
+ public abstract boolean hasChild(String name);
+
+ /**
+ * @param name Child name.
+ * @param expId Expected child ID.
+ * @return {@code True} if child with such name exists.
+ */
+ public abstract boolean hasChild(String name, IgniteUuid expId);
+
+ /**
+ * @return Affinity key used for single-node file collocation. If {@code null}, usual
+ * mapper procedure is used for block affinity detection.
+ */
+ @Nullable public abstract IgniteUuid affinityKey();
+
+ /**
+ * @return File affinity map.
+ */
+ public abstract IgfsFileMap fileMap();
+
+ /**
+ * Get lock ID.
+ *
+ * @return Lock ID if file is locked or {@code null} if file is free of locks.
+ */
+ @Nullable public abstract IgniteUuid lockId();
+
+ /**
+ * Get evict exclude flag.
+ *
+ * @return Evict exclude flag.
+ */
+ public abstract boolean evictExclude();
+
/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
U.writeGridUuid(out, id);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java
index 3576a06..be8d0fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileImpl.java
@@ -17,12 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Collections;
-import java.util.Map;
import org.apache.ignite.igfs.IgfsFile;
import org.apache.ignite.igfs.IgfsPath;
import org.apache.ignite.internal.util.typedef.internal.A;
@@ -31,6 +25,13 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
import org.jetbrains.annotations.Nullable;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collections;
+import java.util.Map;
+
/**
* File or directory information.
*/
@@ -97,7 +98,7 @@ public final class IgfsFileImpl implements IgfsFile, Externalizable {
*
* @param path Path.
*/
- public IgfsFileImpl(IgfsPath path, IgfsFileInfo info, long globalGrpBlockSize) {
+ public IgfsFileImpl(IgfsPath path, IgfsEntryInfo info, long globalGrpBlockSize) {
A.notNull(path, "path");
A.notNull(info, "info");
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
index 0589c1a..30f505e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfo.java
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import org.apache.ignite.igfs.IgfsPath;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -54,10 +52,6 @@ public final class IgfsFileInfo extends IgfsEntryInfo {
/** File affinity map. */
private IgfsFileMap fileMap;
- /** Directory listing. */
- @GridToStringInclude
- private Map<String, IgfsListingEntry> listing;
-
/** Whether data blocks of this entry should never be excluded. */
private boolean evictExclude;
@@ -68,13 +62,8 @@ public final class IgfsFileInfo extends IgfsEntryInfo {
// No-op.
}
- /**
- * Update length.
- *
- * @param len New length.
- * @return Updated file info.
- */
- public IgfsFileInfo length(long len) {
+ /** {@inheritDoc} */
+ @Override public IgfsFileInfo length(long len) {
IgfsFileInfo res = copy();
res.len = len;
@@ -82,71 +71,13 @@ public final class IgfsFileInfo extends IgfsEntryInfo {
return res;
}
- /**
- * Update properties.
- *
- * @param props Properties.
- * @return Updated file info.
- */
- public IgfsFileInfo properties(@Nullable Map<String, String> props) {
- IgfsFileInfo res = copy();
-
- res.props = props;
-
- return res;
- }
-
- /**
- * Update path.
- *
- * @param path Path.
- * @return Updated file info.
- */
- public IgfsFileInfo path(IgfsPath path) {
- IgfsFileInfo res = copy();
-
- res.path = path;
-
- return res;
- }
-
- /**
- * Update listing.
- *
- * @param listing Listing.
- * @return Updated file info.
- */
- public IgfsFileInfo listing(@Nullable Map<String, IgfsListingEntry> listing) {
- IgfsFileInfo res = copy();
-
- res.listing = listing;
-
- return res;
- }
-
- /**
- * Update access and modification time.
- *
- * @param accessTime Access time.
- * @param modificationTime Modification time.
- * @return Updated file info.
- */
- public IgfsFileInfo accessModificationTime(long accessTime, long modificationTime) {
- IgfsFileInfo res = copy();
-
- res.accessTime = accessTime;
- res.modificationTime = modificationTime;
-
- return res;
+ /** {@inheritDoc} */
+ @Override public IgfsEntryInfo listing(@Nullable Map<String, IgfsListingEntry> listing) {
+ throw new UnsupportedOperationException("listing");
}
- /**
- * Lock file.
- *
- * @param lockId Lock ID.
- * @return Update file info.
- */
- public IgfsFileInfo lock(IgniteUuid lockId) {
+ /** {@inheritDoc} */
+ @Override public IgfsFileInfo lock(IgniteUuid lockId) {
assert lockId != null;
assert this.lockId == null;
@@ -157,13 +88,8 @@ public final class IgfsFileInfo extends IgfsEntryInfo {
return res;
}
- /**
- * Unlock file.
- *
- * @param modificationTime Modification time.
- * @return Updated file info.
- */
- public IgfsFileInfo unlock(long modificationTime) {
+ /** {@inheritDoc} */
+ @Override public IgfsFileInfo unlock(long modificationTime) {
IgfsFileInfo res = copy();
res.lockId = null;
@@ -172,13 +98,8 @@ public final class IgfsFileInfo extends IgfsEntryInfo {
return res;
}
- /**
- * Update file map.
- *
- * @param fileMap File affinity map.
- * @return Updated file info.
- */
- public IgfsFileInfo fileMap(IgfsFileMap fileMap) {
+ /** {@inheritDoc} */
+ @Override public IgfsFileInfo fileMap(IgfsFileMap fileMap) {
IgfsFileInfo res = copy();
res.fileMap = fileMap;
@@ -186,25 +107,19 @@ public final class IgfsFileInfo extends IgfsEntryInfo {
return res;
}
- /**
- * Copy file info.
- *
- * @return Copy.
- */
- private IgfsFileInfo copy() {
- return new IgfsFileInfo(isDirectory(), id, blockSize, len, affKey, listing, props,
- fileMap(), lockId, accessTime, modificationTime, evictExclude);
+ /** {@inheritDoc} */
+ @Override protected IgfsFileInfo copy() {
+ return new IgfsFileInfo(id, blockSize, len, affKey, props, fileMap, lockId, accessTime, modificationTime,
+ evictExclude);
}
/**
* Constructs file info.
*
- * @param isDir Constructs directory info if {@code true} or file info if {@code false}.
* @param id ID or {@code null} to generate it automatically.
* @param blockSize Block size.
* @param len Size of a file.
* @param affKey Affinity key for data blocks.
- * @param listing Directory listing.
* @param props File properties.
* @param fileMap File map.
* @param lockId Lock ID.
@@ -212,29 +127,16 @@ public final class IgfsFileInfo extends IgfsEntryInfo {
* @param modificationTime Last modification time.
* @param evictExclude Evict exclude flag.
*/
- IgfsFileInfo(boolean isDir, IgniteUuid id, int blockSize, long len, @Nullable IgniteUuid affKey,
- @Nullable Map<String, IgfsListingEntry> listing, @Nullable Map<String, String> props,
- @Nullable IgfsFileMap fileMap, @Nullable IgniteUuid lockId, long accessTime,
- long modificationTime, boolean evictExclude) {
+ IgfsFileInfo(IgniteUuid id, int blockSize, long len, @Nullable IgniteUuid affKey,
+ @Nullable Map<String, String> props, @Nullable IgfsFileMap fileMap, @Nullable IgniteUuid lockId,
+ long accessTime, long modificationTime, boolean evictExclude) {
super(id, props, accessTime, modificationTime);
- assert F.isEmpty(listing) || isDir;
-
- if (isDir) {
- assert len == 0 : "Directory length should be zero: " + len;
- assert blockSize == 0 : "Directory block size should be zero: " + blockSize;
- }
- else {
- assert len >= 0 : "File length cannot be negative: " + len;
- assert blockSize > 0 : "File block size should be positive: " + blockSize;
- }
-
- this.len = isDir ? 0 : len;
- this.blockSize = isDir ? 0 : blockSize;
+ this.len = len;
+ this.blockSize = blockSize;
this.affKey = affKey;
- this.listing = listing;
- if (fileMap == null && !isDir)
+ if (fileMap == null)
fileMap = new IgfsFileMap();
this.fileMap = fileMap;
@@ -244,108 +146,60 @@ public final class IgfsFileInfo extends IgfsEntryInfo {
/** {@inheritDoc} */
public boolean isFile() {
- // TODO: Cleanup.
- return blockSize > 0;
+ return true;
}
- /**
- * Get file size.
- *
- * @return File size.
- */
+ /** {@inheritDoc} */
public long length() {
- assert isFile();
-
return len;
}
- /**
- * Get single data block size to store this file.
- *
- * @return Single data block size to store this file.
- */
+ /** {@inheritDoc} */
public int blockSize() {
- assert isFile();
-
return blockSize;
}
- /**
- * @return Number of data blocks to store this file.
- */
+ /** {@inheritDoc} */
public long blocksCount() {
- assert isFile();
-
return (len + blockSize() - 1) / blockSize();
}
- /**
- * @return Directory listing.
- */
+ /** {@inheritDoc} */
public Map<String, IgfsListingEntry> listing() {
- return listing != null ? listing : Collections.<String, IgfsListingEntry>emptyMap();
+ return Collections.emptyMap();
}
- /**
- * @return {@code True} if at least one child exists.
- */
+ /** {@inheritDoc} */
public boolean hasChildren() {
- return !F.isEmpty(listing);
+ return false;
}
- /**
- * @param name Child name.
- * @return {@code True} if child with such name exists.
- */
+ /** {@inheritDoc} */
public boolean hasChild(String name) {
- return listing != null && listing.containsKey(name);
+ return false;
}
- /**
- * @param name Child name.
- * @param expId Expected child ID.
- * @return {@code True} if child with such name exists.
- */
+ /** {@inheritDoc} */
public boolean hasChild(String name, IgniteUuid expId) {
- if (listing != null) {
- IgfsListingEntry entry = listing.get(name);
-
- if (entry != null)
- return F.eq(expId, entry.fileId());
- }
-
return false;
}
- /**
- * @return Affinity key used for single-node file collocation. If {@code null}, usual
- * mapper procedure is used for block affinity detection.
- */
+ /** {@inheritDoc} */
@Nullable public IgniteUuid affinityKey() {
return affKey;
}
- /**
- * @return File affinity map.
- */
+ /** {@inheritDoc} */
public IgfsFileMap fileMap() {
return fileMap;
}
- /**
- * Get lock ID.
- *
- * @return Lock ID if file is locked or {@code null} if file is free of locks.
- */
+ /** {@inheritDoc} */
@Nullable public IgniteUuid lockId() {
return lockId;
}
- /**
- * Get evict exclude flag.
- *
- * @return Evict exclude flag.
- */
+ /** {@inheritDoc} */
public boolean evictExclude() {
return evictExclude;
}
@@ -358,7 +212,6 @@ public final class IgfsFileInfo extends IgfsEntryInfo {
out.writeLong(len);
U.writeGridUuid(out, lockId);
U.writeGridUuid(out, affKey);
- out.writeObject(listing);
out.writeObject(fileMap);
out.writeBoolean(evictExclude);
}
@@ -372,7 +225,6 @@ public final class IgfsFileInfo extends IgfsEntryInfo {
len = in.readLong();
lockId = U.readGridUuid(in);
affKey = U.readGridUuid(in);
- listing = (Map<String, IgfsListingEntry>)in.readObject();
fileMap = (IgfsFileMap)in.readObject();
evictExclude = in.readBoolean();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
index 39202d4..0d1ce35 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsFragmentizerManager.java
@@ -274,7 +274,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
Collection<IgfsFileAffinityRange> ranges = req.fragmentRanges();
IgniteUuid fileId = req.fileId();
- IgfsFileInfo fileInfo = igfsCtx.meta().info(fileId);
+ IgfsEntryInfo fileInfo = igfsCtx.meta().info(fileId);
if (fileInfo == null) {
if (log.isDebugEnabled())
@@ -288,7 +288,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
for (IgfsFileAffinityRange range : ranges) {
try {
- IgfsFileInfo updated;
+ IgfsEntryInfo updated;
switch (range.status()) {
case RANGE_STATUS_INITIAL: {
@@ -345,7 +345,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
/**
* Update range processor.
*/
- private static class RangeUpdateProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, IgfsFileInfo>,
+ private static class RangeUpdateProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -375,15 +375,15 @@ public class IgfsFragmentizerManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public IgfsFileInfo process(MutableEntry<IgniteUuid, IgfsFileInfo> entry, Object... args)
+ @Override public IgfsEntryInfo process(MutableEntry<IgniteUuid, IgfsEntryInfo> entry, Object... args)
throws EntryProcessorException {
- IgfsFileInfo oldInfo = entry.getValue();
+ IgfsEntryInfo oldInfo = entry.getValue();
IgfsFileMap newMap = new IgfsFileMap(oldInfo.fileMap());
newMap.updateRangeStatus(range, status);
- IgfsFileInfo newInfo = oldInfo.fileMap(newMap);
+ IgfsEntryInfo newInfo = oldInfo.fileMap(newMap);
entry.setValue(newInfo);
@@ -411,7 +411,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
/**
* Delete range processor.
*/
- private static class RangeDeleteProcessor implements EntryProcessor<IgniteUuid, IgfsFileInfo, IgfsFileInfo>,
+ private static class RangeDeleteProcessor implements EntryProcessor<IgniteUuid, IgfsEntryInfo, IgfsEntryInfo>,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -436,15 +436,15 @@ public class IgfsFragmentizerManager extends IgfsManager {
}
/** {@inheritDoc} */
- @Override public IgfsFileInfo process(MutableEntry<IgniteUuid, IgfsFileInfo> entry, Object... args)
+ @Override public IgfsEntryInfo process(MutableEntry<IgniteUuid, IgfsEntryInfo> entry, Object... args)
throws EntryProcessorException {
- IgfsFileInfo oldInfo = entry.getValue();
+ IgfsEntryInfo oldInfo = entry.getValue();
IgfsFileMap newMap = new IgfsFileMap(oldInfo.fileMap());
newMap.deleteRange(range);
- IgfsFileInfo newInfo = oldInfo.fileMap(newMap);
+ IgfsEntryInfo newInfo = oldInfo.fileMap(newMap);
entry.setValue(newInfo);
@@ -503,7 +503,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
// If we have room for files, add them to fragmentizer.
try {
while (fragmentingFiles.size() < igfsCtx.configuration().getFragmentizerConcurrentFiles()) {
- IgfsFileInfo fileInfo = fileForFragmentizer(fragmentingFiles.keySet());
+ IgfsEntryInfo fileInfo = fileForFragmentizer(fragmentingFiles.keySet());
// If no colocated files found, exit loop.
if (fileInfo == null)
@@ -711,7 +711,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
*
* @param fileInfo File info to process.
*/
- private void requestFragmenting(IgfsFileInfo fileInfo) {
+ private void requestFragmenting(IgfsEntryInfo fileInfo) {
IgfsFileMap map = fileInfo.fileMap();
assert map != null && !map.ranges().isEmpty();
@@ -785,7 +785,7 @@ public class IgfsFragmentizerManager extends IgfsManager {
* @return File ID to process or {@code null} if there are no such files.
* @throws IgniteCheckedException In case of error.
*/
- @Nullable private IgfsFileInfo fileForFragmentizer(Collection<IgniteUuid> exclude) throws IgniteCheckedException {
+ @Nullable private IgfsEntryInfo fileForFragmentizer(Collection<IgniteUuid> exclude) throws IgniteCheckedException {
return fragmentizerEnabled ? igfsCtx.meta().fileForFragmentizer(exclude) : null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/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 3065427..7fea118 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
@@ -621,7 +621,7 @@ public final class IgfsImpl implements IgfsEx {
await(path);
- IgfsFileInfo info = meta.updateDual(secondaryFs, path, props);
+ IgfsEntryInfo info = meta.updateDual(secondaryFs, path, props);
if (info == null)
return null;
@@ -636,7 +636,7 @@ public final class IgfsImpl implements IgfsEx {
if (fileId == null)
return null;
- IgfsFileInfo info = meta.updateProperties(fileId, props);
+ IgfsEntryInfo info = meta.updateProperties(fileId, props);
if (info != null) {
if (evts.isRecordable(EVT_IGFS_META_UPDATED))
@@ -690,7 +690,7 @@ public final class IgfsImpl implements IgfsEx {
return null;
}
- IgfsFileInfo info = meta.move(src, dest);
+ IgfsEntryInfo info = meta.move(src, dest);
int evtTyp = info.isFile() ? EVT_IGFS_FILE_RENAMED : EVT_IGFS_DIR_RENAMED;
@@ -857,7 +857,7 @@ public final class IgfsImpl implements IgfsEx {
IgniteUuid fileId = meta.fileId(path);
if (fileId != null) {
- IgfsFileInfo info = meta.info(fileId);
+ IgfsEntryInfo info = meta.info(fileId);
// Handle concurrent deletion.
if (info != null) {
@@ -868,7 +868,7 @@ public final class IgfsImpl implements IgfsEx {
// Perform the listing.
for (Map.Entry<String, IgfsListingEntry> e : info.listing().entrySet()) {
- IgfsFileInfo childInfo = meta.info(e.getValue().fileId());
+ IgfsEntryInfo childInfo = meta.info(e.getValue().fileId());
if (childInfo != null) {
IgfsPath childPath = new IgfsPath(path, e.getKey());
@@ -932,7 +932,7 @@ public final class IgfsImpl implements IgfsEx {
return os;
}
- IgfsFileInfo info = meta.info(meta.fileId(path));
+ IgfsEntryInfo info = meta.info(meta.fileId(path));
if (info == null) {
checkConflictWithPrimary(path);
@@ -1033,7 +1033,7 @@ public final class IgfsImpl implements IgfsEx {
else
dirProps = fileProps = new HashMap<>(props);
- IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = meta.create(path, false/*append*/, overwrite, dirProps,
+ IgniteBiTuple<IgfsEntryInfo, IgniteUuid> t2 = meta.create(path, false/*append*/, overwrite, dirProps,
cfg.getBlockSize(), affKey, evictExclude(path, true), fileProps);
assert t2 != null;
@@ -1104,7 +1104,7 @@ public final class IgfsImpl implements IgfsEx {
else
dirProps = fileProps = new HashMap<>(props);
- IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = meta.create(path, true/*append*/, false/*overwrite*/,
+ IgniteBiTuple<IgfsEntryInfo, IgniteUuid> t2 = meta.create(path, true/*append*/, false/*overwrite*/,
dirProps, cfg.getBlockSize(), null/*affKey*/, evictExclude(path, true), fileProps);
assert t2 != null;
@@ -1179,7 +1179,7 @@ public final class IgfsImpl implements IgfsEx {
// Check memory first.
IgniteUuid fileId = meta.fileId(path);
- IgfsFileInfo info = meta.info(fileId);
+ IgfsEntryInfo info = meta.info(fileId);
if (info == null && mode != PRIMARY) {
assert mode == DUAL_SYNC || mode == DUAL_ASYNC;
@@ -1276,7 +1276,7 @@ public final class IgfsImpl implements IgfsEx {
private void summary0(IgniteUuid fileId, IgfsPathSummary sum) throws IgniteCheckedException {
assert sum != null;
- IgfsFileInfo info = meta.info(fileId);
+ IgfsEntryInfo info = meta.info(fileId);
if (info != null) {
if (info.isDirectory()) {
@@ -1386,7 +1386,7 @@ public final class IgfsImpl implements IgfsEx {
List<IgniteUuid> ids = meta.fileIds(path);
- IgfsFileInfo fileInfo = meta.info(ids.get(ids.size() - 1));
+ IgfsEntryInfo fileInfo = meta.info(ids.get(ids.size() - 1));
if (fileInfo == null)
return null; // File does not exist.
@@ -1556,7 +1556,7 @@ public final class IgfsImpl implements IgfsEx {
assert path != null;
assert mode != null;
- IgfsFileInfo info = null;
+ IgfsEntryInfo info = null;
switch (mode) {
case PRIMARY:
@@ -1683,7 +1683,7 @@ public final class IgfsImpl implements IgfsEx {
* @param mode IGFS mode.
* @param batch Optional secondary file system batch.
*/
- IgfsEventAwareOutputStream(IgfsPath path, IgfsFileInfo fileInfo,
+ IgfsEventAwareOutputStream(IgfsPath path, IgfsEntryInfo fileInfo,
IgniteUuid parentId, int bufSize, IgfsMode mode, @Nullable IgfsFileWorkerBatch batch) {
super(igfsCtx, path, fileInfo, parentId, bufSize, mode, batch, metrics);
@@ -1722,7 +1722,7 @@ public final class IgfsImpl implements IgfsEx {
* @param secReader Optional secondary file system reader.
* @param metrics Metrics.
*/
- IgfsEventAwareInputStream(IgfsContext igfsCtx, IgfsPath path, IgfsFileInfo fileInfo,
+ IgfsEventAwareInputStream(IgfsContext igfsCtx, IgfsPath path, IgfsEntryInfo fileInfo,
int prefetchBlocks, int seqReadsBeforePrefetch, @Nullable IgfsSecondaryFileSystemPositionedReadable secReader,
IgfsLocalMetrics metrics) {
super(igfsCtx, path, fileInfo, prefetchBlocks, seqReadsBeforePrefetch, secReader, metrics);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java
index afcece7..07ab051 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamAdapter.java
@@ -17,10 +17,11 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.IOException;
import org.apache.ignite.igfs.IgfsInputStream;
import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadable;
+import java.io.IOException;
+
/**
* Implementation adapter providing necessary methods.
*/
@@ -36,7 +37,7 @@ public abstract class IgfsInputStreamAdapter extends IgfsInputStream
*
* @return File info.
*/
- public abstract IgfsFileInfo fileInfo();
+ public abstract IgfsEntryInfo fileInfo();
/**
* Reads bytes from given position.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
index 62f8034..5d41543 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
@@ -17,16 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.EOFException;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.igfs.IgfsCorruptedFileException;
@@ -42,6 +32,17 @@ import org.apache.ignite.lang.IgniteInClosure;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import java.io.EOFException;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
/**
* Input stream to read data from grid cache with separate blocks.
*/
@@ -66,7 +67,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
protected final IgfsPath path;
/** File descriptor. */
- private volatile IgfsFileInfo fileInfo;
+ private volatile IgfsEntryInfo fileInfo;
/** The number of already read bytes. Important! Access to the property is guarded by this object lock. */
private long pos;
@@ -121,7 +122,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
* @param secReader Optional secondary file system reader.
* @param metrics Local IGFS metrics.
*/
- IgfsInputStreamImpl(IgfsContext igfsCtx, IgfsPath path, IgfsFileInfo fileInfo, int prefetchBlocks,
+ IgfsInputStreamImpl(IgfsContext igfsCtx, IgfsPath path, IgfsEntryInfo fileInfo, int prefetchBlocks,
int seqReadsBeforePrefetch, @Nullable IgfsSecondaryFileSystemPositionedReadable secReader, IgfsLocalMetrics metrics) {
assert igfsCtx != null;
assert path != null;
@@ -157,7 +158,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
}
/** {@inheritDoc} */
- @Override public IgfsFileInfo fileInfo() {
+ @Override public IgfsEntryInfo fileInfo() {
return fileInfo;
}
@@ -404,7 +405,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
// This failure may be caused by file being fragmented.
if (fileInfo.fileMap() != null && !fileInfo.fileMap().ranges().isEmpty()) {
- IgfsFileInfo newInfo = meta.info(fileInfo.id());
+ IgfsEntryInfo newInfo = meta.info(fileInfo.id());
// File was deleted.
if (newInfo == null)
@@ -534,7 +535,8 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
* @return Requested data block or {@code null} if nothing found.
* @throws IgniteCheckedException If failed.
*/
- @Nullable protected IgniteInternalFuture<byte[]> dataBlock(IgfsFileInfo fileInfo, long blockIdx) throws IgniteCheckedException {
+ @Nullable protected IgniteInternalFuture<byte[]> dataBlock(IgfsEntryInfo fileInfo, long blockIdx)
+ throws IgniteCheckedException {
return data.dataBlock(fileInfo, path, blockIdx, secReader);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
index 4fe0dca..ea05ca3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsListingEntry.java
@@ -17,16 +17,16 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteUuid;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
/**
* Directory listing entry.
*/
@@ -52,7 +52,7 @@ public class IgfsListingEntry implements Externalizable {
*
* @param fileInfo File info to construct listing entry from.
*/
- public IgfsListingEntry(IgfsFileInfo fileInfo) {
+ public IgfsListingEntry(IgfsEntryInfo fileInfo) {
id = fileInfo.id();
dir = fileInfo.isDirectory();
}
[3/6] ignite git commit: Main part of refactoring - applied new
scheme.
Posted by vo...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
index 8a6ad9f..486179c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsFileInfoSelfTest.java
@@ -17,9 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.Externalizable;
-import java.util.Random;
-import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.marshaller.Marshaller;
@@ -27,8 +24,12 @@ import org.apache.ignite.marshaller.MarshallerContextTestImpl;
import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
import org.jetbrains.annotations.Nullable;
+import java.io.Externalizable;
+import java.util.Random;
+import java.util.concurrent.Callable;
+
/**
- * {@link IgfsFileInfo} test case.
+ * {@link IgfsEntryInfo} test case.
*/
public class IgfsFileInfoSelfTest extends IgfsCommonAbstractTest {
/** Marshaller to test {@link Externalizable} interface. */
@@ -62,7 +63,7 @@ public class IgfsFileInfoSelfTest extends IgfsCommonAbstractTest {
* @param info Node info to test serialization for.
* @throws IgniteCheckedException If failed.
*/
- public void testSerialization(IgfsFileInfo info) throws IgniteCheckedException {
+ public void testSerialization(IgfsEntryInfo info) throws IgniteCheckedException {
assertEquals(info, mu(info));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
index 5770956..a42471d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
@@ -17,11 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.FileSystemConfiguration;
@@ -37,13 +32,17 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static org.apache.ignite.internal.processors.igfs.IgfsUtils.ROOT_ID;
-import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
-import static org.apache.ignite.testframework.GridTestUtils.assertThrowsInherited;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.internal.processors.igfs.IgfsUtils.*;
+import static org.apache.ignite.testframework.GridTestUtils.*;
/**
* {@link IgfsMetaManager} test case.
@@ -146,12 +145,12 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
IgfsListingEntry dirEntry = mgr.directoryListing(ROOT_ID).get("dir");
assertNotNull(dirEntry);
assertTrue(dirEntry.isDirectory());
- IgfsFileInfo dir = mgr.info(dirEntry.fileId());
+ IgfsEntryInfo dir = mgr.info(dirEntry.fileId());
IgfsListingEntry fileEntry = mgr.directoryListing(ROOT_ID).get("file");
assertNotNull(fileEntry);
assertTrue(!fileEntry.isDirectory());
- IgfsFileInfo file = mgr.info(fileEntry.fileId());
+ IgfsEntryInfo file = mgr.info(fileEntry.fileId());
assertEquals(2, mgr.directoryListing(ROOT_ID).size());
@@ -165,7 +164,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
String key1 = UUID.randomUUID().toString();
String key2 = UUID.randomUUID().toString();
- IgfsFileInfo info = mgr.info(fileId);
+ IgfsEntryInfo info = mgr.info(fileId);
assertNull("Unexpected stored properties: " + info, info.properties().get(key1));
assertNull("Unexpected stored properties: " + info, info.properties().get(key2));
@@ -196,24 +195,24 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
assertNull(mgr.updateProperties(dir.id(), F.asMap("p", "7")));
}
- private IgfsFileInfo mkdirsAndGetInfo(String path) throws IgniteCheckedException {
+ private IgfsEntryInfo mkdirsAndGetInfo(String path) throws IgniteCheckedException {
IgfsPath p = path(path);
mgr.mkdirs(p, IgfsImpl.DFLT_DIR_META);
IgniteUuid id = mgr.fileId(p);
- IgfsFileInfo info = mgr.info(id);
+ IgfsEntryInfo info = mgr.info(id);
assert info.isDirectory();
return info;
}
- private IgfsFileInfo createFileAndGetInfo(String path) throws IgniteCheckedException {
+ private IgfsEntryInfo createFileAndGetInfo(String path) throws IgniteCheckedException {
IgfsPath p = path(path);
- IgniteBiTuple<IgfsFileInfo, IgniteUuid> t2 = mgr.create(p, false, false, null, 400, null, false, null);
+ IgniteBiTuple<IgfsEntryInfo, IgniteUuid> t2 = mgr.create(p, false, false, null, 400, null, false, null);
assert t2 != null;
assert !t2.get1().isDirectory();
@@ -227,7 +226,7 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
* @throws Exception If failed.
*/
public void testStructure() throws Exception {
- IgfsFileInfo rootInfo = IgfsUtils.createDirectory(ROOT_ID);
+ IgfsEntryInfo rootInfo = IgfsUtils.createDirectory(ROOT_ID);
// Test empty structure.
assertEmpty(mgr.directoryListing(ROOT_ID));
@@ -235,15 +234,15 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
assertEquals(F.asMap(ROOT_ID, rootInfo), mgr.infos(Arrays.asList(ROOT_ID)));
// Directories:
- IgfsFileInfo a = mkdirsAndGetInfo("/a");
- IgfsFileInfo b = mkdirsAndGetInfo("/a/b");
- IgfsFileInfo k = mkdirsAndGetInfo("/a/b/k");
- IgfsFileInfo z = mkdirsAndGetInfo("/a/k");
+ IgfsEntryInfo a = mkdirsAndGetInfo("/a");
+ IgfsEntryInfo b = mkdirsAndGetInfo("/a/b");
+ IgfsEntryInfo k = mkdirsAndGetInfo("/a/b/k");
+ IgfsEntryInfo z = mkdirsAndGetInfo("/a/k");
// Files:
- IgfsFileInfo f1 = createFileAndGetInfo("/f1");
- IgfsFileInfo f2 = createFileAndGetInfo("/a/f2");
- IgfsFileInfo f3 = createFileAndGetInfo("/a/b/f3");
+ IgfsEntryInfo f1 = createFileAndGetInfo("/f1");
+ IgfsEntryInfo f2 = createFileAndGetInfo("/a/f2");
+ IgfsEntryInfo f3 = createFileAndGetInfo("/a/b/f3");
assertEquals(F.asMap("a", new IgfsListingEntry(a), "f1", new IgfsListingEntry(f1)),
mgr.directoryListing(ROOT_ID));
@@ -255,11 +254,11 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
"k", new IgfsListingEntry(k)), mgr.directoryListing(b.id()));
// Validate empty files listings.
- for (IgfsFileInfo info : Arrays.asList(f1, f2, f3))
+ for (IgfsEntryInfo info : Arrays.asList(f1, f2, f3))
assertEmpty(mgr.directoryListing(info.id()));
// Validate 'file info' operations.
- for (IgfsFileInfo info : Arrays.asList(rootInfo, a, b, f1, f2, f3)) {
+ for (IgfsEntryInfo info : Arrays.asList(rootInfo, a, b, f1, f2, f3)) {
assertEquals(info, mgr.info(info.id()));
assertEquals(F.asMap(info.id(), info), mgr.infos(Arrays.asList(info.id())));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
index f567099..0be61e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
@@ -17,17 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicInteger;
-import javax.cache.Cache;
import org.apache.commons.io.IOUtils;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
@@ -56,10 +45,21 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.jetbrains.annotations.Nullable;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
+import javax.cache.Cache;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static java.nio.charset.StandardCharsets.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
/**
* Tests for {@link IgfsProcessor}.
@@ -227,8 +227,8 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
IgfsFileImpl info = (IgfsFileImpl)igfs.info(path);
for (int i = 0; i < nodesCount(); i++) {
- IgfsFileInfo fileInfo =
- (IgfsFileInfo)grid(i).cachex(metaCacheName).localPeek(info.fileId(), ONHEAP_PEEK_MODES, null);
+ IgfsEntryInfo fileInfo =
+ (IgfsEntryInfo)grid(i).cachex(metaCacheName).localPeek(info.fileId(), ONHEAP_PEEK_MODES, null);
assertNotNull(fileInfo);
assertNotNull(fileInfo.listing());
@@ -693,10 +693,10 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
IgniteUuid fileId = U.field(igfs.info(path), "fileId");
- GridCacheAdapter<IgniteUuid, IgfsFileInfo> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME);
+ GridCacheAdapter<IgniteUuid, IgfsEntryInfo> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME);
GridCacheAdapter<IgfsBlockKey, byte[]> dataCache = ((IgniteKernal)grid(0)).internalCache(DATA_CACHE_NAME);
- IgfsFileInfo info = metaCache.get(fileId);
+ IgfsEntryInfo info = metaCache.get(fileId);
assertNotNull(info);
assertTrue(info.isFile());
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
index 744991c..7c0e3c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
@@ -17,17 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicReference;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheMode;
@@ -55,12 +44,23 @@ import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.transactions.Transaction;
import org.jsr166.ThreadLocalRandom8;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-import static org.apache.ignite.cache.CacheRebalanceMode.SYNC;
-import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
-import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
+import static org.apache.ignite.transactions.TransactionConcurrency.*;
+import static org.apache.ignite.transactions.TransactionIsolation.*;
/**
* {@link IgfsAttributes} test case.
@@ -505,12 +505,12 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
os.write(chunk((int)igfsMaxData));
os.close();
- final IgniteCache<IgniteUuid, IgfsFileInfo> metaCache = igfs.context().kernalContext().cache().jcache(
+ final IgniteCache<IgniteUuid, IgfsEntryInfo> metaCache = igfs.context().kernalContext().cache().jcache(
igfs.configuration().getMetaCacheName());
// Start a transaction in a separate thread which will lock file ID.
final IgniteUuid id = igfs.context().meta().fileId(path);
- final IgfsFileInfo info = igfs.context().meta().info(id);
+ final IgfsEntryInfo info = igfs.context().meta().info(id);
final AtomicReference<Throwable> err = new AtomicReference<>();
@@ -546,7 +546,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
metaCache.put(IgfsUtils.ROOT_ID, IgfsUtils.createDirectory(IgfsUtils.ROOT_ID));
// Add file to trash listing.
- IgfsFileInfo trashInfo = metaCache.get(trashId);
+ IgfsEntryInfo trashInfo = metaCache.get(trashId);
if (trashInfo == null)
metaCache.put(trashId, IgfsUtils.createDirectory(trashId).listing(listing));
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
index 8383a18..4111fe8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
@@ -17,17 +17,6 @@
package org.apache.ignite.internal.processors.igfs;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Random;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteFileSystem;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
@@ -53,11 +42,21 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-import static org.apache.ignite.testframework.GridTestUtils.getFieldValue;
-import static org.apache.ignite.testframework.GridTestUtils.runMultiThreaded;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.testframework.GridTestUtils.*;
/**
* Tests for IGFS streams content.
@@ -276,7 +275,7 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
GridCacheAdapter<Object, Object> metaCache = ((IgniteKernal)grid(0)).internalCache(META_CACHE_NAME);
- IgfsFileInfo fileInfo = (IgfsFileInfo)metaCache.get(fileImpl.fileId());
+ IgfsEntryInfo fileInfo = (IgfsEntryInfo)metaCache.get(fileImpl.fileId());
IgfsFileMap map = fileInfo.fileMap();
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 2f8155c..7cedae1 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -17,31 +17,6 @@
package org.apache.ignite.testframework.junits;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.cache.configuration.Factory;
-import javax.cache.configuration.FactoryBuilder;
import junit.framework.TestCase;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
@@ -102,10 +77,36 @@ import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext;
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
-import static org.apache.ignite.testframework.config.GridTestProperties.BINARY_MARSHALLER_USE_SIMPLE_NAME_MAPPER;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.FactoryBuilder;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
+import static org.apache.ignite.testframework.config.GridTestProperties.*;
/**
* Common abstract test for Ignite tests.
@@ -537,10 +538,10 @@ public abstract class GridAbstractTest extends TestCase {
}
try {
- List<Integer> jvmIds = IgniteNodeRunner.killAll();
-
- if (!jvmIds.isEmpty())
- log.info("Next processes of IgniteNodeRunner were killed: " + jvmIds);
+// List<Integer> jvmIds = IgniteNodeRunner.killAll();
+//
+// if (!jvmIds.isEmpty())
+// log.info("Next processes of IgniteNodeRunner were killed: " + jvmIds);
beforeTestsStarted();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/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 0d69a2d..9cd1d1d 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
@@ -41,8 +41,8 @@ import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystemPositionedReadabl
import org.apache.ignite.internal.processors.hadoop.HadoopPayloadAware;
import org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsProperties;
import org.apache.ignite.internal.processors.hadoop.igfs.HadoopIgfsSecondaryFileSystemPositionedReadable;
+import org.apache.ignite.internal.processors.igfs.IgfsEntryInfo;
import org.apache.ignite.internal.processors.igfs.IgfsFileImpl;
-import org.apache.ignite.internal.processors.igfs.IgfsFileInfo;
import org.apache.ignite.internal.processors.igfs.IgfsUtils;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgniteOutClosure;
@@ -60,9 +60,7 @@ import java.util.Collections;
import java.util.Map;
import java.util.concurrent.Callable;
-import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_GROUP_NAME;
-import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_PERMISSION;
-import static org.apache.ignite.internal.processors.igfs.IgfsEx.PROP_USER_NAME;
+import static org.apache.ignite.internal.processors.igfs.IgfsEx.*;
/**
* Secondary file system which delegates calls to an instance of Hadoop {@link FileSystem}.
@@ -352,7 +350,7 @@ public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSys
Collection<IgfsFile> res = new ArrayList<>(statuses.length);
for (FileStatus s : statuses) {
- IgfsFileInfo fsInfo = s.isDirectory() ?
+ IgfsEntryInfo fsInfo = s.isDirectory() ?
IgfsUtils.createDirectory(
IgniteUuid.randomUuid(),
null,
http://git-wip-us.apache.org/repos/asf/ignite/blob/9480b0a3/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java
index 0ec8a78..7cfa099 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfsDualAbstractSelfTest.java
@@ -17,9 +17,6 @@
package org.apache.ignite.igfs;
-import java.io.IOException;
-import java.net.URI;
-import java.util.concurrent.Callable;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
@@ -34,7 +31,7 @@ import org.apache.ignite.hadoop.fs.IgniteHadoopIgfsSecondaryFileSystem;
import org.apache.ignite.igfs.secondary.IgfsSecondaryFileSystem;
import org.apache.ignite.internal.processors.igfs.IgfsBlockKey;
import org.apache.ignite.internal.processors.igfs.IgfsCommonAbstractTest;
-import org.apache.ignite.internal.processors.igfs.IgfsFileInfo;
+import org.apache.ignite.internal.processors.igfs.IgfsEntryInfo;
import org.apache.ignite.internal.processors.igfs.IgfsImpl;
import org.apache.ignite.internal.processors.igfs.IgfsMetaManager;
import org.apache.ignite.internal.util.typedef.G;
@@ -44,16 +41,15 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
-import static org.apache.ignite.cache.CacheMode.PARTITIONED;
-import static org.apache.ignite.cache.CacheMode.REPLICATED;
-import static org.apache.ignite.igfs.IgfsMode.DUAL_ASYNC;
-import static org.apache.ignite.igfs.IgfsMode.DUAL_SYNC;
-import static org.apache.ignite.igfs.IgfsMode.PRIMARY;
-import static org.apache.ignite.internal.processors.hadoop.fs.HadoopParameters.PARAM_IGFS_SEQ_READS_BEFORE_PREFETCH;
-import static org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest.awaitFileClose;
-import static org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest.clear;
-import static org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest.create;
+import java.io.IOException;
+import java.net.URI;
+import java.util.concurrent.Callable;
+
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+import static org.apache.ignite.igfs.IgfsMode.*;
+import static org.apache.ignite.internal.processors.hadoop.fs.HadoopParameters.*;
+import static org.apache.ignite.internal.processors.igfs.IgfsAbstractSelfTest.*;
/**
* Tests for IGFS working in mode when remote file system exists: DUAL_SYNC, DUAL_ASYNC.
@@ -279,7 +275,7 @@ public abstract class HadoopIgfsDualAbstractSelfTest extends IgfsCommonAbstractT
// Wait for a while for prefetch to finish (if any).
IgfsMetaManager meta = igfs.context().meta();
- IgfsFileInfo info = meta.info(meta.fileId(FILE));
+ IgfsEntryInfo info = meta.info(meta.fileId(FILE));
IgfsBlockKey key = new IgfsBlockKey(info.id(), info.affinityKey(), info.evictExclude(), 2);