This is an automated email from the ASF dual-hosted git repository. zstan pushed a commit to branch ignite-26069 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 9b768534c9a71770fb024b680634e008aa700b54 Author: zstan <[email protected]> AuthorDate: Sun Oct 5 18:01:14 2025 +0300 fix --- .../replicator/network/PartitionReplicationMessageGroup.java | 4 ++-- .../GetEstimatedSizeWithLastModifiedTsRequest.java | 2 +- .../GetEstimatedSizeWithLastModifiedTsResponse.java | 4 +++- .../internal/sql/engine/statistic/StatisticAggregator.java | 12 ++---------- .../table/distributed/PartitionModificationCounter.java | 5 +---- .../ignite/internal/table/distributed/TableManager.java | 2 ++ 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/PartitionReplicationMessageGroup.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/PartitionReplicationMessageGroup.java index 529df3f7c32..1eac459b0ec 100644 --- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/PartitionReplicationMessageGroup.java +++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/PartitionReplicationMessageGroup.java @@ -53,8 +53,8 @@ import org.apache.ignite.internal.partition.replicator.network.replication.Binar import org.apache.ignite.internal.partition.replicator.network.replication.BuildIndexReplicaRequest; import org.apache.ignite.internal.partition.replicator.network.replication.ChangePeersAndLearnersAsyncReplicaRequest; import org.apache.ignite.internal.partition.replicator.network.replication.GetEstimatedSizeRequest; -import org.apache.ignite.internal.partition.replicator.network.replication.GetEstimatedSizeWithLastModifiedTsRequest; -import org.apache.ignite.internal.partition.replicator.network.replication.GetEstimatedSizeWithLastModifiedTsResponse; +import org.apache.ignite.internal.partition.replicator.network.message.GetEstimatedSizeWithLastModifiedTsRequest; +import org.apache.ignite.internal.partition.replicator.network.message.GetEstimatedSizeWithLastModifiedTsResponse; import org.apache.ignite.internal.partition.replicator.network.replication.ReadOnlyDirectMultiRowReplicaRequest; import org.apache.ignite.internal.partition.replicator.network.replication.ReadOnlyDirectSingleRowReplicaRequest; import org.apache.ignite.internal.partition.replicator.network.replication.ReadOnlyMultiRowPkReplicaRequest; diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/replication/GetEstimatedSizeWithLastModifiedTsRequest.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/message/GetEstimatedSizeWithLastModifiedTsRequest.java similarity index 99% rename from modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/replication/GetEstimatedSizeWithLastModifiedTsRequest.java rename to modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/message/GetEstimatedSizeWithLastModifiedTsRequest.java index a7f0602f95d..3546beadad5 100644 --- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/replication/GetEstimatedSizeWithLastModifiedTsRequest.java +++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/message/GetEstimatedSizeWithLastModifiedTsRequest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.partition.replicator.network.replication; +package org.apache.ignite.internal.partition.replicator.network.message; import org.apache.ignite.internal.network.NetworkMessage; import org.apache.ignite.internal.network.annotations.Transferable; diff --git a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/replication/GetEstimatedSizeWithLastModifiedTsResponse.java b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/message/GetEstimatedSizeWithLastModifiedTsResponse.java similarity index 97% rename from modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/replication/GetEstimatedSizeWithLastModifiedTsResponse.java rename to modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/message/GetEstimatedSizeWithLastModifiedTsResponse.java index 06bce1cc2a1..b6aac4f6384 100644 --- a/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/replication/GetEstimatedSizeWithLastModifiedTsResponse.java +++ b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/network/message/GetEstimatedSizeWithLastModifiedTsResponse.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.partition.replicator.network.replication; +package org.apache.ignite.internal.partition.replicator.network.message; import org.apache.ignite.internal.hlc.HybridTimestamp; import org.apache.ignite.internal.network.NetworkMessage; @@ -27,4 +27,6 @@ public interface GetEstimatedSizeWithLastModifiedTsResponse extends NetworkMessa HybridTimestamp ts(); long estimatedSize(); + + int partitionId(); } diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/statistic/StatisticAggregator.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/statistic/StatisticAggregator.java index f20dc4c9d6e..6f366d2d6c2 100644 --- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/statistic/StatisticAggregator.java +++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/statistic/StatisticAggregator.java @@ -1,12 +1,9 @@ package org.apache.ignite.internal.sql.engine.statistic; import static java.util.concurrent.CompletableFuture.allOf; -import static java.util.stream.Collectors.toList; import it.unimi.dsi.fastutil.longs.LongObjectImmutablePair; -import java.util.Arrays; import java.util.HashSet; -import java.util.List; import java.util.Objects; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -15,16 +12,11 @@ import java.util.function.Supplier; import org.apache.ignite.internal.hlc.HybridTimestamp; import org.apache.ignite.internal.logger.IgniteLogger; import org.apache.ignite.internal.logger.Loggers; -import org.apache.ignite.internal.network.InternalClusterNode; import org.apache.ignite.internal.network.MessagingService; -import org.apache.ignite.internal.network.NetworkMessage; import org.apache.ignite.internal.network.TopologyService; -import org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessageGroup; import org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessagesFactory; -import org.apache.ignite.internal.partition.replicator.network.message.DataPresence; -import org.apache.ignite.internal.partition.replicator.network.message.HasDataResponse; -import org.apache.ignite.internal.partition.replicator.network.replication.GetEstimatedSizeWithLastModifiedTsRequest; -import org.apache.ignite.internal.partition.replicator.network.replication.GetEstimatedSizeWithLastModifiedTsResponse; +import org.apache.ignite.internal.partition.replicator.network.message.GetEstimatedSizeWithLastModifiedTsRequest; +import org.apache.ignite.internal.partition.replicator.network.message.GetEstimatedSizeWithLastModifiedTsResponse; import org.apache.ignite.internal.placementdriver.PlacementDriver; import org.apache.ignite.internal.placementdriver.ReplicaMeta; import org.apache.ignite.internal.sql.engine.message.SqlQueryMessagesFactory; diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounter.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounter.java index 9c6cd8994d1..9c6c1743369 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounter.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/PartitionModificationCounter.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.table.distributed; import java.util.Objects; -import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicLong; import java.util.function.LongSupplier; import org.apache.ignite.internal.hlc.HybridTimestamp; @@ -27,7 +26,7 @@ import org.apache.ignite.internal.network.MessagingService; import org.apache.ignite.internal.network.NetworkMessage; import org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessageGroup; import org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessagesFactory; -import org.apache.ignite.internal.partition.replicator.network.replication.GetEstimatedSizeWithLastModifiedTsRequest; +import org.apache.ignite.internal.partition.replicator.network.message.GetEstimatedSizeWithLastModifiedTsRequest; import org.jetbrains.annotations.Nullable; /** @@ -106,8 +105,6 @@ public class PartitionModificationCounter { long estSize = estimateSize.getAsLong(); if (tableId == message.tableId() && estSize != -1) { - System.err.println("!!!!! send size: " + estSize); - messagingService.respond( sender, PARTITION_REPLICATION_MESSAGES_FACTORY diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java index 9887115d124..d812c6e9383 100644 --- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java +++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java @@ -95,6 +95,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiFunction; +import java.util.function.BooleanSupplier; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.LongSupplier; @@ -3179,6 +3180,7 @@ public class TableManager implements IgniteTablesInternal, IgniteComponent { GcUpdateHandler gcUpdateHandler = new GcUpdateHandler(partitionDataStorage, safeTimeTracker, indexUpdateHandler); LongSupplier partSizeSupplier = () -> partitionDataStorage.getStorage().estimatedSize(); + PartitionModificationCounter modificationCounter = partitionModificationCounterFactory .create(table.tableId(), partitionId, partSizeSupplier, messagingService, estimateSize); registerPartitionModificationCounterMetrics(table.tableId(), partitionId, modificationCounter);
