This is an automated email from the ASF dual-hosted git repository.
apolovtsev 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 aa2530150f3 IGNITE-25698 Minor improvements (#6067)
aa2530150f3 is described below
commit aa2530150f32bd2a47ed9c799ce57e4a018702ce
Author: Alexander Polovtcev <[email protected]>
AuthorDate: Wed Jun 18 09:34:26 2025 +0300
IGNITE-25698 Minor improvements (#6067)
* Remove `DistributionZonesUtil.findTablesByZoneId`
* Improve `StoragePartitionMeta` javadoc
---
.../internal/distributionzones/DistributionZonesUtil.java | 15 ---------------
.../rebalance/DistributionZoneRebalanceEngine.java | 13 ++++---------
.../internal/storage/pagememory/StoragePartitionMeta.java | 5 ++++-
.../storage/pagememory/StoragePartitionMetaIo.java | 6 +++---
.../distributed/disaster/DisasterRecoveryManager.java | 4 +---
5 files changed, 12 insertions(+), 31 deletions(-)
diff --git
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZonesUtil.java
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZonesUtil.java
index 9e3e58f3e61..541cdc3c7c4 100644
---
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZonesUtil.java
+++
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZonesUtil.java
@@ -43,10 +43,8 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ThreadPoolExecutor;
-import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.catalog.commands.StorageProfileParams;
import
org.apache.ignite.internal.catalog.descriptors.CatalogStorageProfileDescriptor;
-import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor;
import
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologySnapshot;
import
org.apache.ignite.internal.distributionzones.DataNodesHistory.DataNodesHistorySerializer;
@@ -550,19 +548,6 @@ public class DistributionZonesUtil {
);
}
- /**
- * Returns list of table descriptors bound to the zone.
- *
- * @param zoneId Zone id.
- * @param catalog Catalog.
- * @return List of table descriptors from the zone.
- */
- public static List<CatalogTableDescriptor> findTablesByZoneId(int zoneId,
Catalog catalog) {
- return catalog.tables().stream()
- .filter(table -> table.zoneId() == zoneId)
- .collect(toList());
- }
-
public static Set<String> nodeNames(Set<NodeWithAttributes> nodes) {
return
nodes.stream().map(NodeWithAttributes::nodeName).collect(toSet());
}
diff --git
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngine.java
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngine.java
index 0b35c3c282b..fce6f6cb4b3 100644
---
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngine.java
+++
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/rebalance/DistributionZoneRebalanceEngine.java
@@ -23,7 +23,6 @@ import static java.util.stream.Collectors.toSet;
import static
org.apache.ignite.internal.catalog.events.CatalogEvent.ZONE_ALTER;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesUtil.DISTRIBUTION_ZONE_DATA_NODES_HISTORY_PREFIX_BYTES;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesUtil.filterDataNodes;
-import static
org.apache.ignite.internal.distributionzones.DistributionZonesUtil.findTablesByZoneId;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesUtil.nodeNames;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesUtil.parseDataNodes;
import static
org.apache.ignite.internal.distributionzones.DistributionZonesUtil.zoneDataNodesHistoryPrefix;
@@ -32,6 +31,7 @@ import static
org.apache.ignite.internal.lang.IgniteSystemProperties.getBoolean;
import static
org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -271,14 +271,12 @@ public class DistributionZoneRebalanceEngine {
return nullCompletedFuture();
}
- List<CatalogTableDescriptor> tableDescriptors =
findTablesByZoneId(zoneId, catalog);
-
return triggerPartitionsRebalanceForAllTables(
evt.entryEvent().newEntry().revision(),
evt.entryEvent().newEntry().timestamp(),
zoneDescriptor,
filteredDataNodes,
- tableDescriptors,
+ catalog.tables(zoneId),
assignmentsTimestamp
);
});
@@ -308,7 +306,6 @@ public class DistributionZoneRebalanceEngine {
HybridTimestamp timestamp,
int catalogVersion
) {
-
return distributionZoneManager.dataNodes(timestamp, catalogVersion,
zoneDescriptor.id())
.thenCompose(dataNodes -> {
if (dataNodes.isEmpty()) {
@@ -317,14 +314,12 @@ public class DistributionZoneRebalanceEngine {
Catalog catalog = catalogService.catalog(catalogVersion);
- List<CatalogTableDescriptor> tableDescriptors =
findTablesByZoneId(zoneDescriptor.id(), catalog);
-
return triggerPartitionsRebalanceForAllTables(
causalityToken,
timestamp,
zoneDescriptor,
dataNodes,
- tableDescriptors,
+ catalog.tables(zoneDescriptor.id()),
catalog.time()
);
});
@@ -335,7 +330,7 @@ public class DistributionZoneRebalanceEngine {
HybridTimestamp timestamp,
CatalogZoneDescriptor zoneDescriptor,
Set<String> dataNodes,
- List<CatalogTableDescriptor> tableDescriptors,
+ Collection<CatalogTableDescriptor> tableDescriptors,
long assignmentsTimestamp
) {
List<CompletableFuture<?>> tableFutures = new
ArrayList<>(tableDescriptors.size());
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/StoragePartitionMeta.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/StoragePartitionMeta.java
index 8c50b586b43..4499c64efb8 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/StoragePartitionMeta.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/StoragePartitionMeta.java
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
import org.apache.ignite.internal.pagememory.persistence.PartitionMeta;
import org.apache.ignite.internal.pagememory.persistence.PartitionMetaFactory;
import org.apache.ignite.internal.pagememory.persistence.io.PartitionMetaIo;
+import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.tostring.S;
import org.jetbrains.annotations.Nullable;
@@ -72,7 +73,9 @@ public class StoragePartitionMeta extends PartitionMeta {
* @param versionChainTreeRootPageId Version chain tree root page ID.
* @param indexTreeMetaPageId Index tree meta page ID.
* @param gcQueueMetaPageId Garbage collection queue meta page ID.
- * @param estimatedSize Estimated size of the partition.
+ * @param estimatedSize Estimated number of latest entries in the
partition.
+ *
+ * @see MvPartitionStorage#estimatedSize for a detailed description of
what estimated size is.
*/
public StoragePartitionMeta(
int pageCount,
diff --git
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/StoragePartitionMetaIo.java
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/StoragePartitionMetaIo.java
index b5b8756ab20..89f80b62348 100644
---
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/StoragePartitionMetaIo.java
+++
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/StoragePartitionMetaIo.java
@@ -320,10 +320,10 @@ public class StoragePartitionMetaIo extends
PartitionMetaIo {
}
/**
- * Sets the estimated size of this partition.
+ * Sets the estimated number of latest entries in the partition.
*
* @param pageAddr Page address.
- * @param estimatedSize Estimated size.
+ * @param estimatedSize Estimated number of latest entries in the
partition.
*/
public void setEstimatedSize(long pageAddr, long estimatedSize) {
assertPageType(pageAddr);
@@ -332,7 +332,7 @@ public class StoragePartitionMetaIo extends PartitionMetaIo
{
}
/**
- * Returns the estimated size of this partition.
+ * Returns the estimated number of latest entries in the partition.
*
* @param pageAddr Page address.
*/
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/DisasterRecoveryManager.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/DisasterRecoveryManager.java
index ceb50bf0f5e..0cf54a564ba 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/DisasterRecoveryManager.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/disaster/DisasterRecoveryManager.java
@@ -26,7 +26,6 @@ import static java.util.stream.Collectors.toMap;
import static java.util.stream.Collectors.toSet;
import static
org.apache.ignite.internal.catalog.events.CatalogEvent.TABLE_CREATE;
import static
org.apache.ignite.internal.catalog.events.CatalogEvent.TABLE_DROP;
-import static
org.apache.ignite.internal.distributionzones.DistributionZonesUtil.findTablesByZoneId;
import static org.apache.ignite.internal.event.EventListener.fromConsumer;
import static org.apache.ignite.internal.metastorage.dsl.Conditions.notExists;
import static org.apache.ignite.internal.metastorage.dsl.Conditions.value;
@@ -313,9 +312,8 @@ public class DisasterRecoveryManager implements
IgniteComponent, SystemViewProvi
Catalog catalog = catalogManager.activeCatalog(timestamp);
CatalogZoneDescriptor zoneDescriptor = catalog.zone(zoneId);
- List<CatalogTableDescriptor> tables = findTablesByZoneId(zoneId,
catalog);
Map<Integer, Set<Integer>> tablePartitionsToReset = new HashMap<>();
- for (CatalogTableDescriptor table : tables) {
+ for (CatalogTableDescriptor table : catalog.tables(zoneId)) {
Set<Integer> partitionsToReset = new HashSet<>();
for (int partId = 0; partId < zoneDescriptor.partitions();
partId++) {
TablePartitionId partitionId = new
TablePartitionId(table.id(), partId);
