You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by am...@apache.org on 2023/08/10 12:17:11 UTC

[ignite-3] branch ignite-19497 updated (a8b59f67a7 -> f0dff0b01f)

This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a change to branch ignite-19497
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


    omit a8b59f67a7 Fix typo in javadoc.
    omit 3836abd914 Fix test.
    omit e3ad8acd90 Fix test.
    omit c954f4b037 wip.
    omit 1c4f1e9a54 fix tests.
    omit 051f4e5be3 fix tests.
    omit bda7329ca2 Fix platforms tests
    omit 82f29f1da2 fix imports.
     new f03ccfc596 Fix platforms tests
     new f419bc02b3 fix tests.
     add e51f3d9799 [IGNITE-19785] Sql. Rework execution of 2-phase aggregates (#2312)
     add 9f5c135ea7 IGNITE-19953 Fix --verbose/-v option in CLI interactive mode (#2419)
     add da612fd99a IGNITE-19841 Add tests for schema validation consistency in client and embedded API (#2421)
     add 8e37291b97 IGNITE-19108 Check connection during REPL session in CLI (#2359)
     add f4c33ff66f IGNITE-14865 Sql. Public SQL API should only throw public exceptions (#2345)
     add ee06eb1bc0 IGNITE-19978 Java client: Change Gradle dependencies from implementation to api (#2427)
     add 4dd4743579 IGNITE-20152 Fix PartitionAwarenessTest.startServer2 flakiness (#2430)
     add 47bf25dedd IGNITE-19877 Sql. Fix not allowed CAST operations - Fixes #2368.
     add e490bfe781 IGNITE-20056 .NET: Track observable timestamp (#2426)
     add ae8c6c5011 IGNITE-19947 Sql. Fix CAST(n AS DECIMAL(precision, scale)) behaviour for scale > precision issues (#2396)
     add 0e0ba6a3ca IGNITE-20180 Fix flaky ItTablePersistenceTest#testSnapshot (#2428)
     add 5a812c5586 Merge branch 'main' into catalog-feature
     new f0dff0b01f Merge branch 'catalog-feature' into ignite-19497

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a8b59f67a7)
            \
             N -- N -- N   refs/heads/ignite-19497 (f0dff0b01f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/ignite/sql/SqlBatchException.java   |   6 +-
 ...liCommandTestNotInitializedIntegrationBase.java |  12 +-
 .../cli/commands/ItConnectionHeartbeatTest.java    | 142 +++++++++
 .../repl/executor/ItIgnitePicocliCommandsTest.java |   7 +-
 .../apache/ignite/internal/cli/ReplManager.java    |   5 +
 .../internal/cli/call/connect/ConnectCall.java     |  19 +-
 .../internal/cli/call/connect/DisconnectCall.java  |  11 +-
 ...SessionEventListener.java => ConnectEvent.java} |  26 +-
 .../cli/core/repl/ConnectionHeartBeat.java         | 134 ++++++++
 ...EventListener.java => ConnectionLostEvent.java} |  17 +-
 ...tListener.java => ConnectionRestoredEvent.java} |  17 +-
 ...sionEventListener.java => DisconnectEvent.java} |  17 +-
 .../core/repl/EventListeningActivationPoint.java   |  91 ++++++
 .../cli/core/repl/PeriodicSessionTaskExecutor.java |   3 +-
 .../apache/ignite/internal/cli/core/repl/Repl.java |  11 +-
 .../ignite/internal/cli/core/repl/ReplBuilder.java |  16 +-
 .../ignite/internal/cli/core/repl/Session.java     |  42 +--
 .../ignite/internal/cli/core/repl/SessionInfo.java |  47 ++-
 .../cli/core/repl/executor/ReplExecutor.java       |   2 +
 .../cli/core/repl/prompt/ReplPromptProvider.java   |  19 +-
 .../registry/impl/ClusterConfigRegistryImpl.java   |   4 +-
 .../repl/registry/impl/MetricRegistryImpl.java     |   4 +-
 .../repl/registry/impl/NodeConfigRegistryImpl.java |   4 +-
 .../core/repl/registry/impl/UnitsRegistryImpl.java |   4 +-
 .../cli/event/ConnectionEventListener.java         |  65 ++++
 .../apache/ignite/internal/cli/event}/Event.java   |   5 +-
 .../ignite/internal/cli/event/EventFactory.java    |  84 +++++
 .../ignite/internal/cli/event/EventListener.java}  |  12 +-
 .../ignite/internal/cli/event/EventPublisher.java} |  15 +-
 .../cli/event/EventSubscriptionManager.java}       |  14 +-
 .../ignite/internal/cli/event/EventType.java}      |  10 +-
 .../apache/ignite/internal/cli/event/Events.java   |  67 ++++
 .../ignite/internal/cli/logger/HttpLogging.java    |   5 +
 .../core/repl/SessionDefaultValueProviderTest.java |   6 +-
 .../filter/DynamicCompleterFilterTest.java         |  10 +-
 .../internal/cli/logger/HttpLoggingTest.java       |  35 ++-
 .../client/proto/ClientBinaryTupleUtils.java       |   6 +-
 .../client/handler/JdbcQueryEventHandlerImpl.java  |   5 +-
 modules/client/build.gradle                        |   4 +-
 .../ignite/client/AbstractClientTableTest.java     |  36 +--
 .../apache/ignite/client/ClientRecordViewTest.java |   4 +-
 .../org/apache/ignite/client/ClientTableTest.java  |   4 +-
 .../ignite/client/PartitionAwarenessTest.java      |   2 +-
 .../ignite/internal/sql/AbstractSession.java       |  10 +-
 .../ignite/jdbc/ItJdbcResultSetSelfTest.java       |  24 +-
 .../ignite/internal/marshaller/FieldAccessor.java  |   1 +
 .../ignite/internal/marshaller/MarshallerUtil.java |  58 ++++
 .../dotnet/Apache.Ignite.Tests/.editorconfig       |   3 +
 .../Apache.Ignite.Tests/ClientSocketTests.cs       |  23 +-
 .../dotnet/Apache.Ignite.Tests/FakeServer.cs       |  20 +-
 .../dotnet/Apache.Ignite.Tests/Sql/SqlTests.cs     |   8 +-
 .../Transactions/TransactionsTests.cs              |  27 ++
 .../Apache.Ignite/Internal/ClientFailoverSocket.cs |  60 ++--
 .../dotnet/Apache.Ignite/Internal/ClientSocket.cs  |  22 +-
 .../IClientSocketEventListener.cs}                 |  16 +-
 .../dotnet/Apache.Ignite/Internal/Sql/Sql.cs       |  16 +-
 .../Internal/Transactions/Transactions.cs          |   4 +-
 .../service/ItAbstractListenerSnapshotTest.java    |   7 +
 .../app/client/ItThinClientMarshallingTest.java    | 185 ++++++++++-
 .../runner/app/client/ItThinClientSqlTest.java     |   2 +-
 .../ignite/internal/sql/api/ItCommonApiTest.java   |   7 +-
 .../internal/sql/api/ItSqlAsynchronousApiTest.java | 157 ++++++----
 .../internal/sql/api/ItSqlSynchronousApiTest.java  | 101 +++---
 .../internal/sql/engine/ItAggregatesTest.java      | 188 ++++++++---
 .../internal/sql/engine/ItDataTypesTest.java       |  41 +--
 .../ignite/internal/sql/engine/ItDmlTest.java      |   9 +-
 .../sql/engine/ItDynamicParameterTest.java         |   7 +-
 .../internal/sql/engine/ItFunctionsTest.java       |  29 +-
 .../ignite/internal/sql/engine/ItIntervalTest.java |  42 +--
 .../internal/sql/engine/ItLimitOffsetTest.java     |  41 ++-
 .../internal/sql/engine/ItSqlOperatorsTest.java    |   1 -
 .../sql/engine/datatypes/uuid/ItUuidQueryTest.java |   2 +-
 .../datatypes/varbinary/ItVarBinaryQueryTest.java  |   2 +-
 .../streamer/ItAbstractDataStreamerTest.java       |   4 +-
 .../sql/cast/test_boolean_cast.test                |  73 ++---
 .../marshaller/reflection/KvMarshallerImpl.java    |  16 +-
 .../marshaller/reflection/ObjectStatistics.java    |   6 +-
 .../reflection/RecordMarshallerImpl.java           |  12 +-
 .../ignite/internal/schema/row/RowAssembler.java   |  16 +-
 .../schema/marshaller/KvMarshallerTest.java        |   8 +-
 .../schema/marshaller/RecordMarshallerTest.java    |   8 +-
 modules/sql-engine/build.gradle                    |   2 +
 .../ignite/internal/sql/api/SessionImpl.java       |  67 ++--
 .../internal/sql/engine/AsyncSqlCursorImpl.java    |  17 +-
 .../sql/engine/exec/ExchangeServiceImpl.java       |  42 +--
 .../sql/engine/exec/LogicalRelImplementor.java     |   4 +-
 .../sql/engine/exec/exp/ExpressionFactoryImpl.java |  19 +-
 .../sql/engine/exec/exp/IgniteSqlFunctions.java    | 111 ++++---
 .../sql/engine/exec/exp/agg/Accumulator.java       |   5 +-
 .../engine/exec/exp/agg/AccumulatorWrapper.java    |   4 -
 .../sql/engine/exec/exp/agg/Accumulators.java      | 178 +----------
 .../engine/exec/exp/agg/AccumulatorsFactory.java   |  21 +-
 .../sql/engine/exec/exp/agg/AggregateRow.java      |  86 +++++
 .../internal/sql/engine/exec/exp/agg/GroupKey.java |  21 +-
 .../sql/engine/exec/rel/HashAggregateNode.java     | 146 +++------
 .../internal/sql/engine/exec/rel/RootNode.java     |  14 +-
 .../sql/engine/exec/rel/SortAggregateNode.java     |  69 +---
 .../sql/engine/prepare/IgniteSqlValidator.java     |  73 ++++-
 .../sql/engine/prepare/PrepareServiceImpl.java     |  33 +-
 .../sql/engine/rel/agg/IgniteMapHashAggregate.java |  26 +-
 .../sql/engine/rel/agg/IgniteMapSortAggregate.java |  20 +-
 .../engine/rel/agg/IgniteReduceHashAggregate.java  |   5 -
 .../sql/engine/rel/agg/MapReduceAggregates.java    | 347 +++++++++++++++++++++
 .../engine/rule/HashAggregateConverterRule.java    |  71 +++--
 .../engine/rule/SortAggregateConverterRule.java    |  68 ++--
 .../ignite/internal/sql/engine/util/Commons.java   |  38 +++
 .../engine/util/IgniteCustomAssigmentsRules.java   | 255 +++++++++++++++
 .../ignite/internal/sql/engine/util/PlanUtils.java | 125 ++++++++
 .../engine/util/SqlExceptionMapperProvider.java    |  63 ++++
 .../engine/exec/exp/IgniteSqlFunctionsTest.java    |  34 +-
 .../sql/engine/exec/rel/BaseAggregateTest.java     |  20 ++
 .../exec/rel/HashAggregateExecutionTest.java       |   9 +-
 .../rel/HashAggregateSingleGroupExecutionTest.java | 129 +++-----
 .../exec/rel/SortAggregateExecutionTest.java       |   9 +-
 .../planner/AbstractAggregatePlannerTest.java      | 115 ++++---
 .../sql/engine/planner/AbstractPlannerTest.java    |  12 +-
 .../sql/engine/planner/AggregatePlannerTest.java   |  69 +++-
 .../sql/engine/planner/CastResolutionTest.java     | 217 +++++++++++++
 .../planner/ColocatedHashAggregatePlannerTest.java |  33 ++
 .../planner/ColocatedSortAggregatePlannerTest.java |  34 ++
 .../sql/engine/planner/JoinCommutePlannerTest.java |   6 +-
 .../planner/MapReduceHashAggregatePlannerTest.java |  90 +++++-
 .../planner/MapReduceSortAggregatePlannerTest.java |  89 ++++--
 .../sql/engine/planner/UnionPlannerTest.java       |  23 +-
 .../sql/engine/prepare/TypeCoercionTest.java       |  30 +-
 .../internal/sql/engine/util/CommonsTest.java      |  54 ++++
 .../internal/sql/engine/util/PlanUtilsTest.java    | 113 +++++++
 .../internal/sql/engine/util/StatementChecker.java |  27 +-
 .../internal/sql/engine/util/SqlTestUtils.java     |  22 ++
 .../ignite/distributed/ItTablePersistenceTest.java |  17 +-
 130 files changed, 3991 insertions(+), 1396 deletions(-)
 create mode 100644 modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItConnectionHeartbeatTest.java
 copy modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/{AsyncSessionEventListener.java => ConnectEvent.java} (63%)
 create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/ConnectionHeartBeat.java
 copy modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/{AsyncSessionEventListener.java => ConnectionLostEvent.java} (74%)
 copy modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/{AsyncSessionEventListener.java => ConnectionRestoredEvent.java} (73%)
 rename modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/{AsyncSessionEventListener.java => DisconnectEvent.java} (74%)
 create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/EventListeningActivationPoint.java
 create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/event/ConnectionEventListener.java
 copy modules/{core/src/main/java/org/apache/ignite/internal/manager => cli/src/main/java/org/apache/ignite/internal/cli/event}/Event.java (89%)
 create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/event/EventFactory.java
 copy modules/{raft/src/main/java/org/apache/ignite/raft/jraft/util/internal/IntegerFieldUpdater.java => cli/src/main/java/org/apache/ignite/internal/cli/event/EventListener.java} (81%)
 copy modules/{core/src/main/java/org/apache/ignite/internal/util/ArrayFactory.java => cli/src/main/java/org/apache/ignite/internal/cli/event/EventPublisher.java} (79%)
 copy modules/{metastorage-api/src/main/java/org/apache/ignite/internal/metastorage/dsl/OperationType.java => cli/src/main/java/org/apache/ignite/internal/cli/event/EventSubscriptionManager.java} (75%)
 copy modules/{catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DdlCommandParams.java => cli/src/main/java/org/apache/ignite/internal/cli/event/EventType.java} (82%)
 create mode 100644 modules/cli/src/main/java/org/apache/ignite/internal/cli/event/Events.java
 copy modules/platforms/dotnet/Apache.Ignite/{Network/IConnectionInfo.cs => Internal/IClientSocketEventListener.cs} (67%)
 create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/exp/agg/AggregateRow.java
 create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/rel/agg/MapReduceAggregates.java
 create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/IgniteCustomAssigmentsRules.java
 create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/util/SqlExceptionMapperProvider.java
 create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/CastResolutionTest.java
 create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/CommonsTest.java
 create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/PlanUtilsTest.java


