You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/05/22 17:44:35 UTC
[12/15] ignite git commit: ignite-gg-12163
IGNITE_PDS_WAL_RECORD_ITERATOR_BUFFER_SIZE cosmetic update
ignite-gg-12163 IGNITE_PDS_WAL_RECORD_ITERATOR_BUFFER_SIZE cosmetic update
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e78441c0
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e78441c0
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e78441c0
Branch: refs/heads/ignite-5267
Commit: e78441c03b2cb1e4d5d6f26462e98eb88b2720c9
Parents: f3bb474
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Mon May 22 16:15:11 2017 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Mon May 22 16:15:11 2017 +0300
----------------------------------------------------------------------
.../snapshot/StartSnapshotOperationDiscoveryMessage.java | 4 +++-
.../cache/distributed/dht/GridDhtLocalPartition.java | 7 +++++--
.../cache/database/wal/FileWriteAheadLogManager.java | 3 +--
3 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e78441c0/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/StartSnapshotOperationDiscoveryMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/StartSnapshotOperationDiscoveryMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/StartSnapshotOperationDiscoveryMessage.java
index 700f404..18bca36 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/StartSnapshotOperationDiscoveryMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/snapshot/StartSnapshotOperationDiscoveryMessage.java
@@ -115,7 +115,9 @@ public class StartSnapshotOperationDiscoveryMessage implements DiscoveryCustomMe
return id;
}
- /** {@inheritDoc} */
+ /**
+ *
+ */
public IgniteUuid operationId() {
return operationId;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e78441c0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 1d910a3..a35c168 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@ -141,8 +141,11 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
* @param id Partition ID.
* @param entryFactory Entry factory.
*/
- @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor") GridDhtLocalPartition(GridCacheContext cctx,
- int id, GridCacheMapEntryFactory entryFactory) {
+ @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor") GridDhtLocalPartition(
+ GridCacheContext cctx,
+ int id,
+ GridCacheMapEntryFactory entryFactory
+ ) {
super(cctx, entryFactory, Math.max(10, GridCacheAdapter.DFLT_START_CACHE_SIZE / cctx.affinity().partitions()));
this.id = id;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e78441c0/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/wal/FileWriteAheadLogManager.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/wal/FileWriteAheadLogManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/wal/FileWriteAheadLogManager.java
index 1ef9384..2346f7e 100644
--- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/wal/FileWriteAheadLogManager.java
+++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/wal/FileWriteAheadLogManager.java
@@ -2012,8 +2012,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
this.end = end;
this.log = log;
- int tlbSize0 = 16 * tlbSize;
- int buffSize0 = tlbSize0 < buffSize ? tlbSize0 : buffSize;
+ int buffSize0 = Math.min(16 * tlbSize, buffSize);
// Do not allocate direct buffer for iterator.
buf = ByteBuffer.allocate(buffSize0);