Merge remote-tracking branch 'upstream/master' into IGNITE-26111__discovery_serialization

Author: timoninmaxim

docs/_docs/key-value-api/transactions.adoc

@@ -87,7 +87,7 @@ include::code-snippets/cpp/src/transactions.cpp[tag=transactions-execution,inden
 
 [WARNING]
 ====
-It is critical that an Ignite Transaction be `closed` regardless of its commit state. This ensures that all resources are released and the transaction is no longer bound to the current thread. Therefore, the `try-with-resource` statement is highly recommended when working with transactions.
+It is critical that an Ignite Transaction should be `closed` regardless of its commit state or ocurred exceptions. Using of `try-with-resources` is recommended approach, but you can also explicitly call `rollback` when catching exceptions. Calling of `close`, `commit` or `rollback` ensures that all resources are released and the transaction is no longer bound to the current thread.
 ====
 
 ////

docs/_docs/monitoring-metrics/intro.adoc

@@ -19,7 +19,7 @@ This chapter covers monitoring and metrics for Ignite. We'll start with an overv
 == Overview
 The basic task of monitoring in Ignite involves metrics. You have several approaches for accessing metrics:
 
--  via link:monitoring-metrics/metrics[JMX]
+-  via link:monitoring-metrics/new-metrics-system#jmx[JMX]
 -  Programmatically
 -  link:monitoring-metrics/system-views[System views]
 

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/CalciteMessage.java

@@ -32,9 +32,4 @@ public interface CalciteMessage extends Message {
     @Override default short directType() {
         return type().directType();
     }
-
-    /** {@inheritDoc} */
-    @Override default void onAckReceived() {
-        // No-op.
-    }
 }

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/message/QueryTxEntry.java

@@ -137,13 +137,13 @@ public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx, ClassLoader ldr)
                 writer.incrementState();
 
             case 1:
-                if (!writer.writeMessage(key))
+                if (!writer.writeKeyCacheObject(key))
                     return false;
 
                 writer.incrementState();
 
             case 2:
-                if (!writer.writeMessage(val))
+                if (!writer.writeCacheObject(val))
                     return false;
 
                 writer.incrementState();
@@ -173,15 +173,15 @@ public void prepareUnmarshal(GridCacheSharedContext<?, ?> ctx, ClassLoader ldr)
                 reader.incrementState();
 
             case 1:
-                key = reader.readMessage();
+                key = reader.readKeyCacheObject();
 
                 if (!reader.isLastRead())
                     return false;
 
                 reader.incrementState();
 
             case 2:
-                val = reader.readMessage();
+                val = reader.readCacheObject();
 
                 if (!reader.isLastRead())
                     return false;

modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/PlannerHelper.java

@@ -41,16 +41,14 @@
 import org.apache.calcite.rel.core.TableScan;
 import org.apache.calcite.rel.hint.Hintable;
 import org.apache.calcite.rel.hint.RelHint;
+import org.apache.calcite.rel.logical.LogicalProject;
 import org.apache.calcite.rel.rules.CoreRules;
 import org.apache.calcite.rel.rules.JoinCommuteRule;
 import org.apache.calcite.rel.rules.JoinPushThroughJoinRule;
 import org.apache.calcite.rel.rules.JoinToMultiJoinRule;
 import org.apache.calcite.rel.rules.MultiJoin;
-import org.apache.calcite.rex.RexBuilder;
-import org.apache.calcite.rex.RexNode;
 import org.apache.calcite.sql.SqlKind;
 import org.apache.calcite.sql.SqlNode;
-import org.apache.calcite.util.Pair;
 import org.apache.calcite.util.Util;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.processors.query.calcite.hint.HintDefinition;
@@ -152,13 +150,9 @@ public static IgniteRel optimize(SqlNode sqlNode, IgnitePlanner planner, IgniteL
             IgniteRel igniteRel = planner.transform(PlannerPhase.OPTIMIZATION, desired, rel);
 
             if (!root.isRefTrivial()) {
-                final List<RexNode> projects = new ArrayList<>();
-                final RexBuilder rexBuilder = igniteRel.getCluster().getRexBuilder();
+                LogicalProject project = (LogicalProject)root.project();
 
-                for (int field : Pair.left(root.fields))
-                    projects.add(rexBuilder.makeInputRef(igniteRel, field));
-
-                igniteRel = new IgniteProject(igniteRel.getCluster(), desired, igniteRel, projects, root.validatedRowType);
+                igniteRel = new IgniteProject(igniteRel.getCluster(), desired, igniteRel, project.getProjects(), project.getRowType());
             }
 
             if (sqlNode.isA(ImmutableSet.of(SqlKind.INSERT, SqlKind.UPDATE, SqlKind.MERGE)))

modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/TableDmlPlannerTest.java

@@ -27,6 +27,8 @@
 import org.apache.ignite.internal.processors.query.calcite.trait.IgniteDistributions;
 import org.junit.Test;
 
+import static org.apache.calcite.sql.type.SqlTypeName.INTEGER;
+import static org.apache.calcite.sql.type.SqlTypeName.VARCHAR;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -169,4 +171,23 @@ public void updateCachesDependentIndexScan() throws Exception {
         assertThat(invalidPlanMsg, spool.readType, equalTo(Spool.Type.EAGER));
         assertThat(invalidPlanMsg, findFirstNode(phys, byClass(IgniteIndexScan.class)), notNullValue());
     }
+
+    /** Tests that queries with duplicated column names are correctly parsed. */
+    @Test
+    public void testDuplicatedColumnNames() throws Exception {
+        IgniteSchema schema = createSchema(
+            createTable("CITY", IgniteDistributions.random(), "ID", INTEGER, "NAME", VARCHAR),
+            createTable("STREET", IgniteDistributions.random(), "ID", INTEGER, "CITY_ID", INTEGER,
+                "NAME", VARCHAR)
+        );
+
+        assertPlan("SELECT NAME, (SELECT NAME FROM CITY WHERE ID = S.CITY_ID LIMIT 1) AS NAME FROM STREET S ORDER BY ID",
+            schema, hasColumns("NAME", "NAME1"));
+
+        assertPlan("SELECT CITY_ID, NAME, NAME FROM STREET ORDER BY ID", schema,
+            hasColumns("CITY_ID", "NAME", "NAME2"));
+
+        assertPlan("SELECT CITY.NAME, STREET.NAME FROM STREET JOIN CITY ON STREET.CITY_ID = CITY.ID ORDER BY STREET.ID",
+            schema, hasColumns("NAME", "NAME1"));
+    }
 }

modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java

@@ -364,6 +364,15 @@ else if (assignableFrom(erasedType(type), type(Map.class.getName()))) {
                     "MessageCollectionItemType." + messageCollectionItemType(typeArgs.get(1)));
             }
 
+            else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.KeyCacheObject")))
+                returnFalseIfWriteFailed(write, "writer.writeKeyCacheObject", getExpr);
+
+            else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.CacheObject")))
+                returnFalseIfWriteFailed(write, "writer.writeCacheObject", getExpr);
+
+            else if (assignableFrom(type, type("org.apache.ignite.internal.util.GridLongList")))
+                returnFalseIfWriteFailed(write, "writer.writeGridLongList", getExpr);
+
             else if (assignableFrom(type, type(MESSAGE_INTERFACE)))
                 returnFalseIfWriteFailed(write, "writer.writeMessage", getExpr);
 
@@ -487,6 +496,15 @@ else if (assignableFrom(erasedType(type), type(Map.class.getName()))) {
                     "MessageCollectionItemType." + messageCollectionItemType(typeArgs.get(1)), "false");
             }
 
+            else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.KeyCacheObject")))
+                returnFalseIfReadFailed(name, "reader.readKeyCacheObject");
+
+            else if (assignableFrom(type, type("org.apache.ignite.internal.processors.cache.CacheObject")))
+                returnFalseIfReadFailed(name, "reader.readCacheObject");
+
+            else if (assignableFrom(type, type("org.apache.ignite.internal.util.GridLongList")))
+                returnFalseIfReadFailed(name, "reader.readGridLongList");
+
             else if (assignableFrom(type, type(MESSAGE_INTERFACE)))
                 returnFalseIfReadFailed(name, "reader.readMessage");
 
@@ -547,6 +565,15 @@ private String messageCollectionItemType(TypeMirror type) throws Exception {
             if (sameType(type, "org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion"))
                 return "AFFINITY_TOPOLOGY_VERSION";
 
+            if (sameType(type, "org.apache.ignite.internal.processors.cache.KeyCacheObject"))
+                return "KEY_CACHE_OBJECT";
+
+            if (sameType(type, "org.apache.ignite.internal.processors.cache.CacheObject"))
+                return "CACHE_OBJECT";
+
+            if (sameType(type, "org.apache.ignite.internal.util.GridLongList"))
+                return "GRID_LONG_LIST";
+
             PrimitiveType primitiveType = unboxedType(type);
 
             if (primitiveType != null)

modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java

@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.processors.cache.persistence.snapshot;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
@@ -203,6 +204,8 @@ private void testRestoreFullSnapshot(int gridCnt) throws Exception {
             finally {
                 locEvts.clear();
             }
+
+            awaitPartitionMapExchange();
         }
     }
 
@@ -257,6 +260,8 @@ public void testRestoreNotCompressed_OnGridWithoutCompression() throws Exception
             finally {
                 locEvts.clear();
             }
+
+            awaitPartitionMapExchange();
         }
     }
 
@@ -288,7 +293,7 @@ public void testRestoreNotCompressed_OnGridWithoutCompression() throws Exception
                     continue;
                 }
 
-                NodeFileTree ft = nodeFileTree(dir.toString());
+                NodeFileTree ft = new NodeFileTree(new File(dir.toString()), dir.getFileName().toString());
 
                 U.delete(ft.checkpoint());
                 U.delete(ft.db());

modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReader.java

@@ -492,7 +492,7 @@ private PageListsInfo pageListsInfo(long metaPageListId) throws IgniteCheckedExc
                     io.getBucketsData(addr, data);
 
                     for (Map.Entry<Integer, GridLongList> e : data.entrySet()) {
-                        List<Long> listIds = LongStream.of(e.getValue().array())
+                        List<Long> listIds = LongStream.of(e.getValue().arrayCopy())
                             .map(IgniteIndexReader::normalizePageId)
                             .boxed()
                             .collect(toList());

modules/core/src/main/java/org/apache/ignite/cache/query/IndexQuery.java

@@ -138,7 +138,7 @@ public IndexQuery<K, V> setCriteria(List<IndexQueryCriterion> criteria) {
      *
      * @return List of criteria for this index query.
      */
-    public List<IndexQueryCriterion> getCriteria() {
+    @Nullable public List<IndexQueryCriterion> getCriteria() {
         return criteria;
     }