[ignite-3] 01/03: Fix platforms tests

Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-19497
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit f03ccfc5964af6e5ce452f337a87a04d545e36f2
Author: amashenkov <an...@gmail.com>
AuthorDate: Wed Aug 9 11:30:43 2023 +0300

    Fix platforms tests
---
 .../internal/catalog/commands/CatalogUtils.java    |  8 ++++----
 .../internal/catalog/CatalogManagerSelfTest.java   |  3 ++-
 .../cpp/tests/odbc-test/meta_queries_test.cpp      |  2 +-
 .../Sql/IgniteDbDataReaderTests.cs                 |  2 +-
 .../dotnet/Apache.Ignite.Tests/Sql/SqlTests.cs     |  2 +-
 .../runner/app/PlatformTestNodeRunner.java         | 22 +++++++++++-----------
 .../ignite/internal/sql/engine/ItMetadataTest.java |  4 ++--
 .../internal/sql/engine/ItSecondaryIndexTest.java  |  4 ++--
 .../schema/testutils/definition/ColumnType.java    |  7 ++++---
 .../internal/sql/engine/SqlQueryProcessor.java     |  3 ++-
 .../sql/engine/type/IgniteTypeFactory.java         |  4 ++--
 11 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
index 0aa811af40..93659cd691 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CatalogUtils.java
@@ -125,11 +125,11 @@ public class CatalogUtils {
     public static final int DEFAULT_LENGTH = 1;
 
     /**
-     * Max length is implementation defined.
+     * Max length for VARCHAR and VARBINARY is implementation defined.
      *
-     * <p>SQL`16 part 2 section 6.1 syntax rule 15
+     * <p>SQL`16 part 2 section 6.1 syntax rule 8
      */
-    public static final int MAX_LENGTH = Short.MAX_VALUE;
+    public static final int DEFAULT_VARLEN_LENGTH = 0xffff;
 
     private static final Map<ColumnType, Set<ColumnType>> ALTER_COLUMN_TYPE_TRANSITIONS = new EnumMap<>(ColumnType.class);
 
@@ -265,7 +265,7 @@ public class CatalogUtils {
             case BITMASK:
             case STRING:
             case BYTE_ARRAY:
-                return Integer.MAX_VALUE;
+                return DEFAULT_VARLEN_LENGTH;
             default:
                 return Math.max(DEFAULT_LENGTH, defaultPrecision(columnType));
         }
diff --git a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
index 8228d1dda9..1aea1c3584 100644
--- a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
+++ b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
@@ -24,6 +24,7 @@ import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_ZONE_NAM
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_FILTER;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_PARTITION_COUNT;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_REPLICA_COUNT;
+import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_VARLEN_LENGTH;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.INFINITE_TIMER_VALUE;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowFast;
@@ -363,7 +364,7 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
         assertEquals(DefaultValue.Type.CONSTANT, column.defaultValue().type());
         assertEquals("Ignite!", ((DefaultValue.ConstantValue) column.defaultValue()).value());
 
-        assertEquals(Integer.MAX_VALUE, column.length());
+        assertEquals(DEFAULT_VARLEN_LENGTH, column.length());
         assertEquals(0, column.precision());
         assertEquals(0, column.scale());
     }
