(ignite-extensions) branch master updated: IGNITE-21261 Fix exception 'Unknown topic' is never thrown in KafkaToIgniteMetadataUpdater (#253)
This is an automated email from the ASF dual-hosted git repository.
tledkov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new b50d0fbe IGNITE-21261 Fix exception 'Unknown topic' is never thrown in
KafkaToIgniteMetadataUpdater (#253)
b50d0fbe is described below
commit b50d0fbed740461703c284e64ed2bf4686634225
Author: xintrian <38949442+xintr...@users.noreply.github.com>
AuthorDate: Tue Jan 16 17:33:50 2024 +0300
IGNITE-21261 Fix exception 'Unknown topic' is never thrown in
KafkaToIgniteMetadataUpdater (#253)
---
.../java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdater.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdater.java
b/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdater.java
index 6135b9db..97b5bfed 100644
---
a/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdater.java
+++
b/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdater.java
@@ -107,7 +107,7 @@ public class KafkaToIgniteMetadataUpdater implements
AutoCloseable, OffsetCommit
List topicMeta = cnsmr.partitionsFor(metaTopic,
Duration.ofMillis(kafkaReqTimeout));
-if (topicMeta == null)
+if (F.isEmpty(topicMeta))
throw new IgniteException("Unknown topic: " + metaTopic);
parts = topicMeta
(ignite-3) branch main updated: IGNITE-21202 Un-deprecate PrimaryReplicaEventParameters.leaseholder (#3053)
This is an automated email from the ASF dual-hosted git repository. ptupitsyn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git The following commit(s) were added to refs/heads/main by this push: new b768928fed IGNITE-21202 Un-deprecate PrimaryReplicaEventParameters.leaseholder (#3053) b768928fed is described below commit b768928fed89c6529aba6c64391d6c2e35648cdf Author: Pavel Tupitsyn AuthorDate: Tue Jan 16 15:05:22 2024 +0200 IGNITE-21202 Un-deprecate PrimaryReplicaEventParameters.leaseholder (#3053) Using consistentId for partition awareness is ok, we don't need to change it. See detailed explanation in the JIRA comments. --- .../org/apache/ignite/client/handler/ClientPrimaryReplicaTracker.java| 1 - .../internal/placementdriver/event/PrimaryReplicaEventParameters.java| 1 - 2 files changed, 2 deletions(-) diff --git a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/ClientPrimaryReplicaTracker.java b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/ClientPrimaryReplicaTracker.java index 82d4b9955d..9095615e98 100644 --- a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/ClientPrimaryReplicaTracker.java +++ b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/ClientPrimaryReplicaTracker.java @@ -303,7 +303,6 @@ public class ClientPrimaryReplicaTracker implements EventListener
(ignite-3) branch ignite-20098 updated (71b6515585 -> 6386aef3b8)
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a change to branch ignite-20098 in repository https://gitbox.apache.org/repos/asf/ignite-3.git from 71b6515585 Fix platforms tests. add 6386aef3b8 Styles. No new revisions were added by this update. Summary of changes: .../ignite/internal/catalog/commands/DropZoneCommandValidationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(ignite-3) branch ignite-20098 updated: Fix platforms tests.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-20098
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-20098 by this push:
new 71b6515585 Fix platforms tests.
71b6515585 is described below
commit 71b6515585cd07fcb1859fb8953ce61827a64019
Author: amashenkov
AuthorDate: Tue Jan 16 15:30:28 2024 +0300
Fix platforms tests.
---
modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java | 2 +-
modules/platforms/cpp/ignite/common/error_codes.h | 2 +-
modules/platforms/cpp/ignite/odbc/common_types.cpp| 4
modules/platforms/dotnet/Apache.Ignite/ErrorCodes.g.cs| 2 +-
4 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
b/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
index 9e60780bda..0d6deb31fd 100755
--- a/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
+++ b/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
@@ -420,7 +420,7 @@ public class ErrorGroups {
public static final ErrorGroup DISTRIBUTION_ZONES_ERR_GROUP =
registerGroup("DISTRZONES", (short) 10);
/** Distribution zone is not found. */
-public static final int ZONE_NOT_FOUND_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 2);
+public static final int ZONE_NOT_FOUND_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 1);
}
/** Network error group. */
diff --git a/modules/platforms/cpp/ignite/common/error_codes.h
b/modules/platforms/cpp/ignite/common/error_codes.h
index 589863c1bd..6905d4f846 100644
--- a/modules/platforms/cpp/ignite/common/error_codes.h
+++ b/modules/platforms/cpp/ignite/common/error_codes.h
@@ -146,7 +146,7 @@ enum class code : underlying_t {
STORAGE_REBALANCE = 0x90004,
// DistributionZones group. Group code: 10
-ZONE_NOT_FOUND = 0xa0002,
+ZONE_NOT_FOUND = 0xa0001,
// Network group. Group code: 11
UNRESOLVABLE_CONSISTENT_ID = 0xb0001,
diff --git a/modules/platforms/cpp/ignite/odbc/common_types.cpp
b/modules/platforms/cpp/ignite/odbc/common_types.cpp
index c3a2a0c6e3..69dde4107a 100644
--- a/modules/platforms/cpp/ignite/odbc/common_types.cpp
+++ b/modules/platforms/cpp/ignite/odbc/common_types.cpp
@@ -229,11 +229,7 @@ sql_state error_code_to_sql_state(error::code code) {
return sql_state::SHY000_GENERAL_ERROR;
// DistributionZones group. Group code: 10
-case error::code::ZONE_ALREADY_EXISTS:
case error::code::ZONE_NOT_FOUND:
-case error::code::ZONE_RENAME:
-case error::code::ZONE_DROP:
-case error::code::ZONE_DEFINITION:
return sql_state::SHY000_GENERAL_ERROR;
// Network group. Group code: 11
diff --git a/modules/platforms/dotnet/Apache.Ignite/ErrorCodes.g.cs
b/modules/platforms/dotnet/Apache.Ignite/ErrorCodes.g.cs
index f8a969d700..0901921f13 100644
--- a/modules/platforms/dotnet/Apache.Ignite/ErrorCodes.g.cs
+++ b/modules/platforms/dotnet/Apache.Ignite/ErrorCodes.g.cs
@@ -361,7 +361,7 @@ namespace Apache.Ignite
public const String GroupName = "DISTRZONES";
/// ZoneNotFound error.
-public const int ZoneNotFound = (GroupCode << 16) | (2 & 0x);
+public const int ZoneNotFound = (GroupCode << 16) | (1 & 0x);
}
/// Network errors.
(ignite-3) branch ignite-20098 updated: Styles.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-20098
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-20098 by this push:
new 3d9f0d1ae8 Styles.
3d9f0d1ae8 is described below
commit 3d9f0d1ae8335cf6301bb05e51c2cb08612a1838
Author: amashenkov
AuthorDate: Tue Jan 16 15:27:54 2024 +0300
Styles.
---
.../org/apache/ignite/internal/catalog/commands/DropZoneCommand.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropZoneCommand.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropZoneCommand.java
index 890d55f838..f6c09205de 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropZoneCommand.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropZoneCommand.java
@@ -54,7 +54,7 @@ public class DropZoneCommand extends AbstractZoneCommand {
@SuppressWarnings("MethodOverridesInaccessibleMethodOfSuper")
private void validate() {
if (zoneName.equals(DEFAULT_ZONE_NAME)) {
-throw new DistributionZoneCantBeDroppedValidationException(
"Default distribution zone can't be dropped");
+throw new
DistributionZoneCantBeDroppedValidationException("Default distribution zone
can't be dropped");
}
}
(ignite-3) branch ignite-20098 updated (93bae8cf55 -> 03901662af)
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a change to branch ignite-20098 in repository https://gitbox.apache.org/repos/asf/ignite-3.git from 93bae8cf55 Drop dead code. Move distribution zone exception from code module. Minor fixes. add 03901662af Add test. No new revisions were added by this update. Summary of changes: .../internal/catalog/commands/DropZoneCommand.java | 2 +- .../commands/AbstractCommandValidationTest.java| 11 ++--- .../commands/DropZoneCommandValidationTest.java| 26 -- modules/platforms/cpp/ignite/common/error_codes.h | 4 .../platforms/dotnet/Apache.Ignite/ErrorCodes.g.cs | 12 -- 5 files changed, 33 insertions(+), 22 deletions(-)
(ignite-3) 01/01: Drop dead code. Move distribution zone exception from code module. Minor fixes.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-20098
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 93bae8cf55fb27d7bf698858cc5f49cca4f9ce43
Author: amashenkov
AuthorDate: Tue Jan 16 14:56:03 2024 +0300
Drop dead code.
Move distribution zone exception from code module.
Minor fixes.
---
.../java/org/apache/ignite/lang/ErrorGroups.java | 12
.../catalog/CatalogParamsValidationUtils.java | 4 --
.../catalog/CatalogValidationException.java| 15 +++--
...utionZoneCantBeDroppedValidationException.java} | 13 +++--
.../DistributionZoneExistsValidationException.java | 2 +
...istributionZoneNotFoundValidationException.java | 2 +
.../catalog/IndexExistsValidationException.java| 2 +
.../catalog/TableExistsValidationException.java| 2 +
.../catalog/TableNotFoundValidationException.java | 2 +
.../internal/catalog/commands/DropZoneCommand.java | 9 +--
.../catalog/commands/RenameZoneCommand.java| 3 +-
.../DistributionZoneAlreadyExistsException.java| 61 -
.../DistributionZoneBindTableException.java| 64 --
.../distributionzones/DistributionZoneManager.java | 1 +
.../CausalityDataNodesEngine.java | 2 +-
.../DistributionZoneNotFoundException.java | 12 +---
.../DistributionZoneWasRemovedException.java | 49 -
.../DistributionZoneCausalityDataNodesTest.java| 2 +-
18 files changed, 35 insertions(+), 222 deletions(-)
diff --git a/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
b/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
index a9a1e36e4a..9e60780bda 100755
--- a/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
+++ b/modules/api/src/main/java/org/apache/ignite/lang/ErrorGroups.java
@@ -419,20 +419,8 @@ public class ErrorGroups {
/** Distribution zones group. */
public static final ErrorGroup DISTRIBUTION_ZONES_ERR_GROUP =
registerGroup("DISTRZONES", (short) 10);
-/** Distribution zone already exists. */
-public static final int ZONE_ALREADY_EXISTS_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 1);
-
/** Distribution zone is not found. */
public static final int ZONE_NOT_FOUND_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 2);
-
-/** Distribution zone rename error. */
-public static final int ZONE_RENAME_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 3);
-
-/** Distribution zone is a default distribution zone or bound to
table. */
-public static final int ZONE_DROP_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 4);
-
-/** Distribution zone definition error. */
-public static final int ZONE_DEFINITION_ERR =
DISTRIBUTION_ZONES_ERR_GROUP.registerErrorCode((short) 5);
}
/** Network error group. */
diff --git
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
index ded3b33bf6..4887ea3d5d 100644
---
a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
+++
b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.catalog;
import static org.apache.ignite.internal.lang.IgniteStringFormatter.format;
-import static org.apache.ignite.lang.ErrorGroups.Catalog.VALIDATION_ERR;
import com.jayway.jsonpath.InvalidPathException;
import com.jayway.jsonpath.JsonPath;
@@ -54,7 +53,6 @@ public class CatalogParamsValidationUtils {
if (value < min || (max != null && value > max)) {
throw new CatalogValidationException(
-VALIDATION_ERR,
"{}: [value={}, min={}" + (max == null ? ']' : ",
max={}]"),
errorPrefix, value, min, max
);
@@ -71,7 +69,6 @@ public class CatalogParamsValidationUtils {
) {
if (autoAdjust != null && (scaleUp != null || scaleDown != null)) {
throw new CatalogValidationException(
-VALIDATION_ERR,
"Not compatible parameters [dataNodesAutoAdjust={},
dataNodesAutoAdjustScaleUp={}, dataNodesAutoAdjustScaleDown={}]",
autoAdjust, scaleUp, scaleDown
);
@@ -92,7 +89,6 @@ public class CatalogParamsValidationUtils {
String error = e.getMessage() == null ? "Unknown JsonPath
compilation error." : e.getMessage();
throw new CatalogValidationException(
-VALIDATION_ERR,
"Invalid filter: [value={}, error={}]",
e,
filter, error
diff --git
a/modules/c
(ignite-3) branch ignite-20098 created (now 93bae8cf55)
This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a change to branch ignite-20098 in repository https://gitbox.apache.org/repos/asf/ignite-3.git at 93bae8cf55 Drop dead code. Move distribution zone exception from code module. Minor fixes. This branch includes the following new commits: new 93bae8cf55 Drop dead code. Move distribution zone exception from code module. Minor fixes. The 1 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.
(ignite-3) branch main updated: IGNITE-21234 Introduce a more flexible way of triggering "too many dirty pages" checkpoints (#3033)
This is an automated email from the ASF dual-hosted git repository.
ibessonov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new ca21384f85 IGNITE-21234 Introduce a more flexible way of triggering
"too many dirty pages" checkpoints (#3033)
ca21384f85 is described below
commit ca21384f85e8c779258cb3b21f54b6c30a7071e4
Author: Ivan Bessonov
AuthorDate: Tue Jan 16 14:26:30 2024 +0300
IGNITE-21234 Introduce a more flexible way of triggering "too many dirty
pages" checkpoints (#3033)
---
.../pagememory/persistence/CheckpointUrgency.java | 41 +++
.../persistence/PersistentPageMemory.java | 47 ++
.../persistence/checkpoint/CheckpointManager.java | 27 +
.../checkpoint/CheckpointTimeoutLock.java | 28 -
.../PersistentPageMemoryNoLoadTest.java| 32 ++-
.../checkpoint/CheckpointManagerTest.java | 44 ++--
.../checkpoint/CheckpointTimeoutLockTest.java | 33 ---
.../checkpoint/CheckpointTestUtils.java| 3 +-
8 files changed, 175 insertions(+), 80 deletions(-)
diff --git
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/CheckpointUrgency.java
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/CheckpointUrgency.java
new file mode 100644
index 00..913f513a0d
--- /dev/null
+++
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/CheckpointUrgency.java
@@ -0,0 +1,41 @@
+/*
+ * 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.pagememory.persistence;
+
+/**
+ * Checkpoint urgency status enum.
+ */
+public enum CheckpointUrgency {
+/**
+ * Signifies that there's enough free space in page memory to allow taking
checkpoint read locks, and there's no need to trigger
+ * checkpoint.
+ */
+NOT_REQUIRED,
+
+/**
+ * Signifies that there's still enough free space in page memory to allow
taking checkpoint read locks, but it's more limited and we're
+ * at the point where we should schedule a checkpoint.
+ */
+SHOULD_TRIGGER,
+
+/**
+ * Signifies that there might not be enough free space in page memory to
allow taking checkpoint read locks, and we should wait until
+ * scheduled checkpoint is started and collection of dirty pages is empty
once again.
+ */
+MUST_TRIGGER
+}
diff --git
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/PersistentPageMemory.java
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/PersistentPageMemory.java
index 6543970f40..0a17bf563b 100644
---
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/PersistentPageMemory.java
+++
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/PersistentPageMemory.java
@@ -27,6 +27,9 @@ import static
org.apache.ignite.internal.pagememory.io.PageIo.getPageId;
import static org.apache.ignite.internal.pagememory.io.PageIo.getType;
import static org.apache.ignite.internal.pagememory.io.PageIo.getVersion;
import static org.apache.ignite.internal.pagememory.io.PageIo.setPageId;
+import static
org.apache.ignite.internal.pagememory.persistence.CheckpointUrgency.MUST_TRIGGER;
+import static
org.apache.ignite.internal.pagememory.persistence.CheckpointUrgency.NOT_REQUIRED;
+import static
org.apache.ignite.internal.pagememory.persistence.CheckpointUrgency.SHOULD_TRIGGER;
import static
org.apache.ignite.internal.pagememory.persistence.PageHeader.dirty;
import static
org.apache.ignite.internal.pagememory.persistence.PageHeader.fullPageId;
import static
org.apache.ignite.internal.pagememory.persistence.PageHeader.isAcquired;
@@ -71,6 +74,7 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.Atomic
(ignite-3) branch main updated: IGNITE-21166 Sql. Provide internal API to get a columns metadata for non-executed query (#3037)
This is an automated email from the ASF dual-hosted git repository.
ppa pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new a9d4ae29e6 IGNITE-21166 Sql. Provide internal API to get a columns
metadata for non-executed query (#3037)
a9d4ae29e6 is described below
commit a9d4ae29e64c1282a5af7afc04c1f3d3325d4989
Author: Pavel Pereslegin
AuthorDate: Tue Jan 16 13:30:35 2024 +0300
IGNITE-21166 Sql. Provide internal API to get a columns metadata for
non-executed query (#3037)
---
.../sql/ClientSqlParameterMetadataRequest.java | 4 +-
.../client/fakes/FakeIgniteQueryProcessor.java | 4 +-
.../sql/engine/ItDynamicParameterTest.java | 23 +
.../ignite/internal/sql/engine/QueryProcessor.java | 9 ++--
.../internal/sql/engine/SqlQueryProcessor.java | 12 ++---
.../internal/sql/engine/prepare/QueryMetadata.java | 53
.../internal/sql/engine/util/QueryCheckerTest.java | 56 ++
.../internal/sql/engine/util/QueryCheckerImpl.java | 42 +++-
8 files changed, 156 insertions(+), 47 deletions(-)
diff --git
a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlParameterMetadataRequest.java
b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlParameterMetadataRequest.java
index d4eef1a73f..4eb61cfeca 100644
---
a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlParameterMetadataRequest.java
+++
b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlParameterMetadataRequest.java
@@ -25,7 +25,7 @@ import
org.apache.ignite.internal.client.proto.ClientMessagePacker;
import org.apache.ignite.internal.client.proto.ClientMessageUnpacker;
import org.apache.ignite.internal.sql.engine.QueryProcessor;
import org.apache.ignite.internal.sql.engine.QueryProperty;
-import org.apache.ignite.internal.sql.engine.prepare.ParameterMetadata;
+import org.apache.ignite.internal.sql.engine.prepare.QueryMetadata;
import org.apache.ignite.internal.sql.engine.property.SqlProperties;
import org.apache.ignite.internal.sql.engine.property.SqlPropertiesHelper;
@@ -57,7 +57,7 @@ public class ClientSqlParameterMetadataRequest {
return processor.prepareSingleAsync(properties, tx,
query).thenAccept(meta -> writeMeta(out, meta));
}
-private static void writeMeta(ClientMessagePacker out, ParameterMetadata
meta) {
+private static void writeMeta(ClientMessagePacker out, QueryMetadata meta)
{
var types = meta.parameterTypes();
out.packInt(types.size());
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteQueryProcessor.java
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteQueryProcessor.java
index 528ddabd3e..fbdfc5ffb2 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteQueryProcessor.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteQueryProcessor.java
@@ -23,7 +23,7 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.internal.sql.engine.AsyncSqlCursor;
import org.apache.ignite.internal.sql.engine.InternalSqlRow;
import org.apache.ignite.internal.sql.engine.QueryProcessor;
-import org.apache.ignite.internal.sql.engine.prepare.ParameterMetadata;
+import org.apache.ignite.internal.sql.engine.prepare.QueryMetadata;
import org.apache.ignite.internal.sql.engine.property.SqlProperties;
import org.apache.ignite.internal.tx.InternalTransaction;
import org.apache.ignite.tx.IgniteTransactions;
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.Nullable;
*/
public class FakeIgniteQueryProcessor implements QueryProcessor {
@Override
-public CompletableFuture
prepareSingleAsync(SqlProperties properties,
+public CompletableFuture prepareSingleAsync(SqlProperties
properties,
@Nullable InternalTransaction transaction, String qry, Object...
params) {
throw new UnsupportedOperationException();
}
diff --git
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDynamicParameterTest.java
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDynamicParameterTest.java
index 22ebd676f5..ffc6803f57 100644
---
a/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDynamicParameterTest.java
+++
b/modules/sql-engine/src/integrationTest/java/org/apache/ignite/internal/sql/engine/ItDynamicParameterTest.java
@@ -33,7 +33,6 @@ import java.util.stream.Stream;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.sql.type.SqlTypeName;
import org.apache.ignite.internal.sql.BaseSqlIntegrationTest;
-import org.apache.ignite.internal.sql.engine.prepare.Paramet
