Merge remote-tracking branch 'origin/master' into ignite-26582

Author: anton-vinogradov

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/IndexDdlIntegrationTest.java

@@ -203,6 +203,6 @@ private Collection<Index> indexes(String cacheName) {
 
     /** */
     private LinkedHashMap<String, IndexKeyDefinition> indexKeyDefinitions(Index idx) {
-        return grid(0).context().indexProcessor().indexDefinition(idx.id()).indexKeyDefinitions();
+        return idx.indexDefinition().indexKeyDefinitions();
     }
 }

modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java

@@ -23,8 +23,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
@@ -112,12 +110,7 @@ public static void registerIO() {
     /**
      * Registry of all indexes. High key is a cache name, lower key is an unique index name.
      */
-    private final Map<String, Map<String, Index>> cacheToIdx = new ConcurrentHashMap<>();
-
-    /**
-     * Registry of all index definitions. Key is {@link Index#id()}, value is IndexDefinition used for creating index.
-     */
-    private final Map<UUID, IndexDefinition> idxDefs = new ConcurrentHashMap<>();
+    private final Map<String, Map<String, Index>> cacheToIdx = new HashMap<>();
 
     /** Exclusive lock for DDL operations. */
     private final ReentrantReadWriteLock ddlLock = new ReentrantReadWriteLock();
@@ -242,7 +235,7 @@ public Index createIndex(GridCacheContext<?, ?> cctx, IndexFactory factory, Inde
         try {
             String cacheName = definition.idxName().cacheName();
 
-            cacheToIdx.putIfAbsent(cacheName, new ConcurrentHashMap<>());
+            cacheToIdx.putIfAbsent(cacheName, new HashMap<>());
 
             String uniqIdxName = definition.idxName().fullName();
 
@@ -253,8 +246,6 @@ public Index createIndex(GridCacheContext<?, ?> cctx, IndexFactory factory, Inde
 
             cacheToIdx.get(cacheName).put(uniqIdxName, idx);
 
-            idxDefs.put(idx.id(), definition);
-
             return idx;
 
         }
@@ -281,11 +272,8 @@ public void removeIndex(IndexName idxName, boolean softDelete) {
 
             Index idx = idxs.remove(idxName.fullName());
 
-            if (idx != null) {
+            if (idx != null)
                 idx.destroy(softDelete);
-                idxDefs.remove(idx.id());
-            }
-
         }
         finally {
             ddlLock.writeLock().unlock();
@@ -421,16 +409,6 @@ public Collection<Index> indexes(String cacheName) {
         }
     }
 
-    /**
-     * Returns IndexDefinition used for creating index specified id.
-     *
-     * @param idxId UUID of index.
-     * @return IndexDefinition used for creating index with id {@code idxId}.
-     */
-    public IndexDefinition indexDefinition(UUID idxId) {
-        return idxDefs.get(idxId);
-    }
-
     /**
      * Unregisters cache.
      *
@@ -638,7 +616,7 @@ public Map<String, Integer> secondaryIndexesInlineSize() {
                 for (Index idx : idxs.values()) {
                     if (idx instanceof InlineIndex && !QueryUtils.PRIMARY_KEY_INDEX.equals(idx.name())) {
                         InlineIndex idx0 = (InlineIndex)idx;
-                        IndexDefinition idxDef = indexDefinition(idx.id());
+                        IndexDefinition idxDef = idx.indexDefinition();
                         IndexName idxName = idxDef.idxName();
 
                         map.put(

modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryProcessor.java

@@ -93,7 +93,7 @@ public <K, V> IndexQueryResult<K, V> queryLocal(
 
         GridCursor<IndexRow> cursor = queryMultipleRanges(idx, cacheFilter, qry);
 
-        SortedIndexDefinition def = (SortedIndexDefinition)idxProc.indexDefinition(idx.id());
+        SortedIndexDefinition def = idx.indexDefinition();
 
         IndexQueryResultMeta meta = new IndexQueryResultMeta(def, qry.critSize());
 
@@ -274,7 +274,7 @@ private SortedSegmentedIndex assertSortedIndex(Index idx) throws IgniteCheckedEx
      * Criteria fields have to match to a prefix of the index. Order of fields in criteria doesn't matter.
      */
     private boolean checkIndex(SortedSegmentedIndex idx, String tblName, Map<String, String> criteriaFlds) {
-        IndexDefinition idxDef = idxProc.indexDefinition(idx.id());
+        IndexDefinition idxDef = idx.indexDefinition();
 
         if (!tblName.equals(idxDef.idxName().tableName()))
             return false;
@@ -411,7 +411,7 @@ private GridCursor<IndexRow> querySortedIndex(
         IndexingQueryFilter cacheFilter,
         IndexSingleRangeQuery qry
     ) throws IgniteCheckedException {
-        IndexRowComparator rowCmp = ((SortedIndexDefinition)idxProc.indexDefinition(idx.id())).rowComparator();
+        IndexRowComparator rowCmp = idx.indexDefinition().rowComparator();
 
         BPlusTree.TreeRowClosure<IndexRow, IndexRow> treeFilter = qry.filter(rowCmp);
 

modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java

@@ -145,7 +145,7 @@ private boolean defragmentTable(
             for (InlineIndex oldIdx : indexes.idxs) {
                 InlineIndexRowHandler oldRowHnd = oldIdx.segment(0).rowHandler();
 
-                SortedIndexDefinition idxDef = (SortedIndexDefinition)indexing.indexDefinition(oldIdx.id());
+                SortedIndexDefinition idxDef = oldIdx.indexDefinition();
 
                 InlineIndexImpl newIdx = new DefragIndexFactory(newCtx.offheap(), newCachePageMemory, oldIdx)
                     .createIndex(cctx, idxDef)
@@ -224,7 +224,7 @@ private Collection<TableIndexes> tables(CacheGroupContext gctx) {
             List<InlineIndex> indexes = indexing.treeIndexes(cctx.name(), false);
 
             for (InlineIndex idx: indexes) {
-                String table = indexing.indexDefinition(idx.id()).idxName().tableName();
+                String table = idx.indexDefinition().idxName().tableName();
 
                 idxs.putIfAbsent(table, new TableIndexes(cctx, table));
 

modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java

@@ -55,6 +55,7 @@
 import org.apache.ignite.internal.codegen.GridDhtAffinityAssignmentRequestSerializer;
 import org.apache.ignite.internal.codegen.GridDhtAtomicDeferredUpdateResponseSerializer;
 import org.apache.ignite.internal.codegen.GridDhtAtomicNearResponseSerializer;
+import org.apache.ignite.internal.codegen.GridDhtAtomicSingleUpdateRequestSerializer;
 import org.apache.ignite.internal.codegen.GridDhtAtomicUpdateResponseSerializer;
 import org.apache.ignite.internal.codegen.GridDhtForceKeysRequestSerializer;
 import org.apache.ignite.internal.codegen.GridDhtForceKeysResponseSerializer;
@@ -307,7 +308,7 @@ public class GridIoMessageFactory implements MessageFactoryProvider {
         factory.register((short)-48, GridDhtAtomicNearResponse::new, new GridDhtAtomicNearResponseSerializer());
         factory.register((short)-45, GridChangeGlobalStateMessageResponse::new, new GridChangeGlobalStateMessageResponseSerializer());
         factory.register((short)-43, IgniteIoTestMessage::new);
-        factory.register((short)-36, GridDhtAtomicSingleUpdateRequest::new);
+        factory.register((short)-36, GridDhtAtomicSingleUpdateRequest::new, new GridDhtAtomicSingleUpdateRequestSerializer());
         factory.register((short)-27, GridDhtTxOnePhaseCommitAckRequest::new, new GridDhtTxOnePhaseCommitAckRequestSerializer());
         factory.register((short)-26, TxLockList::new, new TxLockListSerializer());
         factory.register((short)-25, TxLock::new, new TxLockSerializer());

modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoveryMessageFactory.java

@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.managers.discovery;
+
+import org.apache.ignite.internal.codegen.TcpDiscoveryCheckFailedMessageSerializer;
+import org.apache.ignite.plugin.extensions.communication.MessageFactory;
+import org.apache.ignite.plugin.extensions.communication.MessageFactoryProvider;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCheckFailedMessage;
+
+/** Message factory for discovery messages. */
+public class DiscoveryMessageFactory implements MessageFactoryProvider {
+    /** {@inheritDoc} */
+    @Override public void registerAll(MessageFactory factory) {
+        factory.register((short)0, TcpDiscoveryCheckFailedMessage::new, new TcpDiscoveryCheckFailedMessageSerializer());
+    }
+}

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java

@@ -26,7 +26,6 @@
 import javax.cache.processor.EntryProcessor;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.cache.CacheWriteSynchronizationMode;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
@@ -171,8 +170,6 @@ final void addWriteEntry(
         if (log.isDebugEnabled())
             log.debug("Mapping entry to DHT nodes [nodes=" + nodeIds(dhtNodes) + ", entry=" + entry + ']');
 
-        CacheWriteSynchronizationMode syncMode = updateReq.writeSynchronizationMode();
-
         addDhtKey(entry.key(), dhtNodes);
 
         for (int i = 0; i < dhtNodes.size(); i++) {
@@ -188,7 +185,6 @@ final void addWriteEntry(
                         node.id(),
                         futId,
                         writeVer,
-                        syncMode,
                         topVer,
                         ttl,
                         conflictExpireTime,
@@ -245,8 +241,6 @@ final void addNearWriteEntries(
         boolean readRepairRecovery) {
         assert readers != null;
 
-        CacheWriteSynchronizationMode syncMode = updateReq.writeSynchronizationMode();
-
         addNearKey(entry.key(), readers);
 
         AffinityTopologyVersion topVer = updateReq.topologyVersion();
@@ -278,7 +272,6 @@ final void addNearWriteEntries(
                     node.id(),
                     futId,
                     writeVer,
-                    syncMode,
                     topVer,
                     ttl,
                     expireTime,
@@ -435,7 +428,7 @@ private void initMapping(GridNearAtomicUpdateResponse updateRes) {
 
     /**
      * @param nearNode Near node.
-     * @param sndRes {@code True} if allow to send result from DHT nodes.
+     * @param sndRes {@code True} if allow sending result from DHT nodes.
      * @param ret Return value.
      */
     private void sendDhtRequests(ClusterNode nearNode, GridCacheReturn ret, boolean sndRes) {
@@ -513,7 +506,6 @@ final void onDhtResponse(UUID nodeId, GridDhtAtomicUpdateResponse res) {
      * @param nodeId Node ID.
      * @param futId Future ID.
      * @param writeVer Update version.
-     * @param syncMode Write synchronization mode.
      * @param topVer Topology version.
      * @param ttl TTL.
      * @param conflictExpireTime Conflict expire time.
@@ -525,7 +517,6 @@ protected abstract GridDhtAtomicAbstractUpdateRequest createRequest(
         UUID nodeId,
         long futId,
         GridCacheVersion writeVer,
-        CacheWriteSynchronizationMode syncMode,
         @NotNull AffinityTopologyVersion topVer,
         long ttl,
         long conflictExpireTime,