diff --git a/modules/platforms/cpp/tests/odbc-test/meta_queries_test.cpp b/modules/platforms/cpp/tests/odbc-test/meta_queries_test.cpp
index 6f0ccc480a..44ce7ed9c0 100644
--- a/modules/platforms/cpp/tests/odbc-test/meta_queries_test.cpp
+++ b/modules/platforms/cpp/tests/odbc-test/meta_queries_test.cpp
@@ -257,7 +257,7 @@ public:
         check(m_statement, 5, "CHAR1", SQL_VARCHAR, 3, 0, SQL_NULLABLE);
         check(m_statement, 6, "CHAR2", SQL_VARCHAR, 42, 0, SQL_NULLABLE);
         check(m_statement, 7, "CHAR3", SQL_VARCHAR, 1, 0, SQL_NO_NULLS);
-        check(m_statement, 8, "VCHAR", SQL_VARCHAR, 65536, 0, SQL_NULLABLE);
+        check(m_statement, 8, "VCHAR", SQL_VARCHAR, 65535, 0, SQL_NULLABLE);
     }
 
     void insert_test_string() {
diff --git a/modules/platforms/dotnet/Apache.Ignite.Tests/Sql/IgniteDbDataReaderTests.cs b/modules/platforms/dotnet/Apache.Ignite.Tests/Sql/IgniteDbDataReaderTests.cs
index 036e93f425..8479df3514 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Tests/Sql/IgniteDbDataReaderTests.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Tests/Sql/IgniteDbDataReaderTests.cs
@@ -399,7 +399,7 @@ public class IgniteDbDataReaderTests : IgniteTestsBase
         Assert.AreEqual(typeof(string), schema[1].DataType);
         Assert.AreEqual("varchar", schema[1].DataTypeName);
         Assert.IsTrue(schema[1].AllowDBNull);
-        Assert.AreEqual(65536, schema[1].NumericPrecision);
+        Assert.AreEqual(65535, schema[1].NumericPrecision);
         Assert.IsNull(schema[1].NumericScale);
         Assert.IsNotNull((schema[1] as IgniteDbColumn)?.ColumnMetadata);
     }
