You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/06/07 07:56:08 UTC
[05/14] ignite git commit: Removed "meta" and "data" fields.
Removed "meta" and "data" fields.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5949abe4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5949abe4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5949abe4
Branch: refs/heads/ignite-3264
Commit: 5949abe4943bc07de26c4ecce62148e7f399cb41
Parents: b6c6b48
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Jun 6 12:02:59 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Jun 6 12:02:59 2016 +0300
----------------------------------------------------------------------
.../processors/igfs/IgfsOutputStreamImpl.java | 38 ++++++++------------
1 file changed, 15 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5949abe4/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 98ccb81..bc32e81 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
@@ -72,12 +72,6 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
/** IGFS context. */
private IgfsContext igfsCtx;
- /** Meta info manager. */
- private final IgfsMetaManager meta;
-
- /** Data manager. */
- private final IgfsDataManager data;
-
/** File descriptor. */
@SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
private IgfsEntryInfo fileInfo;
@@ -146,8 +140,6 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
assert !IgfsUtils.DELETE_LOCK_ID.equals(fileInfo.lockId());
this.igfsCtx = igfsCtx;
- meta = igfsCtx.meta();
- data = igfsCtx.data();
this.fileInfo = fileInfo;
this.mode = mode;
@@ -156,7 +148,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
streamRange = initialStreamRange(fileInfo);
- writeCompletionFut = data.writeStart(fileInfo);
+ writeCompletionFut = igfsCtx.data().writeStart(fileInfo);
metrics.incrementFilesOpenedForWrite();
}
@@ -295,7 +287,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
boolean exists;
try {
- exists = meta.exists(fileInfo.id());
+ exists = igfsCtx.meta().exists(fileInfo.id());
} catch (IgniteCheckedException e) {
throw new IOException("File to read file metadata: " + path, e);
}
@@ -314,7 +306,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
try {
if (remainder != null) {
- data.storeDataBlocks(fileInfo, fileInfo.length() + space, null, 0,
+ igfsCtx.data().storeDataBlocks(fileInfo, fileInfo.length() + space, null, 0,
ByteBuffer.wrap(remainder, 0, remainderDataLen), true, streamRange, batch);
remainder = null;
@@ -322,9 +314,9 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
}
if (space > 0) {
- data.awaitAllAcksReceived(fileInfo.id());
+ igfsCtx.data().awaitAllAcksReceived(fileInfo.id());
- IgfsEntryInfo fileInfo0 = meta.reserveSpace(path, fileInfo.id(), space, streamRange);
+ IgfsEntryInfo fileInfo0 = igfsCtx.meta().reserveSpace(path, fileInfo.id(), space, streamRange);
if (fileInfo0 == null)
throw new IOException("File was concurrently deleted: " + path);
@@ -376,8 +368,8 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
remainderDataLen += writeLen;
}
else {
- remainder = data.storeDataBlocks(fileInfo, fileInfo.length() + space, remainder, remainderDataLen, block,
- false, streamRange, batch);
+ remainder = igfsCtx.data().storeDataBlocks(fileInfo, fileInfo.length() + space, remainder,
+ remainderDataLen, block, false, streamRange, batch);
remainderDataLen = remainder == null ? 0 : remainder.length;
}
@@ -417,8 +409,8 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
remainderDataLen += len;
}
else {
- remainder = data.storeDataBlocks(fileInfo, fileInfo.length() + space, remainder, remainderDataLen, in, len,
- false, streamRange, batch);
+ remainder = igfsCtx.data().storeDataBlocks(fileInfo, fileInfo.length() + space, remainder,
+ remainderDataLen, in, len, false, streamRange, batch);
remainderDataLen = remainder == null ? 0 : remainder.length;
}
@@ -462,7 +454,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
boolean exists;
try {
- exists = !deleted && meta.exists(fileInfo.id());
+ exists = !deleted && igfsCtx.meta().exists(fileInfo.id());
}
catch (IgniteCheckedException e) {
throw new IOException("File to read file metadata: " + path, e);
@@ -472,7 +464,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
IOException err = null;
try {
- data.writeClose(fileInfo);
+ igfsCtx.data().writeClose(fileInfo);
writeCompletionFut.get();
}
@@ -499,10 +491,10 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
long modificationTime = System.currentTimeMillis();
try {
- meta.unlock(fileInfo, modificationTime);
+ igfsCtx.meta().unlock(fileInfo, modificationTime);
}
catch (IgfsPathNotFoundException ignore) {
- data.delete(fileInfo); // Safety to ensure that all data blocks are deleted.
+ igfsCtx.data().delete(fileInfo); // Safety to ensure that all data blocks are deleted.
throw new IOException("File was concurrently deleted: " + path);
}
@@ -526,7 +518,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
", fileInfo=" + fileInfo + ']', e);
}
finally {
- data.delete(fileInfo);
+ igfsCtx.data().delete(fileInfo);
}
}
}
@@ -601,7 +593,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
IgniteUuid prevAffKey = map == null ? null : map.affinityKey(lastBlockOff, false);
- IgniteUuid affKey = data.nextAffinityKey(prevAffKey);
+ IgniteUuid affKey = igfsCtx.data().nextAffinityKey(prevAffKey);
return affKey == null ? null : new IgfsFileAffinityRange(off, off, affKey);
}