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/01/26 11:23:04 UTC
[ignite-3] branch ignite-18426 updated: Fix zoneId type.
This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-18426
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-18426 by this push:
new 7c00ed40e1 Fix zoneId type.
7c00ed40e1 is described below
commit 7c00ed40e1365a06294204324fe194e65a683f6b
Author: amashenkov <an...@gmail.com>
AuthorDate: Thu Jan 26 14:22:57 2023 +0300
Fix zoneId type.
---
.../apache/ignite/internal/sql/engine/externalize/RelJson.java | 3 ++-
.../ignite/internal/sql/engine/trait/DistributionFunction.java | 8 ++++----
.../ignite/internal/sql/engine/trait/IgniteDistributions.java | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelJson.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelJson.java
index 92a54957a3..07433d3f62 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelJson.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelJson.java
@@ -36,6 +36,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.function.Function;
@@ -670,7 +671,7 @@ class RelJson {
if (tableIdStr != null) {
UUID tableId = UUID.fromString(tableIdStr);
- Object zoneId = map.get("zoneId");
+ int zoneId = (Integer) map.get("zoneId");
return IgniteDistributions.affinity((List<Integer>) map.get("keys"), tableId, zoneId);
}
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionFunction.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionFunction.java
index d9ebc797fb..83b15a2c86 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionFunction.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionFunction.java
@@ -61,7 +61,7 @@ public abstract class DistributionFunction {
return false;
}
- public static DistributionFunction affinity(UUID tableId, Object zoneId) {
+ public static DistributionFunction affinity(UUID tableId, int zoneId) {
return new AffinityDistribution(tableId, zoneId);
}
@@ -245,7 +245,7 @@ public abstract class DistributionFunction {
public static final class AffinityDistribution extends HashDistribution {
private final UUID tableId;
- private final Object zoneId;
+ private final int zoneId;
/**
* Constructor.
@@ -253,7 +253,7 @@ public abstract class DistributionFunction {
* @param tableId Table ID.
* @param zoneId Distribution zone ID.
*/
- private AffinityDistribution(UUID tableId, Object zoneId) {
+ private AffinityDistribution(UUID tableId, int zoneId) {
this.zoneId = zoneId;
this.tableId = tableId;
}
@@ -268,7 +268,7 @@ public abstract class DistributionFunction {
return tableId;
}
- public Object zoneId() {
+ public int zoneId() {
return zoneId;
}
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/IgniteDistributions.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/IgniteDistributions.java
index 11e865f67c..b354153ae7 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/IgniteDistributions.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/IgniteDistributions.java
@@ -72,7 +72,7 @@ public class IgniteDistributions {
* @param zoneId Distribution zone ID.
* @return Affinity distribution.
*/
- public static IgniteDistribution affinity(int key, UUID tableId, Object zoneId) {
+ public static IgniteDistribution affinity(int key, UUID tableId, int zoneId) {
return hash(ImmutableIntList.of(key), DistributionFunction.affinity(tableId, zoneId));
}
@@ -85,7 +85,7 @@ public class IgniteDistributions {
* @param zoneId Distribution zone ID.
* @return Affinity distribution.
*/
- public static IgniteDistribution affinity(List<Integer> keys, UUID tableId, Object zoneId) {
+ public static IgniteDistribution affinity(List<Integer> keys, UUID tableId, int zoneId) {
return hash(keys, DistributionFunction.affinity(tableId, zoneId));
}