diff --git a/modules/platforms/dotnet/Apache.Ignite.Tests/Sql/SqlTests.cs b/modules/platforms/dotnet/Apache.Ignite.Tests/Sql/SqlTests.cs
index a7699e1454..ba53a68ac9 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Tests/Sql/SqlTests.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Tests/Sql/SqlTests.cs
@@ -301,7 +301,7 @@ namespace Apache.Ignite.Tests.Sql
             Assert.IsTrue(columns[0].Nullable);
             Assert.AreEqual(ColumnType.String, columns[0].Type);
             Assert.AreEqual(int.MinValue, columns[0].Scale);
-            Assert.AreEqual(65536, columns[0].Precision);
+            Assert.AreEqual(65535, columns[0].Precision);
 
             Assert.AreEqual("ID", columns[1].Name);
             Assert.AreEqual("ID", columns[1].Origin!.ColumnName);
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
index 8afecc4ad1..581638865e 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
@@ -46,6 +46,7 @@ import org.apache.ignite.compute.ComputeJob;
 import org.apache.ignite.compute.JobExecutionContext;
 import org.apache.ignite.internal.app.IgniteImpl;
 import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
+import org.apache.ignite.internal.catalog.commands.CatalogUtils;
 import org.apache.ignite.internal.catalog.commands.ColumnParams;
 import org.apache.ignite.internal.catalog.commands.CreateTableParams;
 import org.apache.ignite.internal.catalog.commands.CreateZoneParams;
@@ -61,7 +62,6 @@ import org.apache.ignite.internal.schema.row.Row;
 import org.apache.ignite.internal.schema.testutils.SchemaConfigurationConverter;
 import org.apache.ignite.internal.schema.testutils.builder.SchemaBuilders;
 import org.apache.ignite.internal.schema.testutils.definition.ColumnType;
-import org.apache.ignite.internal.schema.testutils.definition.ColumnType.TemporalColumnType;
 import org.apache.ignite.internal.schema.testutils.definition.TableDefinition;
 import org.apache.ignite.internal.table.RecordBinaryViewImpl;
 import org.apache.ignite.internal.table.distributed.TableManager;
