Repository: ignite Updated Branches: refs/heads/ignite-5075 eeba611c8 -> 781e33ec1
ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ec6441a5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ec6441a5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ec6441a5 Branch: refs/heads/ignite-5075 Commit: ec6441a5d77fe25cbe715c16a4bac3ada337678d Parents: eeba611 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jun 1 12:35:28 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jun 1 12:42:46 2017 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 12 ++++++--- .../processors/cache/GridCacheIoManager.java | 26 +++++++++--------- .../cache/IgniteCacheOffheapManagerImpl.java | 28 +++++++++++++++----- .../processors/query/GridQueryProcessor.java | 2 +- 4 files changed, 45 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ec6441a5/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index f7b7f3f..67b7590 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -458,13 +458,19 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { writeSync = cc.getWriteSynchronizationMode(); } - // TODO IGNTIE-5075. + /** + * @return Cache group name. + */ public String getGroupName() { return grpName; } - public CacheConfiguration<K, V> setGroupName(String groupName) { - this.grpName = groupName; + /** + * @param grpName Cache group name. + * @return {@code this} for chaining. + */ + public CacheConfiguration<K, V> setGroupName(String grpName) { + this.grpName = grpName; return this; } http://git-wip-us.apache.org/repos/asf/ignite/blob/ec6441a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java index 4df3e72..8556c87 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java @@ -252,19 +252,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { }; /** - * @param msg Message. - * @return Cache or group descriptor. - */ - private Object descriptorForMessage(GridCacheMessage msg) { - if (msg instanceof GridCacheIdMessage) - return cctx.cache().cacheDescriptor(((GridCacheIdMessage)msg).cacheId()); - else if (msg instanceof GridCacheGroupIdMessage) - return cctx.cache().cacheGroupDescriptors().get(((GridCacheGroupIdMessage)msg).groupId()); - - return null; - } - - /** * @param nodeId Sender node ID. * @param cacheMsg Message. */ @@ -1418,6 +1405,19 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { } } + /** + * @param msg Message. + * @return Cache or group descriptor. + */ + private Object descriptorForMessage(GridCacheMessage msg) { + if (msg instanceof GridCacheIdMessage) + return cctx.cache().cacheDescriptor(((GridCacheIdMessage)msg).cacheId()); + else if (msg instanceof GridCacheGroupIdMessage) + return cctx.cache().cacheGroupDescriptors().get(((GridCacheGroupIdMessage)msg).groupId()); + + return null; + } + /** {@inheritDoc} */ @Override public void printMemoryStats() { X.println(">>> "); http://git-wip-us.apache.org/repos/asf/ignite/blob/ec6441a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index 26e3f3a..81f8ce2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -1001,6 +1001,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** + * @param cctx Cache context. * @param oldRow Old row. * @param dataRow New row. * @return {@code True} if it is possible to update old row data. @@ -1094,7 +1095,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager assert dataRow.link() != 0 : dataRow; - if (dataRow.cacheId() == UNDEFINED_CACHE_ID && grp.sharedGroup()) + if (grp.sharedGroup() && dataRow.cacheId() == UNDEFINED_CACHE_ID) dataRow.cacheId(cctx.cacheId()); return dataRow; @@ -1139,7 +1140,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager assert dataRow.link() != 0 : dataRow; - if (dataRow.cacheId() == UNDEFINED_CACHE_ID && grp.sharedGroup()) + if (grp.sharedGroup() && dataRow.cacheId() == UNDEFINED_CACHE_ID) dataRow.cacheId(cctx.cacheId()); if (oldRow != null) { @@ -1236,6 +1237,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** + * @param cctx Cache context. * @param key Key. * @param oldRow Removed row. * @throws IgniteCheckedException If failed. @@ -1425,9 +1427,11 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** + * @param cctx Cache context. * @param key Key. * @param oldVal Old value. * @param newVal New value. + * @throws IgniteCheckedException If failed. */ private void updateIgfsMetrics( GridCacheContext cctx, @@ -1454,6 +1458,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager /** * Isolated method to get length of IGFS block. * + * @param cctx Cache context. * @param val Value. * @return Length of value. */ @@ -1538,6 +1543,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager /** * @param hash Hash code. * @param link Link. + * @param part Partition. * @param rowData Required row data. */ DataRow(int hash, long link, int part, CacheDataRowAdapter.RowData rowData) { @@ -1565,6 +1571,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager * @param ver Version. * @param part Partition. * @param expireTime Expire time. + * @param cacheId Cache ID. */ DataRow(KeyCacheObject key, CacheObject val, GridCacheVersion ver, int part, long expireTime, int cacheId) { super(0); @@ -1612,6 +1619,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager private final CacheGroupInfrastructure grp; /** + * @param grp Ccahe group. * @param name Tree name. * @param reuseList Reuse list. * @param rowStore Row store. @@ -1619,7 +1627,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager * @param initNew Initialize new index. * @throws IgniteCheckedException If failed. */ - public CacheDataTree( + CacheDataTree( CacheGroupInfrastructure grp, String name, ReuseList reuseList, @@ -1822,6 +1830,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager /** * @param grp Cache group. * @param freeList Free list. + * @param partId Partition number. */ public CacheDataRowStore(CacheGroupInfrastructure grp, FreeList freeList, int partId) { super(grp, freeList); @@ -1830,6 +1839,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** + * @param cacheId Cache ID. * @param hash Hash code. * @param link Link. * @return Search row. @@ -1844,6 +1854,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** + * @param cacheId Cache ID. * @param hash Hash code. * @param link Link. * @param rowData Required row data. @@ -2226,6 +2237,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager private final CacheGroupInfrastructure grp; /** + * @param grp Cache group. * @param name Tree name. * @param pageMem Page memory. * @param metaPageId Meta page ID. @@ -2233,7 +2245,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager * @param initNew Initialize new index. * @throws IgniteCheckedException If failed. */ - public PendingEntriesTree( + PendingEntriesTree( CacheGroupInfrastructure grp, String name, PageMemory pageMem, @@ -2332,7 +2344,9 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager int getCacheId(long pageAddr, int idx); } - /** */ + /** + * + */ private static abstract class AbstractPendingEntryInnerIO extends BPlusInnerIO<PendingRow> implements PendingRowIO { /** * @param type Page type. @@ -2404,7 +2418,9 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager protected abstract boolean storeCacheId(); } - /** */ + /** + * + */ private static abstract class AbstractPendingEntryLeafIO extends BPlusLeafIO<PendingRow> implements PendingRowIO { /** * @param type Page type. http://git-wip-us.apache.org/repos/asf/ignite/blob/ec6441a5/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 37cce73..dbf1e52 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -1537,7 +1537,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { } catch (Throwable e) { U.error(log, "Failed to rebuild indexes for type [cache=" + cacheName + - ", name=" + typeName + ']', e); + ", type=" + typeName + ']', e); fut.onDone(e);
