ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c15749d9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c15749d9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c15749d9 Branch: refs/heads/ignite-5075-pds Commit: c15749d970bad263743666b0420f88a565b1098f Parents: ca176a7 Author: sboikov <sboi...@gridgain.com> Authored: Thu May 25 12:45:25 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu May 25 12:45:25 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/pagemem/PageSupport.java | 2 +- .../cache/CacheGroupInfrastructure.java | 16 ++++++++++- .../cache/IgniteCacheOffheapManagerImpl.java | 10 ++++--- .../cache/database/CacheDataRowAdapter.java | 13 +++++---- .../processors/cache/database/RowStore.java | 5 ++++ .../cache/database/tree/BPlusTree.java | 2 ++ .../GridDistributedCacheAdapter.java | 8 +++--- .../distributed/dht/GridDhtGetSingleFuture.java | 30 ++++++++++---------- .../distributed/dht/GridDhtLocalPartition.java | 3 +- .../dht/GridPartitionedSingleGetFuture.java | 4 +-- .../dht/preloader/GridDhtPartitionDemander.java | 5 ++-- .../near/GridNearOptimisticTxPrepareFuture.java | 21 ++++++++++---- .../cluster/GridClusterStateProcessor.java | 2 +- .../processors/query/GridQueryProcessor.java | 3 +- .../internal/processors/query/QueryUtils.java | 28 ++++++++---------- .../processors/query/h2/database/H2Tree.java | 6 ++-- .../query/h2/database/H2TreeIndex.java | 7 ++--- 17 files changed, 98 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageSupport.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageSupport.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageSupport.java index 0f39058..f4b2d96 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageSupport.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageSupport.java @@ -98,7 +98,7 @@ public interface PageSupport { * @param pageId Page ID. * @param page Page pointer. * @param walPlc {@code True} if page should be recorded to WAL, {@code false} if the page must not -* be recorded and {@code null} for the default behavior. + * be recorded and {@code null} for the default behavior. * @param dirtyFlag Determines whether the page was modified since the last checkpoint. */ public void writeUnlock(int cacheId, long pageId, long page, Boolean walPlc, http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java index 7c07d2d..a38a643 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.Set; import java.util.UUID; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; @@ -625,6 +626,20 @@ public class CacheGroupInfrastructure { } /** + * @return IDs of caches in this group. + */ + public Set<Integer> cacheIds() { + List<GridCacheContext> caches = this.caches; + + Set<Integer> ids = U.newHashSet(caches.size()); + + for (int i = 0; i < caches.size(); i++) + ids.add(caches.get(i).cacheId()); + + return ids; + } + + /** * @return {@code True} if group contains caches. */ boolean hasCaches() { @@ -692,7 +707,6 @@ public class CacheGroupInfrastructure { else preldr = new GridCachePreloaderAdapter(this); - // TODO IGNITE-5075 get from plugin. offheapMgr = new IgniteCacheOffheapManagerImpl(); offheapMgr.start(ctx, this); http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/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 9631268..3cd4a5e 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 @@ -92,7 +92,6 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager protected IgniteLogger log; /** */ - // TODO GG-11208 need restore size after restart. private CacheDataStore locCacheDataStore; /** */ @@ -1182,8 +1181,10 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager if (oldRow != null) { qryMgr.store(key, partId, - oldRow.value(), oldRow.version(), - newRow.value(), newRow.version(), + oldRow.value(), + oldRow.version(), + newRow.value(), + newRow.version(), expireTime, newRow.link()); } @@ -1191,7 +1192,8 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager qryMgr.store(key, partId, null, null, - newRow.value(), newRow.version(), + newRow.value(), + newRow.version(), expireTime, newRow.link()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java index aef39a7..75909d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/CacheDataRowAdapter.java @@ -131,11 +131,14 @@ public class CacheDataRowAdapter implements CacheDataRow { do { final long pageId = pageId(nextLink); - // TODO IGNITE-5075 Here must be "physical" cache ID (aka group ID) - final long page = pageMem.acquirePage(cacheId, pageId); + assert grp != null || !sharedCtx.database().persistenceEnabled(); + + int grpId = grp != null ? grp.groupId() : 0; + + final long page = pageMem.acquirePage(grpId, pageId); try { - long pageAddr = pageMem.readLock(cacheId, pageId, page); // Non-empty data page must not be recycled. + long pageAddr = pageMem.readLock(grpId, pageId, page); // Non-empty data page must not be recycled. assert pageAddr != 0L : nextLink; @@ -172,11 +175,11 @@ public class CacheDataRowAdapter implements CacheDataRow { return; } finally { - pageMem.readUnlock(cacheId, pageId, page); + pageMem.readUnlock(grpId, pageId, page); } } finally { - pageMem.releasePage(cacheId, pageId, page); + pageMem.releasePage(grpId, pageId, page); } } while(nextLink != 0); http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/RowStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/RowStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/RowStore.java index 233fa55..bea17c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/RowStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/RowStore.java @@ -21,6 +21,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.internal.pagemem.PageMemory; import org.apache.ignite.internal.processors.cache.CacheGroupInfrastructure; import org.apache.ignite.internal.processors.cache.CacheObjectContext; +import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.database.freelist.FreeList; /** @@ -31,6 +32,9 @@ public class RowStore { private final FreeList freeList; /** */ + private final GridCacheSharedContext ctx; + + /** */ protected final PageMemory pageMem; /** */ @@ -46,6 +50,7 @@ public class RowStore { this.freeList = freeList; + ctx = grp.shared(); coctx = grp.cacheObjectContext(); pageMem = grp.memoryPolicy().pageMemory(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java index e2461ef..d92f811 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java @@ -2084,6 +2084,8 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements try { long metaPageAddr = writeLock(metaPageId, metaPage); // No checks, we must be out of use. + assert metaPageAddr != 0L; + try { for (long pageId : getFirstPageIds(metaPageAddr)) { assert pageId != 0; http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java index daf4b91..dc9e4ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java @@ -291,7 +291,7 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter } /** {@inheritDoc} */ - @Override public long localSizeLong(int partition, CachePeekMode[] peekModes) throws IgniteCheckedException { + @Override public long localSizeLong(int part, CachePeekMode[] peekModes) throws IgniteCheckedException { PeekModes modes = parsePeekModes(peekModes, true); long size = 0; @@ -305,9 +305,9 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter IgniteCacheOffheapManager offheap = ctx.offheap(); - if (ctx.affinity().primaryByPartition(ctx.localNode(), partition, topVer) && modes.primary || - ctx.affinity().backupByPartition(ctx.localNode(), partition, topVer) && modes.backup) - size += offheap.cacheEntriesCount(ctx.cacheId(), partition); + if (ctx.affinity().primaryByPartition(ctx.localNode(), part, topVer) && modes.primary || + ctx.affinity().backupByPartition(ctx.localNode(), part, topVer) && modes.backup) + size += offheap.cacheEntriesCount(ctx.cacheId(), part); } return size; http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java index 79d0c54..b9007ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java @@ -87,8 +87,8 @@ public final class GridDhtGetSingleFuture<K, V> extends GridFutureAdapter<GridCa /** Topology version .*/ private AffinityTopologyVersion topVer; - /** Retries because ownership changed. */ - private Collection<Integer> retries; + /** Retry because ownership changed. */ + private Integer retry; /** Subject ID. */ private UUID subjId; @@ -201,11 +201,14 @@ public final class GridDhtGetSingleFuture<K, V> extends GridFutureAdapter<GridCa topVer); if (fut != null) { - if (F.isEmpty(fut.invalidPartitions())) { - if (retries == null) - retries = new HashSet<>(); + if (!F.isEmpty(fut.invalidPartitions())) { + assert fut.invalidPartitions().size() == 1 : fut.invalidPartitions(); - retries.addAll(fut.invalidPartitions()); + retry = F.first(fut.invalidPartitions()); + + onDone((GridCacheEntryInfo)null); + + return; } fut.listen( @@ -240,17 +243,14 @@ public final class GridDhtGetSingleFuture<K, V> extends GridFutureAdapter<GridCa * */ private void map0() { - // Assign keys to primary nodes. - int part = cctx.affinity().partition(key); + assert retry == null : retry; - if (retries == null || !retries.contains(part)) { - if (!map(key)) { - retries = Collections.singleton(part); + if (!map(key)) { + retry = cctx.affinity().partition(key); - onDone((GridCacheEntryInfo)null); + onDone((GridCacheEntryInfo)null); - return; - } + return; } getAsync(); @@ -258,7 +258,7 @@ public final class GridDhtGetSingleFuture<K, V> extends GridFutureAdapter<GridCa /** {@inheritDoc} */ @Override public Collection<Integer> invalidPartitions() { - return retries == null ? Collections.<Integer>emptyList() : retries; + return retry == null ? Collections.<Integer>emptyList() : Collections.singletonList(retry); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/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 b758610..678c9c5 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 @@ -623,11 +623,10 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements if (update) try { - // TODO IGNITE-5075. ctx.wal().log(new PartitionMetaStateRecord(grp.groupId(), id, toState, updateCounter())); } catch (IgniteCheckedException e) { - log.error("Error while writing to log", e); + U.error(log, "Error while writing to log", e); } return update; http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java index ffaa46f..3f612f7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java @@ -494,13 +494,13 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec if (skipVals) setSkipValueResult(true, verVal.version()); else - setResult(verVal.value() , verVal.version()); + setResult(verVal.value(), verVal.version()); } else { if (skipVals) setSkipValueResult(false, null); else - setResult(null , null); + setResult(null, null); } } else { http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index c9a6525..9882a32 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -836,8 +836,9 @@ public class GridDhtPartitionDemander { long updateSeq) { assert assigns != null; - this.exchFut = assigns.exchangeFuture(); - this.topVer = assigns.topologyVersion(); + exchFut = assigns.exchangeFuture(); + topVer = assigns.topologyVersion(); + this.grp = grp; this.log = log; this.updateSeq = updateSeq; http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index f4ce1ac..edddf7d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -58,6 +58,7 @@ import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiClosure; +import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.transactions.TransactionDeadlockException; import org.apache.ignite.transactions.TransactionTimeoutException; import org.jetbrains.annotations.Nullable; @@ -159,12 +160,20 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearOptimisticTxPrepa if (e instanceof IgniteTxRollbackCheckedException) { if (marked) { - try { - tx.rollback(); - } - catch (IgniteCheckedException ex) { - U.error(log, "Failed to automatically rollback transaction: " + tx, ex); - } + tx.rollbackAsync().listen(new IgniteInClosure<IgniteInternalFuture<IgniteInternalTx>>() { + @Override public void apply(IgniteInternalFuture<IgniteInternalTx> fut) { + try { + fut.get(); + } + catch (IgniteCheckedException e) { + U.error(log, "Failed to automatically rollback transaction: " + tx, e); + } + + onComplete(); + } + }); + + return; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index dbdc47c..5dd3000 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@ -377,7 +377,7 @@ public class GridClusterStateProcessor extends GridProcessorAdapter { actx.setFail(); - // revert change if activation request fail + // Revert change if activation request fail. if (actx.activate) { try { cacheProc.onKernalStopCaches(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/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 a40c9e9..69ee262 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 @@ -1473,7 +1473,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { fut.onDone(e); } catch (Throwable e) { - log.error("Failed to rebuild indexes for type: " + desc.name(), e); + U.error(log, "Failed to rebuild indexes for type [cache=" + cacheName + + ", name=" + desc.name() + ']', e); fut.onDone(e); http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java index 245965c..bc75858 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java @@ -17,6 +17,17 @@ package org.apache.ignite.internal.processors.query; +import java.lang.reflect.Method; +import java.math.BigDecimal; +import java.sql.Time; +import java.sql.Timestamp; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.TimeUnit; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.QueryIndex; @@ -29,32 +40,18 @@ import org.apache.ignite.internal.processors.cache.CacheObjectContext; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper; import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProcessorImpl; -import org.apache.ignite.internal.processors.query.schema.SchemaOperationException; import org.apache.ignite.internal.processors.query.property.QueryBinaryProperty; import org.apache.ignite.internal.processors.query.property.QueryClassProperty; import org.apache.ignite.internal.processors.query.property.QueryFieldAccessor; import org.apache.ignite.internal.processors.query.property.QueryMethodsAccessor; import org.apache.ignite.internal.processors.query.property.QueryPropertyAccessor; import org.apache.ignite.internal.processors.query.property.QueryReadOnlyMethodsAccessor; +import org.apache.ignite.internal.processors.query.schema.SchemaOperationException; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.A; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; -import java.lang.reflect.Method; -import java.math.BigDecimal; -import java.sql.Time; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - import static org.apache.ignite.IgniteSystemProperties.IGNITE_INDEXING_DISCOVERY_HISTORY_SIZE; import static org.apache.ignite.IgniteSystemProperties.getInteger; @@ -62,7 +59,6 @@ import static org.apache.ignite.IgniteSystemProperties.getInteger; * Utility methods for queries. */ public class QueryUtils { - /** Field name for key. */ public static final String KEY_FIELD_NAME = "_key"; http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java index f673717..f2b8bad 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java @@ -63,7 +63,7 @@ public abstract class H2Tree extends BPlusTree<SearchRow, GridH2Row> { /** * @param name Tree name. * @param reuseList Reuse list. - * @param cacheId Cache ID. + * @param grpId Cache group ID. * @param pageMem Page memory. * @param wal Write ahead log manager. * @param rowStore Row data store. @@ -74,7 +74,7 @@ public abstract class H2Tree extends BPlusTree<SearchRow, GridH2Row> { protected H2Tree( String name, ReuseList reuseList, - int cacheId, + int grpId, PageMemory pageMem, IgniteWriteAheadLogManager wal, AtomicLong globalRmvId, @@ -85,7 +85,7 @@ public abstract class H2Tree extends BPlusTree<SearchRow, GridH2Row> { List<InlineIndexHelper> inlineIdxs, int inlineSize ) throws IgniteCheckedException { - super(name, cacheId, pageMem, wal, globalRmvId, metaPageId, reuseList); + super(name, grpId, pageMem, wal, globalRmvId, metaPageId, reuseList); if (!initNew) { // Page is ready - read inline size from it. http://git-wip-us.apache.org/repos/asf/ignite/blob/c15749d9/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java index c1c1d9c..0cfb6a0 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java @@ -100,8 +100,6 @@ public class H2TreeIndex extends GridH2IndexBase { name = BPlusTree.treeName(name, "H2Tree"); if (cctx.affinityNode()) { - IgniteCacheDatabaseSharedManager dbMgr = cctx.shared().database(); - inlineIdxs = getAvailableInlineColumns(cols); segments = new H2Tree[segmentsCnt]; @@ -110,8 +108,9 @@ public class H2TreeIndex extends GridH2IndexBase { RootPage page = getMetaPage(name, i); segments[i] = new H2Tree( - name,cctx.offheap().reuseListForIndex(name), - cctx.cacheId(), + name, + cctx.offheap().reuseListForIndex(name), + cctx.groupId(), cctx.memoryPolicy().pageMemory(), cctx.shared().wal(), cctx.offheap().globalRemoveId(),
