IGNITE-3522: Renamed "streamBufferSize" property of FileSystemConfiguration to "bufferSize".
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a6d518d4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a6d518d4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a6d518d4 Branch: refs/heads/ignite-4003 Commit: a6d518d40b946c23918423e15fd332dc185783b6 Parents: 0ccb856 Author: devozerov <[email protected]> Authored: Thu Apr 6 14:07:46 2017 +0300 Committer: devozerov <[email protected]> Committed: Thu Apr 6 14:07:46 2017 +0300 ---------------------------------------------------------------------- .../ignite/configuration/FileSystemConfiguration.java | 6 +++--- .../apache/ignite/internal/processors/igfs/IgfsImpl.java | 10 +++++----- .../internal/visor/node/VisorIgfsConfiguration.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a6d518d4/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java index 75e9f7d..e1aaa711 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java @@ -204,7 +204,7 @@ public class FileSystemConfiguration { * Must preserve alphabetical order! */ blockSize = cfg.getBlockSize(); - bufSize = cfg.getStreamBufferSize(); + bufSize = cfg.getBufferSize(); colocateMeta = cfg.isColocateMetadata(); dataCacheCfg = cfg.getDataCacheConfiguration(); dfltMode = cfg.getDefaultMode(); @@ -411,7 +411,7 @@ public class FileSystemConfiguration { * * @return Read/write buffers size (bytes). */ - public int getStreamBufferSize() { + public int getBufferSize() { return bufSize; } @@ -421,7 +421,7 @@ public class FileSystemConfiguration { * @param bufSize Read/write buffers size for stream operations (bytes) or {@code 0} to reset default value. * @return {@code this} for chaining. */ - public FileSystemConfiguration setStreamBufferSize(int bufSize) { + public FileSystemConfiguration setBufferSize(int bufSize) { A.ensure(bufSize >= 0, "bufSize >= 0"); this.bufSize = bufSize == 0 ? DFLT_BUF_SIZE : bufSize; http://git-wip-us.apache.org/repos/asf/ignite/blob/a6d518d4/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 6ffa202..a946c71 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 @@ -931,7 +931,7 @@ public final class IgfsImpl implements IgfsEx { /** {@inheritDoc} */ @Override public IgfsInputStream open(IgfsPath path) { - return open(path, cfg.getStreamBufferSize(), cfg.getSequentialReadsBeforePrefetch()); + return open(path, cfg.getBufferSize(), cfg.getSequentialReadsBeforePrefetch()); } /** {@inheritDoc} */ @@ -951,7 +951,7 @@ public final class IgfsImpl implements IgfsEx { if (log.isDebugEnabled()) log.debug("Open file for reading [path=" + path + ", bufSize=" + bufSize + ']'); - int bufSize0 = bufSize == 0 ? cfg.getStreamBufferSize() : bufSize; + int bufSize0 = bufSize == 0 ? cfg.getBufferSize() : bufSize; IgfsMode mode = resolveMode(path); @@ -1034,7 +1034,7 @@ public final class IgfsImpl implements IgfsEx { /** {@inheritDoc} */ @Override public IgfsOutputStream create(IgfsPath path, boolean overwrite) { - return create0(path, cfg.getStreamBufferSize(), overwrite, null, 0, null, true); + return create0(path, cfg.getBufferSize(), overwrite, null, 0, null, true); } /** {@inheritDoc} */ @@ -1141,7 +1141,7 @@ public final class IgfsImpl implements IgfsEx { /** {@inheritDoc} */ @Override public IgfsOutputStream append(IgfsPath path, boolean create) { - return append(path, cfg.getStreamBufferSize(), create, null); + return append(path, cfg.getBufferSize(), create, null); } /** {@inheritDoc} */ @@ -1808,7 +1808,7 @@ public final class IgfsImpl implements IgfsEx { * @return Real buffer size. */ private int bufferSize(int bufSize) { - return bufSize == 0 ? cfg.getStreamBufferSize() : bufSize; + return bufSize == 0 ? cfg.getBufferSize() : bufSize; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a6d518d4/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java index 7f8e3b0..723d2a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java @@ -134,7 +134,7 @@ public class VisorIgfsConfiguration implements Serializable, LessNamingBean { cfg.dataCacheName = igfs.getDataCacheConfiguration().getName(); cfg.blockSize = igfs.getBlockSize(); cfg.prefetchBlocks = igfs.getPrefetchBlocks(); - cfg.streamBufSize = igfs.getStreamBufferSize(); + cfg.streamBufSize = igfs.getBufferSize(); cfg.perNodeBatchSize = igfs.getPerNodeBatchSize(); cfg.perNodeParallelBatchCnt = igfs.getPerNodeParallelBatchCount();