@@ -296,14 +296,14 @@ public class PlatformTestNodeRunner {
                 .tableName(TABLE_NAME)
                 .columns(List.of(
                         ColumnParams.builder().name(keyCol).type(org.apache.ignite.sql.ColumnType.INT64).build(),
-                        ColumnParams.builder().name("VAL").type(org.apache.ignite.sql.ColumnType.STRING).length(0).nullable(true).build()
+                        ColumnParams.builder().name("VAL").type(org.apache.ignite.sql.ColumnType.STRING).nullable(true).build()
                 ))
                 .primaryKeyColumns(List.of(keyCol))
                 .build();
 
         assertThat(ignite.catalogManager().createTable(createTableParams), willBe(nullValue()));
 
-        int maxTimePrecision = TemporalColumnType.MAX_TIME_PRECISION;
+        int maxTimePrecision = CatalogUtils.MAX_TIME_PRECISION;
 
         TableDefinition schTblAll = SchemaBuilders.tableBuilder(DEFAULT_SCHEMA_NAME, TABLE_NAME_ALL_COLUMNS).columns(
                 SchemaBuilders.column(keyCol, ColumnType.INT64).build(),
@@ -337,7 +337,7 @@ public class PlatformTestNodeRunner {
                 .tableName(TABLE_NAME_ALL_COLUMNS)
                 .columns(List.of(
                         ColumnParams.builder().name(keyCol).type(org.apache.ignite.sql.ColumnType.INT64).build(),
-                        ColumnParams.builder().name("STR").type(org.apache.ignite.sql.ColumnType.STRING).length(0).nullable(true).build(),
+                        ColumnParams.builder().name("STR").type(org.apache.ignite.sql.ColumnType.STRING).nullable(true).build(),
                         ColumnParams.builder().name("INT8").type(org.apache.ignite.sql.ColumnType.INT8).nullable(true).build(),
                         ColumnParams.builder().name("INT16").type(org.apache.ignite.sql.ColumnType.INT16).nullable(true).build(),
                         ColumnParams.builder().name("INT32").type(org.apache.ignite.sql.ColumnType.INT32).nullable(true).build(),
@@ -360,7 +360,7 @@ public class PlatformTestNodeRunner {
                                 .nullable(true).build(),
                         ColumnParams.builder().name("TIMESTAMP2").type(org.apache.ignite.sql.ColumnType.DATETIME).precision(4)
                                 .nullable(true).build(),
-                        ColumnParams.builder().name("BLOB").type(org.apache.ignite.sql.ColumnType.BYTE_ARRAY).length(0).nullable(true)
+                        ColumnParams.builder().name("BLOB").type(org.apache.ignite.sql.ColumnType.BYTE_ARRAY).nullable(true)
                                 .build(),
                         ColumnParams.builder().name("DECIMAL").type(org.apache.ignite.sql.ColumnType.DECIMAL).precision(19).scale(3)
                                 .nullable(true).build()
@@ -402,7 +402,7 @@ public class PlatformTestNodeRunner {
                 .tableName(TABLE_NAME_ALL_COLUMNS_SQL)
                 .columns(List.of(
                         ColumnParams.builder().name(keyCol).type(org.apache.ignite.sql.ColumnType.INT64).build(),
-                        ColumnParams.builder().name("STR").type(org.apache.ignite.sql.ColumnType.STRING).length(0).nullable(true).build(),
+                        ColumnParams.builder().name("STR").type(org.apache.ignite.sql.ColumnType.STRING).nullable(true).build(),
                         ColumnParams.builder().name("INT8").type(org.apache.ignite.sql.ColumnType.INT8).nullable(true).build(),
                         ColumnParams.builder().name("INT16").type(org.apache.ignite.sql.ColumnType.INT16).nullable(true).build(),
                         ColumnParams.builder().name("INT32").type(org.apache.ignite.sql.ColumnType.INT32).nullable(true).build(),
@@ -423,7 +423,7 @@ public class PlatformTestNodeRunner {
                                 .precision(maxTimePrecision).nullable(true).build(),
                         ColumnParams.builder().name("TIMESTAMP2").type(org.apache.ignite.sql.ColumnType.TIMESTAMP)
                                 .precision(maxTimePrecision).nullable(true).build(),
-                        ColumnParams.builder().name("BLOB").type(org.apache.ignite.sql.ColumnType.BYTE_ARRAY).length(0).nullable(true)
+                        ColumnParams.builder().name("BLOB").type(org.apache.ignite.sql.ColumnType.BYTE_ARRAY).nullable(true)
                                 .build(),
                         ColumnParams.builder().name("DECIMAL").type(org.apache.ignite.sql.ColumnType.DECIMAL).precision(19).scale(3)
                                 .nullable(true).build()
@@ -501,8 +501,8 @@ public class PlatformTestNodeRunner {
 
         createTwoColumnTable(
                 ignite,
-                ColumnParams.builder().name("KEY").type(org.apache.ignite.sql.ColumnType.STRING).length(0).build(),
-                ColumnParams.builder().name("VAL").type(org.apache.ignite.sql.ColumnType.STRING).length(0).nullable(true).build()
+                ColumnParams.builder().name("KEY").type(org.apache.ignite.sql.ColumnType.STRING).build(),
+                ColumnParams.builder().name("VAL").type(org.apache.ignite.sql.ColumnType.STRING).nullable(true).build()
         );
 
         createTwoColumnTable(
@@ -538,8 +538,8 @@ public class PlatformTestNodeRunner {
 
         createTwoColumnTable(
                 ignite,
-                ColumnParams.builder().name("KEY").type(org.apache.ignite.sql.ColumnType.BYTE_ARRAY).length(0).build(),
-                ColumnParams.builder().name("VAL").type(org.apache.ignite.sql.ColumnType.BYTE_ARRAY).length(0).nullable(true)
+                ColumnParams.builder().name("KEY").type(org.apache.ignite.sql.ColumnType.BYTE_ARRAY).build(),
+                ColumnParams.builder().name("VAL").type(org.apache.ignite.sql.ColumnType.BYTE_ARRAY).nullable(true)
                         .build()
         );
 
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java
index ef6bfcf166..0702740b87 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItMetadataTest.java
@@ -182,13 +182,13 @@ public class ItMetadataTest extends ClusterPerClassIntegrationTest {
                         // Character string types
                         new MetadataMatcher().name("CHAR_C").type(ColumnType.STRING).precision(1).scale(UNDEFINED_SCALE),
                         new MetadataMatcher().name("CHAR_C2").type(ColumnType.STRING).precision(65536).scale(UNDEFINED_SCALE),
-                        new MetadataMatcher().name("VARCHAR_C").type(ColumnType.STRING).precision(65536).scale(UNDEFINED_SCALE),
+                        new MetadataMatcher().name("VARCHAR_C").type(ColumnType.STRING).precision(65535).scale(UNDEFINED_SCALE),
                         new MetadataMatcher().name("VARCHAR_C2").type(ColumnType.STRING).precision(125).scale(UNDEFINED_SCALE),
 
                         // Binary string types
                         new MetadataMatcher().name("BINARY_C").type(ColumnType.BYTE_ARRAY).precision(1).scale(UNDEFINED_SCALE),
                         new MetadataMatcher().name("BINARY_C2").type(ColumnType.BYTE_ARRAY).precision(65536).scale(UNDEFINED_SCALE),
-                        new MetadataMatcher().name("VARBINARY_C").type(ColumnType.BYTE_ARRAY).precision(65536).scale(UNDEFINED_SCALE),
+                        new MetadataMatcher().name("VARBINARY_C").type(ColumnType.BYTE_ARRAY).precision(65535).scale(UNDEFINED_SCALE),
                         new MetadataMatcher().name("VARBINARY_C2").type(ColumnType.BYTE_ARRAY).precision(125).scale(UNDEFINED_SCALE),
 
                         // Datetime types
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSecondaryIndexTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSecondaryIndexTest.java
index 1a4b241bdc..281f6e977c 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSecondaryIndexTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItSecondaryIndexTest.java
@@ -812,8 +812,8 @@ public class ItSecondaryIndexTest extends ClusterPerClassIntegrationTest {
         assertQuery("SELECT id FROM Birthday WHERE name BETWEEN 'B' AND 'D' AND name > ?")
                 .withParams("Bach")
                 .matches(containsIndexScan("PUBLIC", "BIRTHDAY", NAME_DATE_IDX))
-                .matches(containsString("searchBounds=[[RangeBounds [lowerBound=$GREATEST2(_UTF-8'B':VARCHAR(65536) "
-                        + "CHARACTER SET \"UTF-8\", ?0), upperBound=_UTF-8'D':VARCHAR(65536) CHARACTER SET \"UTF-8\""))
+                .matches(containsString("searchBounds=[[RangeBounds [lowerBound=$GREATEST2(_UTF-8'B':VARCHAR(65535) "
+                        + "CHARACTER SET \"UTF-8\", ?0), upperBound=_UTF-8'D':VARCHAR(65535) CHARACTER SET \"UTF-8\""))
                 .returns(2)
                 .returns(6)
                 .check();
diff --git a/modules/schema/src/testFixtures/java/org/apache/ignite/internal/schema/testutils/definition/ColumnType.java b/modules/schema/src/testFixtures/java/org/apache/ignite/internal/schema/testutils/definition/ColumnType.java
index ba31be461e..c1b85a0298 100644
--- a/modules/schema/src/testFixtures/java/org/apache/ignite/internal/schema/testutils/definition/ColumnType.java
+++ b/modules/schema/src/testFixtures/java/org/apache/ignite/internal/schema/testutils/definition/ColumnType.java
@@ -17,8 +17,9 @@
 
 package org.apache.ignite.internal.schema.testutils.definition;
 
+import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_VARLEN_LENGTH;
+
 import java.util.Objects;
-import org.apache.ignite.internal.catalog.commands.CatalogUtils;
 
 /**
  * Predefined column types.
@@ -259,10 +260,10 @@ public class ColumnType {
      */
     public static class VarLenColumnType extends ColumnType {
         /** String varlen type of unlimited length. */
-        private static final VarLenColumnType UNLIMITED_STRING = new VarLenColumnType(ColumnTypeSpec.STRING, CatalogUtils.MAX_LENGTH);
+        private static final VarLenColumnType UNLIMITED_STRING = new VarLenColumnType(ColumnTypeSpec.STRING, DEFAULT_VARLEN_LENGTH);
 
         /** Blob varlen type of unlimited length. */
-        private static final VarLenColumnType UNLIMITED_BLOB = new VarLenColumnType(ColumnTypeSpec.BYTES,  CatalogUtils.MAX_LENGTH);
+        private static final VarLenColumnType UNLIMITED_BLOB = new VarLenColumnType(ColumnTypeSpec.BYTES,  DEFAULT_VARLEN_LENGTH);
 
         /** Max length. */
         private final int length;
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
index ad8b6490a1..b502e6fef5 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
@@ -71,7 +71,6 @@ import org.apache.ignite.internal.sql.engine.prepare.PrepareServiceImpl;
 import org.apache.ignite.internal.sql.engine.property.PropertiesHelper;
 import org.apache.ignite.internal.sql.engine.property.PropertiesHolder;
 import org.apache.ignite.internal.sql.engine.schema.CatalogSqlSchemaManager;
-import org.apache.ignite.internal.sql.engine.schema.IgniteSchema;
 import org.apache.ignite.internal.sql.engine.schema.SqlSchemaManager;
 import org.apache.ignite.internal.sql.engine.session.Session;
 import org.apache.ignite.internal.sql.engine.session.SessionId;
@@ -403,6 +402,8 @@ public class SqlQueryProcessor implements QueryProcessor {
         AtomicReference<InternalTransaction> tx = new AtomicReference<>();
 
         CompletableFuture<AsyncSqlCursor<List<Object>>> stage = start
+                //TODO: IGNITE-19499 Drop next line. Force direct config lookup on late node to avoid race.
+                .thenCompose(ignored -> tableManager.tablesAsync())
                 .thenCompose(ignored -> {
                     ParsedResult result = parserService.parse(sql);
 
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java
index 390d9be156..4e399ab247 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/type/IgniteTypeFactory.java
@@ -261,12 +261,12 @@ public class IgniteTypeFactory extends JavaTypeFactoryImpl {
             case VARCHAR:
             case CHAR:
                 return relType.getPrecision() == PRECISION_NOT_SPECIFIED
-                        ? NativeTypes.stringOf(CatalogUtils.MAX_LENGTH)
+                        ? NativeTypes.stringOf(CatalogUtils.DEFAULT_VARLEN_LENGTH)
                         : NativeTypes.stringOf(relType.getPrecision());
             case BINARY:
             case VARBINARY:
                 return relType.getPrecision() == PRECISION_NOT_SPECIFIED
-                        ? NativeTypes.blobOf(CatalogUtils.MAX_LENGTH)
+                        ? NativeTypes.blobOf(CatalogUtils.DEFAULT_VARLEN_LENGTH)
                         : NativeTypes.blobOf(relType.getPrecision());
             case ANY:
                 if (relType instanceof IgniteCustomType) {


[ignite-3] 03/03: Merge branch 'catalog-feature' into ignite-19497

Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-19497
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit f0dff0b01ff19b9fc0765508b5d3550f23f2cb5b
Merge: f419bc02b3 5a812c5586
Author: amashenkov <an...@gmail.com>
AuthorDate: Thu Aug 10 15:16:53 2023 +0300

    Merge branch 'catalog-feature' into ignite-19497
    
    # Conflicts:
    #       modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java

 .../org/apache/ignite/sql/SqlBatchException.java   |   6 +-
 ...liCommandTestNotInitializedIntegrationBase.java |  12 +-
 .../cli/commands/ItConnectionHeartbeatTest.java    | 142 +++++++++
 .../repl/executor/ItIgnitePicocliCommandsTest.java |   7 +-
 .../apache/ignite/internal/cli/ReplManager.java    |   5 +
 .../internal/cli/call/connect/ConnectCall.java     |  19 +-
 .../internal/cli/call/connect/DisconnectCall.java  |  11 +-
 ...SessionEventListener.java => ConnectEvent.java} |  26 +-
 .../cli/core/repl/ConnectionHeartBeat.java         | 134 ++++++++
 ...EventListener.java => ConnectionLostEvent.java} |  17 +-
 ...tListener.java => ConnectionRestoredEvent.java} |  17 +-
 ...sionEventListener.java => DisconnectEvent.java} |  17 +-
 .../core/repl/EventListeningActivationPoint.java   |  91 ++++++
 .../cli/core/repl/PeriodicSessionTaskExecutor.java |   3 +-
 .../apache/ignite/internal/cli/core/repl/Repl.java |  11 +-
 .../ignite/internal/cli/core/repl/ReplBuilder.java |  16 +-
 .../ignite/internal/cli/core/repl/Session.java     |  42 +--
 .../ignite/internal/cli/core/repl/SessionInfo.java |  47 ++-
 .../cli/core/repl/executor/ReplExecutor.java       |   2 +
 .../cli/core/repl/prompt/ReplPromptProvider.java   |  19 +-
 .../registry/impl/ClusterConfigRegistryImpl.java   |   4 +-
 .../repl/registry/impl/MetricRegistryImpl.java     |   4 +-
 .../repl/registry/impl/NodeConfigRegistryImpl.java |   4 +-
 .../core/repl/registry/impl/UnitsRegistryImpl.java |   4 +-
 .../cli/event/ConnectionEventListener.java         |  65 ++++
 .../Event.java}                                    |  15 +-
 .../ignite/internal/cli/event/EventFactory.java    |  84 +++++
 .../EventListener.java}                            |  15 +-
 .../EventPublisher.java}                           |  19 +-
 .../EventSubscriptionManager.java}                 |  14 +-
 .../EventType.java}                                |  18 +-
 .../apache/ignite/internal/cli/event/Events.java   |  67 ++++
 .../ignite/internal/cli/logger/HttpLogging.java    |   5 +
 .../core/repl/SessionDefaultValueProviderTest.java |   6 +-
 .../filter/DynamicCompleterFilterTest.java         |  10 +-
 .../internal/cli/logger/HttpLoggingTest.java       |  35 ++-
 .../client/proto/ClientBinaryTupleUtils.java       |   6 +-
 .../client/handler/JdbcQueryEventHandlerImpl.java  |   5 +-
 modules/client/build.gradle                        |   4 +-
 .../ignite/client/AbstractClientTableTest.java     |  36 +--
 .../apache/ignite/client/ClientRecordViewTest.java |   4 +-
 .../org/apache/ignite/client/ClientTableTest.java  |   4 +-
 .../ignite/client/PartitionAwarenessTest.java      |   2 +-
 .../ignite/internal/sql/AbstractSession.java       |  10 +-
 .../ignite/jdbc/ItJdbcResultSetSelfTest.java       |  24 +-
 .../ignite/internal/marshaller/FieldAccessor.java  |   1 +
 .../ignite/internal/marshaller/MarshallerUtil.java |  58 ++++
 .../dotnet/Apache.Ignite.Tests/.editorconfig       |   3 +
 .../Apache.Ignite.Tests/ClientSocketTests.cs       |  23 +-
 .../dotnet/Apache.Ignite.Tests/FakeServer.cs       |  20 +-
 .../dotnet/Apache.Ignite.Tests/Sql/SqlTests.cs     |   8 +-
 .../Transactions/TransactionsTests.cs              |  27 ++
 .../Apache.Ignite/Internal/ClientFailoverSocket.cs |  60 ++--
 .../dotnet/Apache.Ignite/Internal/ClientSocket.cs  |  22 +-
 .../Internal/IClientSocketEventListener.cs}        |  34 +-
 .../dotnet/Apache.Ignite/Internal/Sql/Sql.cs       |  16 +-
 .../Internal/Transactions/Transactions.cs          |   4 +-
 .../service/ItAbstractListenerSnapshotTest.java    |   7 +
 .../app/client/ItThinClientMarshallingTest.java    | 185 ++++++++++-
 .../runner/app/client/ItThinClientSqlTest.java     |   2 +-
 .../ignite/internal/sql/api/ItCommonApiTest.java   |   7 +-
 .../internal/sql/api/ItSqlAsynchronousApiTest.java | 157 ++++++----
 .../internal/sql/api/ItSqlSynchronousApiTest.java  | 101 +++---
 .../internal/sql/engine/ItAggregatesTest.java      | 188 ++++++++---
 .../internal/sql/engine/ItDataTypesTest.java       |  41 +--
 .../ignite/internal/sql/engine/ItDmlTest.java      |   9 +-
 .../sql/engine/ItDynamicParameterTest.java         |   7 +-
 .../internal/sql/engine/ItFunctionsTest.java       |  29 +-
 .../ignite/internal/sql/engine/ItIntervalTest.java |  42 +--
 .../internal/sql/engine/ItLimitOffsetTest.java     |  41 ++-
 .../internal/sql/engine/ItSqlOperatorsTest.java    |   1 -
 .../sql/engine/datatypes/uuid/ItUuidQueryTest.java |   2 +-
 .../datatypes/varbinary/ItVarBinaryQueryTest.java  |   2 +-
 .../streamer/ItAbstractDataStreamerTest.java       |   4 +-
 .../sql/cast/test_boolean_cast.test                |  73 ++---
 .../marshaller/reflection/KvMarshallerImpl.java    |  16 +-
 .../marshaller/reflection/ObjectStatistics.java    |   6 +-
 .../reflection/RecordMarshallerImpl.java           |  12 +-
 .../ignite/internal/schema/row/RowAssembler.java   |  16 +-
 .../schema/marshaller/KvMarshallerTest.java        |   8 +-
 .../schema/marshaller/RecordMarshallerTest.java    |   8 +-
 modules/sql-engine/build.gradle                    |   2 +
 .../ignite/internal/sql/api/SessionImpl.java       |  67 ++--
 .../internal/sql/engine/AsyncSqlCursorImpl.java    |  17 +-
 .../sql/engine/exec/ExchangeServiceImpl.java       |  42 +--
 .../sql/engine/exec/LogicalRelImplementor.java     |   4 +-
 .../sql/engine/exec/exp/ExpressionFactoryImpl.java |  19 +-
 .../sql/engine/exec/exp/IgniteSqlFunctions.java    | 111 ++++---
 .../sql/engine/exec/exp/agg/Accumulator.java       |   5 +-
 .../engine/exec/exp/agg/AccumulatorWrapper.java    |   4 -
 .../sql/engine/exec/exp/agg/Accumulators.java      | 178 +----------
 .../engine/exec/exp/agg/AccumulatorsFactory.java   |  21 +-
 .../sql/engine/exec/exp/agg/AggregateRow.java      |  86 +++++
 .../internal/sql/engine/exec/exp/agg/GroupKey.java |  21 +-
 .../sql/engine/exec/rel/HashAggregateNode.java     | 146 +++------
 .../internal/sql/engine/exec/rel/RootNode.java     |  14 +-
 .../sql/engine/exec/rel/SortAggregateNode.java     |  69 +---
 .../sql/engine/prepare/IgniteSqlValidator.java     |  73 ++++-
 .../sql/engine/prepare/PrepareServiceImpl.java     |  33 +-
 .../sql/engine/rel/agg/IgniteMapHashAggregate.java |  26 +-
 .../sql/engine/rel/agg/IgniteMapSortAggregate.java |  20 +-
 .../engine/rel/agg/IgniteReduceHashAggregate.java  |   5 -
 .../sql/engine/rel/agg/MapReduceAggregates.java    | 347 +++++++++++++++++++++
 .../engine/rule/HashAggregateConverterRule.java    |  71 +++--
 .../engine/rule/SortAggregateConverterRule.java    |  68 ++--
 .../ignite/internal/sql/engine/util/Commons.java   |  38 +++
 .../engine/util/IgniteCustomAssigmentsRules.java   | 255 +++++++++++++++
 .../ignite/internal/sql/engine/util/PlanUtils.java | 125 ++++++++
 .../engine/util/SqlExceptionMapperProvider.java    |  63 ++++
 .../engine/exec/exp/IgniteSqlFunctionsTest.java    |  34 +-
 .../sql/engine/exec/rel/BaseAggregateTest.java     |  20 ++
 .../exec/rel/HashAggregateExecutionTest.java       |   9 +-
 .../rel/HashAggregateSingleGroupExecutionTest.java | 129 +++-----
 .../exec/rel/SortAggregateExecutionTest.java       |   9 +-
 .../planner/AbstractAggregatePlannerTest.java      | 115 ++++---
 .../sql/engine/planner/AbstractPlannerTest.java    |  12 +-
 .../sql/engine/planner/AggregatePlannerTest.java   |  69 +++-
 .../sql/engine/planner/CastResolutionTest.java     | 217 +++++++++++++
 .../planner/ColocatedHashAggregatePlannerTest.java |  33 ++
 .../planner/ColocatedSortAggregatePlannerTest.java |  34 ++
 .../sql/engine/planner/JoinCommutePlannerTest.java |   6 +-
 .../planner/MapReduceHashAggregatePlannerTest.java |  90 +++++-
 .../planner/MapReduceSortAggregatePlannerTest.java |  89 ++++--
 .../sql/engine/planner/UnionPlannerTest.java       |  23 +-
 .../sql/engine/prepare/TypeCoercionTest.java       |  30 +-
 .../internal/sql/engine/util/CommonsTest.java      |  54 ++++
 .../internal/sql/engine/util/PlanUtilsTest.java    | 113 +++++++
 .../internal/sql/engine/util/StatementChecker.java |  27 +-
 .../internal/sql/engine/util/SqlTestUtils.java     |  22 ++
 .../ignite/distributed/ItTablePersistenceTest.java |  17 +-
 130 files changed, 4011 insertions(+), 1419 deletions(-)

diff --cc modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java
index b6a9d5b26a,f69027b1cf..6e7cf74b32
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java
@@@ -43,7 -52,7 +52,8 @@@ import java.util.stream.Collectors
  import java.util.stream.IntStream;
  import java.util.stream.Stream;
  import java.util.stream.StreamSupport;
+ import javax.annotation.Nullable;
 +import org.apache.ignite.internal.catalog.commands.CatalogUtils;
  import org.apache.ignite.internal.client.sql.ClientSql;
  import org.apache.ignite.internal.sql.api.ColumnMetadataImpl.ColumnOriginImpl;
  import org.apache.ignite.internal.sql.engine.ClusterPerClassIntegrationTest;
diff --cc modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/StatementChecker.java
index fc1f31d2bd,15b15816a5..b7f4b10f5a
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/StatementChecker.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/util/StatementChecker.java
@@@ -358,14 -383,12 +375,14 @@@ public class StatementChecker 
              Function<TableBuilder, TestTable> addTable = entry.getValue();
  
              TestTable table = addTable.apply(TestBuilders.table().name(tableName));
 -            schema.addTable(table);
 +
 +            tables.add(table);
          }
 -        return schema;
 +
 +        return new IgniteSchema("PUBLIC", 0, tables);
      }
  
-     private DynamicTest shouldPass(String name, Throwable exception, Consumer<IgniteRel> check) {
+     private DynamicTest shouldPass(String name, Throwable exception, Consumer<IgniteRel> check, boolean relCheck) {
          return DynamicTest.dynamicTest(name, () -> {
              IgniteSchema schema = initSchema(exception);
              IgniteRel root;


[ignite-3] 02/03: fix tests.

Posted by am...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

amashenkov pushed a commit to branch ignite-19497
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit f419bc02b36bcd579b52cc4ef8b8ef8ab4b2fd5c
Author: amashenkov <an...@gmail.com>
AuthorDate: Wed Aug 9 19:16:08 2023 +0300

    fix tests.
---
 .../java/org/apache/ignite/jdbc/ItJdbcStatementSelfTest.java          | 3 ++-
 .../apache/ignite/internal/runner/app/client/ItThinClientSqlTest.java | 3 ++-
 .../org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java  | 3 ++-
 .../ignite/internal/storage/index/AbstractIndexStorageTest.java       | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcStatementSelfTest.java b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcStatementSelfTest.java
index 61dc1048ea..63e42cfa17 100644
--- a/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcStatementSelfTest.java
+++ b/modules/jdbc/src/integrationTest/java/org/apache/ignite/jdbc/ItJdbcStatementSelfTest.java
@@ -487,7 +487,8 @@ public class ItJdbcStatementSelfTest extends ItJdbcAbstractStatementSelfTest {
 
     @Test
     public void testExecuteUpdateOnDdl() throws SQLException {
-        String tableName = "\"test_" + UUID.randomUUID().toString() + "\"";
+        //TODO: IGNITE-19499 Remove conversion to uppercase.
+        String tableName = ("\"test_" + UUID.randomUUID() + "\"").toUpperCase();
 
         stmt.executeUpdate("CREATE TABLE " + tableName + "(id INT PRIMARY KEY, val VARCHAR)");
 
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientSqlTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientSqlTest.java
index 7635677558..e30c019b84 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientSqlTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/client/ItThinClientSqlTest.java
@@ -34,6 +34,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletionException;
+import org.apache.ignite.internal.catalog.commands.CatalogUtils;
 import org.apache.ignite.lang.IgniteException;
 import org.apache.ignite.sql.ColumnMetadata;
 import org.apache.ignite.sql.ColumnType;
@@ -289,7 +290,7 @@ public class ItThinClientSqlTest extends ItAbstractThinClientTest {
         assertEquals(ColumnType.STRING, columns.get(0).type());
 
         assertEquals(ColumnMetadata.UNDEFINED_SCALE, columns.get(0).scale());
-        assertEquals(2 << 15, columns.get(0).precision());
+        assertEquals(CatalogUtils.DEFAULT_VARLEN_LENGTH, columns.get(0).precision());
 
         assertEquals("ID", columns.get(1).name());
         assertEquals("ID", columns.get(1).origin().columnName());
diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java
index ecbb5253a0..b6a9d5b26a 100644
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItSqlAsynchronousApiTest.java
@@ -43,6 +43,7 @@ import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
+import org.apache.ignite.internal.catalog.commands.CatalogUtils;
 import org.apache.ignite.internal.client.sql.ClientSql;
 import org.apache.ignite.internal.sql.api.ColumnMetadataImpl.ColumnOriginImpl;
 import org.apache.ignite.internal.sql.engine.ClusterPerClassIntegrationTest;
@@ -480,7 +481,7 @@ public class ItSqlAsynchronousApiTest extends ClusterPerClassIntegrationTest {
         checkMetadata(new ColumnMetadataImpl(
                         "COL1",
                         ColumnType.STRING,
-                        2 << 15,
+                        CatalogUtils.DEFAULT_VARLEN_LENGTH,
                         ColumnMetadata.UNDEFINED_SCALE,
                         false,
                         new ColumnOriginImpl("PUBLIC", "TEST", "COL1")),
diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java
index 058205dedf..a158316da6 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractIndexStorageTest.java
@@ -99,8 +99,8 @@ public abstract class AbstractIndexStorageTest<S extends IndexStorage, D extends
                 columnParamsBuilder(ColumnType.UUID).nullable(true).build(),
                 columnParamsBuilder(ColumnType.DATE).nullable(true).build(),
                 columnParamsBuilder(ColumnType.BITMASK).length(32).nullable(true).build(),
-                columnParamsBuilder(ColumnType.STRING).length(0).nullable(true).build(),
-                columnParamsBuilder(ColumnType.BYTE_ARRAY).length(0).nullable(true).build(),
+                columnParamsBuilder(ColumnType.STRING).nullable(true).build(),
+                columnParamsBuilder(ColumnType.BYTE_ARRAY).nullable(true).build(),
                 columnParamsBuilder(ColumnType.NUMBER).precision(Integer.MAX_VALUE).nullable(true).build(),
                 columnParamsBuilder(ColumnType.DECIMAL).precision(19).scale(3).nullable(true).build(),
                 columnParamsBuilder(ColumnType.TIME).precision(0).nullable(true).build(),