Repository: ignite Updated Branches: refs/heads/ignite-5075-pds 01d914b1a -> fdd76de24
ignite-5075-pds Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fdd76de2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fdd76de2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fdd76de2 Branch: refs/heads/ignite-5075-pds Commit: fdd76de24062d524c407b5c049cbe6ef260decce Parents: 01d914b Author: sboikov <[email protected]> Authored: Wed May 31 13:53:12 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed May 31 13:53:12 2017 +0300 ---------------------------------------------------------------------- .../database/tree/io/PagePartitionCountersIO.java | 4 +++- .../cache/database/GridCacheOffheapManager.java | 13 +------------ .../load/IgniteCacheRandomOperationBenchmark.java | 4 ++-- .../ignite/yardstick/cache/load/model/ModelUtil.java | 3 ++- 4 files changed, 8 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fdd76de2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PagePartitionCountersIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PagePartitionCountersIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PagePartitionCountersIO.java index 34dba22..015b8ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PagePartitionCountersIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/PagePartitionCountersIO.java @@ -94,7 +94,9 @@ public class PagePartitionCountersIO extends PageIO { int items = (cacheSizes.length / ITEM_SIZE) - itemsOff; int write = Math.min(cap, items); - PageUtils.putBytes(pageAddr, ITEMS_OFF, cacheSizes, itemsOff * ITEM_SIZE, write * ITEM_SIZE); + if (write > 0) + // This can happen in case there are no items in a given partition for all caches in the group. + PageUtils.putBytes(pageAddr, ITEMS_OFF, cacheSizes, itemsOff * ITEM_SIZE, write * ITEM_SIZE); setCount(pageAddr, write); http://git-wip-us.apache.org/repos/asf/ignite/blob/fdd76de2/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java index bd2e9cb..80017cf 100644 --- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java +++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheOffheapManager.java @@ -22,7 +22,6 @@ import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; import java.util.Set; -import java.util.TreeMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.ignite.IgniteCheckedException; @@ -116,7 +115,6 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple try { final String name = "PendingEntries"; - // TODO IGNITE-5075: per cache? RootPage pendingRootPage = metaStore.getOrAllocateForTree(name); pendingEntries = new PendingEntriesTree( @@ -362,15 +360,6 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple * @return Serialized cache sizes */ private byte[] serializeCacheSizes(Map<Integer, Long> cacheSizes) { - Set<Map.Entry<Integer, Long>> entries = cacheSizes.entrySet(); - cacheSizes = new TreeMap<>(); - - // Sort and filter zero-sized caches. - for (Map.Entry<Integer, Long> entry : entries) { - if (entry.getValue() != 0) - cacheSizes.put(entry.getKey(), entry.getValue()); - } - // Item size = 4 bytes (cache ID) + 8 bytes (cache size) = 12 bytes byte[] data = new byte[cacheSizes.size() * 12]; long off = GridUnsafe.BYTE_ARR_OFF; @@ -1128,7 +1117,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple /** {@inheritDoc} */ @Override public void updateCounter(long val) { try { - CacheDataStore delegate0 = init0(true); + CacheDataStore delegate0 = init0(false); if (delegate0 != null) delegate0.updateCounter(val); http://git-wip-us.apache.org/repos/asf/ignite/blob/fdd76de2/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java index 9c9cbe4..681ba34 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java @@ -270,7 +270,7 @@ public class IgniteCacheRandomOperationBenchmark extends IgniteAbstractBenchmark keys.add(keyCls); else throw new IgniteException("Class is unknown for the load test. Make sure you " + - "specified its full name [clsName=" + queryEntity.getKeyType() + ']'); + "specified its full name [cache=" + cacheName + ", clsName=" + queryEntity.getKeyType() + ']'); } if (queryEntity.getValueType() != null) { @@ -280,7 +280,7 @@ public class IgniteCacheRandomOperationBenchmark extends IgniteAbstractBenchmark values.add(valCls); else throw new IgniteException("Class is unknown for the load test. Make sure you " + - "specified its full name [clsName=" + queryEntity.getKeyType() + ']'); + "specified its full name [cache=" + cacheName + ", clsName=" + queryEntity.getValueType() + ']'); configureCacheSqlDescriptor(cacheName, queryEntity, valCls); } http://git-wip-us.apache.org/repos/asf/ignite/blob/fdd76de2/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/model/ModelUtil.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/model/ModelUtil.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/model/ModelUtil.java index 492ace7..667e8c9 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/model/ModelUtil.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/model/ModelUtil.java @@ -38,6 +38,7 @@ public class ModelUtil { * Classes of keys. */ private static Class[] keyClasses = { + Integer.class, Double.class, Identifier.class, Mark.class, @@ -104,7 +105,7 @@ public class ModelUtil { * @return object from model */ public static Object create(Class c, int id) { - Object res = null; + Object res; switch (c.getSimpleName()) { case "Double":
