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:09 UTC
[06/14] ignite git commit: Removed more unnecessary fields.
Removed more unnecessary fields.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a76b3492
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a76b3492
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a76b3492
Branch: refs/heads/ignite-3264
Commit: a76b3492b6c1312c7c3b7bac0b302dba788e4fba
Parents: 5949abe
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Jun 6 12:05:28 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Jun 6 12:05:28 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/igfs/IgfsImpl.java | 9 ++++-----
.../processors/igfs/IgfsOutputStreamImpl.java | 14 ++++----------
2 files changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a76b3492/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 bc2e087..5e2bca0 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
@@ -1078,7 +1078,7 @@ public final class IgfsImpl implements IgfsEx {
batch = newBatch(path, desc.out());
IgfsOutputStreamImpl os = new IgfsOutputStreamImpl(igfsCtx, path, desc.info(),
- bufferSize(bufSize), mode, batch, metrics);
+ bufferSize(bufSize), mode, batch);
IgfsUtils.sendEvents(igfsCtx.kernalContext(), path, EVT_IGFS_FILE_OPENED_WRITE);
@@ -1107,7 +1107,7 @@ public final class IgfsImpl implements IgfsEx {
assert res != null;
- return new IgfsOutputStreamImpl(igfsCtx, path, res, bufferSize(bufSize), mode, null, metrics);
+ return new IgfsOutputStreamImpl(igfsCtx, path, res, bufferSize(bufSize), mode, null);
}
});
}
@@ -1142,8 +1142,7 @@ public final class IgfsImpl implements IgfsEx {
batch = newBatch(path, desc.out());
- return new IgfsOutputStreamImpl(igfsCtx, path, desc.info(), bufferSize(bufSize), mode, batch,
- metrics);
+ return new IgfsOutputStreamImpl(igfsCtx, path, desc.info(), bufferSize(bufSize), mode, batch);
}
final List<IgniteUuid> ids = meta.idsForPath(path);
@@ -1184,7 +1183,7 @@ public final class IgfsImpl implements IgfsEx {
assert res != null;
- return new IgfsOutputStreamImpl(igfsCtx, path, res, bufferSize(bufSize), mode, null, metrics);
+ return new IgfsOutputStreamImpl(igfsCtx, path, res, bufferSize(bufSize), mode, null);
}
});
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a76b3492/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 bc32e81..8c93aad 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
@@ -98,9 +98,6 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
/** Ensures that onClose)_ routine is called no more than once. */
private final AtomicBoolean onCloseGuard = new AtomicBoolean();
- /** Local IGFS metrics. */
- private final IgfsLocalMetrics metrics;
-
/** Affinity written by this output stream. */
private IgfsFileAffinityRange streamRange;
@@ -119,10 +116,9 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
* @param bufSize The size of the buffer to be used.
* @param mode Grid IGFS mode.
* @param batch Optional secondary file system batch.
- * @param metrics Local IGFS metrics.
*/
IgfsOutputStreamImpl(IgfsContext igfsCtx, IgfsPath path, IgfsEntryInfo fileInfo, int bufSize, IgfsMode mode,
- @Nullable IgfsFileWorkerBatch batch, IgfsLocalMetrics metrics) {
+ @Nullable IgfsFileWorkerBatch batch) {
synchronized (mux) {
this.path = path;
this.bufSize = optimizeBufferSize(bufSize, fileInfo);
@@ -131,7 +127,6 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
assert fileInfo.isFile() : "Unexpected file info: " + fileInfo;
assert mode != null && mode != PROXY;
assert mode == PRIMARY && batch == null || batch != null;
- assert metrics != null;
// File hasn't been locked.
if (fileInfo.lockId() == null)
@@ -144,13 +139,12 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
this.fileInfo = fileInfo;
this.mode = mode;
this.batch = batch;
- this.metrics = metrics;
streamRange = initialStreamRange(fileInfo);
writeCompletionFut = igfsCtx.data().writeStart(fileInfo);
- metrics.incrementFilesOpenedForWrite();
+ igfsCtx.igfs().localMetrics().incrementFilesOpenedForWrite();
}
}
@@ -259,7 +253,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
if (closeGuard.compareAndSet(false, true)) {
onClose(false);
- metrics.decrementFilesOpenedForWrite();
+ igfsCtx.igfs().localMetrics().decrementFilesOpenedForWrite();
GridEventStorageManager evts = igfsCtx.kernalContext().event();
@@ -472,7 +466,7 @@ class IgfsOutputStreamImpl extends IgfsOutputStream {
err = new IOException("Failed to close stream [path=" + path + ", fileInfo=" + fileInfo + ']', e);
}
- metrics.addWrittenBytesTime(bytes, time);
+ igfsCtx.igfs().localMetrics().addWrittenBytesTime(bytes, time);
// Await secondary file system processing to finish.
if (mode == DUAL_SYNC) {