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 d4b2489d252 IGNITE-27979 Enable PMD.UnusedPrivateMethod rule (#7668)
d4b2489d252 is described below
commit d4b2489d252e9a7e8faf0dd2c6af73a4d0cf3b92
Author: Viacheslav Blinov <[email protected]>
AuthorDate: Fri Feb 27 12:03:18 2026 +0300
IGNITE-27979 Enable PMD.UnusedPrivateMethod rule (#7668)
---
check-rules/pmd-rules.xml | 15 ++++++------
.../persistence/mappers/CacheDataRowProcessor.java | 21 -----------------
.../tests/e2e/impl/VeryBasicAbstractCacheTest.java | 7 ------
.../internal/binarytuple/BinaryTupleBuilder.java | 14 -----------
.../ignite/internal/catalog/sql/QueryContext.java | 1 +
.../commands/CreateZoneCommandValidationTest.java | 7 ------
.../internal/cli/util/TableTruncatorTest.java | 3 ---
.../org/apache/ignite/client/ClientArchTest.java | 6 -----
.../deployunit/loader/UnitsContextManagerTest.java | 14 -----------
.../configuration/RenamedConfigurationTest.java | 8 -------
.../internal/tostring/IgniteToStringBuilder.java | 1 +
.../rebalance/ItRebalanceDistributedTest.java | 1 -
.../distributionzones/DistributionZoneManager.java | 19 ---------------
.../IndexAvailabilityControllerRestorerTest.java | 8 -------
.../metastorage/timebag/IgniteStopwatch.java | 17 --------------
.../metastorage/impl/MetaStorageManagerImpl.java | 16 -------------
.../AbstractCompactionKeyValueStorageTest.java | 12 ----------
.../ignite/internal/network/UosProfilerTarget.java | 1 +
...edBasedMemoryConsumptionThrottlingStrategy.java | 1 +
.../partition/replicator/fixtures/Node.java | 1 -
.../internal/raft/client/RaftCommandExecutor.java | 15 ------------
.../runner/app/ItIgniteNodeRestartTest.java | 1 -
.../org/apache/ignite/internal/app/IgniteImpl.java | 1 -
.../internal/schema/PartialBinaryTupleMatcher.java | 24 -------------------
.../ignite/internal/schema/SchemaManagerTest.java | 4 ----
.../engine/exec/mapping/MappingServiceImpl.java | 1 +
.../sql/engine/metadata/IgniteMdSelectivity.java | 27 ----------------------
.../sql/engine/exec/rel/AbstractExecutionTest.java | 4 ----
.../exec/rel/TableScanNodeExecutionTest.java | 2 --
.../sql/engine/exec/row/SqlRowHandlerTest.java | 12 ----------
.../sql/engine/planner/AggregatePlannerTest.java | 20 ----------------
.../planner/ColocatedSortAggregatePlannerTest.java | 11 ---------
.../planner/PrimaryKeyDeletePlannerTest.java | 8 -------
.../engine/prepare/LeastRestrictiveTypesTest.java | 4 ----
.../ignite/internal/table/ItColocationTest.java | 2 --
.../internal/table/distributed/TableManager.java | 8 -------
.../distributed/raft/TablePartitionProcessor.java | 13 -----------
.../distributed/storage/InternalTableImpl.java | 16 -------------
.../distributed/TableManagerRecoveryTest.java | 1 -
.../table/distributed/TableManagerTest.java | 1 -
.../storage/InternalTableEstimatedSizeTest.java | 2 --
.../distributed/storage/InternalTableImplTest.java | 2 --
.../apache/ignite/distributed/ItTxTestCluster.java | 2 --
.../table/impl/DummyInternalTableImpl.java | 2 --
44 files changed, 12 insertions(+), 344 deletions(-)
diff --git a/check-rules/pmd-rules.xml b/check-rules/pmd-rules.xml
index 889c0c50c11..998e0109f1c 100644
--- a/check-rules/pmd-rules.xml
+++ b/check-rules/pmd-rules.xml
@@ -116,14 +116,13 @@
<rule ref="category/java/multithreading.xml/UseNotifyAllInsteadOfNotify" />
- <!--
- TODO: https://issues.apache.org/jira/browse/IGNITE-26174
- UnusedPrivateMethod has a known bug which leads to false positive
triggering if
- method signature contains generic parameter and\or descendant class is
passed as parameter.
- See for details: https://github.com/pmd/pmd/issues/770
- This was fixed in PMD 7.0.0 so should be returned when we upgrade the
PMD
- -->
- <!-- <rule ref="category/java/bestpractices.xml/UnusedPrivateMethod"
/>-->
+ <rule ref="category/java/bestpractices.xml/UnusedPrivateMethod">
+ <properties>
+ <!-- Exclude methods called by frameworks via annotations (e.g.
picocli @Option, @Parameters). -->
+ <property name="violationSuppressXPath"
+
value=".[pmd-java:hasAnnotation('picocli.CommandLine.Option') or
pmd-java:hasAnnotation('picocli.CommandLine.Parameters')]" />
+ </properties>
+ </rule>
<rule name="Prohibited classes"
language="java"
diff --git
a/migration-tools/modules/migration-tools-persistence/src/main/java/org/apache/ignite/migrationtools/persistence/mappers/CacheDataRowProcessor.java
b/migration-tools/modules/migration-tools-persistence/src/main/java/org/apache/ignite/migrationtools/persistence/mappers/CacheDataRowProcessor.java
index d22b46d2ab1..bef7c3c2cb5 100644
---
a/migration-tools/modules/migration-tools-persistence/src/main/java/org/apache/ignite/migrationtools/persistence/mappers/CacheDataRowProcessor.java
+++
b/migration-tools/modules/migration-tools-persistence/src/main/java/org/apache/ignite/migrationtools/persistence/mappers/CacheDataRowProcessor.java
@@ -17,14 +17,11 @@
package org.apache.ignite.migrationtools.persistence.mappers;
-import java.util.HashMap;
import java.util.Map;
-import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.internal.binary.BinaryObjectImpl;
import org.apache.ignite.internal.processors.cache.CacheObjectContext;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
import
org.apache.ignite.migrationtools.persistence.utils.pubsub.BasicProcessor;
-import org.apache.ignite3.table.Tuple;
/** Processes {@link CacheDataRow} into Java Object entries. */
public class CacheDataRowProcessor extends BasicProcessor<CacheDataRow,
Map.Entry<Object, Object>> {
@@ -46,22 +43,4 @@ public class CacheDataRowProcessor extends
BasicProcessor<CacheDataRow, Map.Entr
// TODO: I prefer to have some typings.
subscriber.onNext(Map.entry(keyVal, valVal));
}
-
- private static Tuple parseBinaryObject(BinaryObjectImpl obj) {
- var fieldNames = obj.rawType().fieldNames();
- Map<String, Object> fields = new HashMap<>(fieldNames.size());
- for (String fieldName : fieldNames) {
- var val = obj.field(fieldName);
- if (val instanceof BinaryObject) {
- BinaryObject nested = ((BinaryObject) val);
- if (nested.type().isEnum()) {
- val = nested.enumName();
- } else {
- val = parseBinaryObject((BinaryObjectImpl) val);
- }
- }
- fields.put(fieldName, val);
- }
- return Tuple.create(fields);
- }
}
diff --git
a/migration-tools/tools/e2e-tests-framework/implementations/src/main/java/org/apache/ignite/migrationtools/tests/e2e/impl/VeryBasicAbstractCacheTest.java
b/migration-tools/tools/e2e-tests-framework/implementations/src/main/java/org/apache/ignite/migrationtools/tests/e2e/impl/VeryBasicAbstractCacheTest.java
index a1025830f55..d7da8f5d1fc 100644
---
a/migration-tools/tools/e2e-tests-framework/implementations/src/main/java/org/apache/ignite/migrationtools/tests/e2e/impl/VeryBasicAbstractCacheTest.java
+++
b/migration-tools/tools/e2e-tests-framework/implementations/src/main/java/org/apache/ignite/migrationtools/tests/e2e/impl/VeryBasicAbstractCacheTest.java
@@ -135,13 +135,6 @@ public abstract class VeryBasicAbstractCacheTest<K, V>
implements ExampleBasedCa
);
}
- // TODO: Check if this is the actual AI2 table name.
- private String getSqlTableName() {
- // Get the tableName for the SQL Query. Why uppercase??
- String tableName = (this.valueClass.isArray()) ? '"' +
this.valueClass.getName() + '"' : this.valueClass.getSimpleName();
- return "\"" + this.getTableName() + "\"." + tableName.toUpperCase();
- }
-
protected void assertValueFromIgnite2(V actualVal, V expected) {
assertThat(actualVal).usingRecursiveComparison().isEqualTo(expected);
}
diff --git
a/modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/BinaryTupleBuilder.java
b/modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/BinaryTupleBuilder.java
index cfa9eb52bf0..0dcf6c6a39b 100644
---
a/modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/BinaryTupleBuilder.java
+++
b/modules/binary-tuple/src/main/java/org/apache/ignite/internal/binarytuple/BinaryTupleBuilder.java
@@ -21,7 +21,6 @@ import java.math.BigDecimal;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.nio.charset.CharacterCodingException;
-import java.nio.charset.CharsetEncoder;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.time.Instant;
@@ -58,9 +57,6 @@ public class BinaryTupleBuilder {
/** Buffer for tuple content. */
private ByteBuffer buffer;
- /** Charset encoder for strings. Initialized lazily. */
- private CharsetEncoder cachedEncoder;
-
/**
* Creates a builder.
*
@@ -801,14 +797,4 @@ public class BinaryTupleBuilder {
buffer = newBuffer;
}
-
- /**
- * Get UTF-8 string encoder.
- */
- private CharsetEncoder encoder() {
- if (cachedEncoder == null) {
- cachedEncoder = StandardCharsets.UTF_8.newEncoder();
- }
- return cachedEncoder;
- }
}
diff --git
a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/QueryContext.java
b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/QueryContext.java
index 6cd438e4086..32210a0b0df 100644
---
a/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/QueryContext.java
+++
b/modules/catalog-dsl/src/main/java/org/apache/ignite/internal/catalog/sql/QueryContext.java
@@ -93,6 +93,7 @@ class QueryContext {
return this;
}
+ @SuppressWarnings("PMD.UnusedPrivateMethod") // Part of incomplete
indentation feature
private String indentation() {
return indent == 0 ? "" : " ".repeat(indent);
}
diff --git
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandValidationTest.java
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandValidationTest.java
index 2fcac0ef132..052a46c66a5 100644
---
a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandValidationTest.java
+++
b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CreateZoneCommandValidationTest.java
@@ -266,13 +266,6 @@ public class CreateZoneCommandValidationTest extends
AbstractCommandValidationTe
);
}
- private static CatalogCommand createZoneParams(@Nullable Integer scaleUp,
@Nullable Integer scaleDown) {
- return createZoneBuilder()
- .dataNodesAutoAdjustScaleUp(scaleUp)
- .dataNodesAutoAdjustScaleDown(scaleDown)
- .build();
- }
-
private static CreateZoneCommandBuilder createZoneBuilder() {
return CatalogTestUtils.createZoneBuilder(ZONE_NAME);
}
diff --git
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/util/TableTruncatorTest.java
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/util/TableTruncatorTest.java
index 9462dd8dc5d..0ccf0e8ac3f 100644
---
a/modules/cli/src/test/java/org/apache/ignite/internal/cli/util/TableTruncatorTest.java
+++
b/modules/cli/src/test/java/org/apache/ignite/internal/cli/util/TableTruncatorTest.java
@@ -369,7 +369,4 @@ class TableTruncatorTest {
return new Table<>(headers, content);
}
- private static TruncationConfig enabledConfig(int maxColumnWidth) {
- return new TruncationConfig(true, maxColumnWidth, 0);
- }
}
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/ClientArchTest.java
b/modules/client/src/test/java/org/apache/ignite/client/ClientArchTest.java
index 7deda280b87..3f0a6299d50 100644
--- a/modules/client/src/test/java/org/apache/ignite/client/ClientArchTest.java
+++ b/modules/client/src/test/java/org/apache/ignite/client/ClientArchTest.java
@@ -19,9 +19,7 @@ package org.apache.ignite.client;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import com.tngtech.archunit.core.domain.JavaClasses;
import com.tngtech.archunit.core.domain.JavaModifier;
-import com.tngtech.archunit.core.importer.ClassFileImporter;
import com.tngtech.archunit.core.importer.Location;
import com.tngtech.archunit.junit.AnalyzeClasses;
import com.tngtech.archunit.junit.ArchTest;
@@ -58,10 +56,6 @@ public class ClientArchTest {
.that().haveRawType(IgniteLogger.class)
.should().haveModifier(JavaModifier.STATIC);
- private static JavaClasses clientModuleClasses() {
- return new ClassFileImporter().importPath(CLASS_PATH_DIR);
- }
-
@Nullable
private static JarFile toJarFile(Path path) {
try {
diff --git
a/modules/code-deployment-classloader/src/test/java/org/apache/ignite/internal/deployunit/loader/UnitsContextManagerTest.java
b/modules/code-deployment-classloader/src/test/java/org/apache/ignite/internal/deployunit/loader/UnitsContextManagerTest.java
index ca2f41785f8..86d888654a2 100644
---
a/modules/code-deployment-classloader/src/test/java/org/apache/ignite/internal/deployunit/loader/UnitsContextManagerTest.java
+++
b/modules/code-deployment-classloader/src/test/java/org/apache/ignite/internal/deployunit/loader/UnitsContextManagerTest.java
@@ -35,8 +35,6 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
@@ -207,16 +205,4 @@ class UnitsContextManagerTest extends
BaseIgniteAbstractTest {
);
}
- private static URL[] extractUrls(List<DisposableDeploymentUnit> units) {
- return units.stream()
- .map(DisposableDeploymentUnit::path)
- .map(it -> {
- try {
- return it.toUri().toURL();
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- }
- })
- .toArray(URL[]::new);
- }
}
diff --git
a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/RenamedConfigurationTest.java
b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/RenamedConfigurationTest.java
index 6ec3abb5884..7de112bd150 100644
---
a/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/RenamedConfigurationTest.java
+++
b/modules/configuration/src/test/java/org/apache/ignite/internal/configuration/RenamedConfigurationTest.java
@@ -318,14 +318,6 @@ class RenamedConfigurationTest extends
BaseIgniteAbstractTest {
storage.close();
}
- private Data getData() {
- CompletableFuture<Data> dataFuture = storage.readDataOnRecovery();
-
- assertThat(dataFuture, willCompleteSuccessfully());
-
- return dataFuture.join();
- }
-
@ConfigurationRoot(rootName = "key", type = LOCAL)
public static class RenamedTestOldConfigurationSchema {
@ConfigValue
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/tostring/IgniteToStringBuilder.java
b/modules/core/src/main/java/org/apache/ignite/internal/tostring/IgniteToStringBuilder.java
index e86b1c95f83..1b713dbc4b9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/tostring/IgniteToStringBuilder.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/tostring/IgniteToStringBuilder.java
@@ -1735,6 +1735,7 @@ public class IgniteToStringBuilder {
* @param <T> Type of object.
* @return String presentation of the given object.
*/
+ @SuppressWarnings("PMD.UnusedPrivateMethod") // PMD false positive: method
is called, but PMD doesn't resolve generic method references
private static <T> String toStringImpl0(
Class<T> cls,
StringBuilderLimitedLength buf,
diff --git
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
index 4e8131e45aa..d4087f63c43 100644
---
a/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
+++
b/modules/distribution-zones/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceDistributedTest.java
@@ -1568,7 +1568,6 @@ public class ItRebalanceDistributedTest extends
BaseIgniteAbstractTest {
name,
registry,
gcConfig,
- txConfiguration,
replicationConfiguration,
clusterService.messagingService(),
clusterService.topologyService(),
diff --git
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
index 376b3a4be5d..029374a6589 100644
---
a/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
+++
b/modules/distribution-zones/src/main/java/org/apache/ignite/internal/distributionzones/DistributionZoneManager.java
@@ -114,7 +114,6 @@ import org.apache.ignite.internal.metastorage.dsl.Iif;
import org.apache.ignite.internal.metastorage.dsl.Operation;
import org.apache.ignite.internal.metastorage.dsl.StatementResult;
import org.apache.ignite.internal.metastorage.dsl.Update;
-import org.apache.ignite.internal.metastorage.exceptions.CompactedException;
import org.apache.ignite.internal.metrics.MetricManager;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
import org.jetbrains.annotations.Nullable;
@@ -744,24 +743,6 @@ public class DistributionZoneManager extends
}).thenCompose((ignored) -> nullCompletedFuture());
}
- /**
- * Returns metastore long view of {@link HybridTimestamp} by revision.
- *
- * @param revision Metastore revision.
- * @return Appropriate metastore timestamp or -1 if revision is already
compacted.
- */
- private long timestampByRevision(long revision) {
- try {
- return
metaStorageManager.timestampByRevisionLocally(revision).longValue();
- } catch (CompactedException e) {
- if (revision > 1) {
- LOG.warn("Unable to retrieve timestamp by revision because of
meta storage compaction, [revision={}].", revision);
- }
-
- return -1;
- }
- }
-
@TestOnly
public DataNodesManager dataNodesManager() {
return dataNodesManager;
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerRestorerTest.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerRestorerTest.java
index dba5ff4d053..7497f1f3a69 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerRestorerTest.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexAvailabilityControllerRestorerTest.java
@@ -45,7 +45,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
import java.nio.file.Path;
import java.util.concurrent.CompletableFuture;
@@ -62,8 +61,6 @@ import
org.apache.ignite.internal.metastorage.server.KeyValueStorage;
import
org.apache.ignite.internal.metastorage.server.ReadOperationForCompactionTracker;
import
org.apache.ignite.internal.metastorage.server.persistence.RocksDbKeyValueStorage;
import org.apache.ignite.internal.network.ClusterService;
-import org.apache.ignite.internal.network.InternalClusterNode;
-import org.apache.ignite.internal.network.TopologyService;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
@@ -274,9 +271,4 @@ public class IndexAvailabilityControllerRestorerTest
extends BaseIgniteAbstractT
controller.start(metastoreRecoveryFuture.join().revision());
}
- private void setLocalNodeToClusterService(InternalClusterNode clusterNode)
{
- TopologyService topologyService = mock(TopologyService.class,
invocation -> clusterNode);
-
- when(clusterService.topologyService()).thenReturn(topologyService);
- }
}
diff --git
a/modules/metastorage-api/src/main/java/org/apache/ignite/internal/metastorage/timebag/IgniteStopwatch.java
b/modules/metastorage-api/src/main/java/org/apache/ignite/internal/metastorage/timebag/IgniteStopwatch.java
index 72eb0ccab68..c6e19b10caa 100644
---
a/modules/metastorage-api/src/main/java/org/apache/ignite/internal/metastorage/timebag/IgniteStopwatch.java
+++
b/modules/metastorage-api/src/main/java/org/apache/ignite/internal/metastorage/timebag/IgniteStopwatch.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.metastorage.timebag;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
-import java.time.Duration;
import java.util.concurrent.TimeUnit;
/**
@@ -76,13 +75,6 @@ final class IgniteStopwatch {
return new IgniteStopwatch();
}
- /**
- * Creates (but does not start) a new stopwatch, using the specified time
source.
- */
- private static IgniteStopwatch createUnstarted(IgniteTicker ticker) {
- return new IgniteStopwatch(ticker);
- }
-
/**
* Creates (and starts) a new stopwatch using {@link System#nanoTime} as
its time source.
*/
@@ -193,13 +185,4 @@ final class IgniteStopwatch {
return desiredUnit.convert(elapsedNanos(), NANOSECONDS);
}
- /**
- * Returns the current elapsed time shown on this stopwatch as a {@link
Duration}.
- * Unlike {@link #elapsed(TimeUnit)}, this method does not lose any
precision due to rounding.
- *
- * @return the elapsed time.
- */
- private Duration elapsed() {
- return Duration.ofNanos(elapsedNanos());
- }
}
diff --git
a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
index c2e01f6bede..20cc515ff44 100644
---
a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
+++
b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/impl/MetaStorageManagerImpl.java
@@ -822,22 +822,6 @@ public class MetaStorageManagerImpl implements
MetaStorageManager, MetastorageGr
return nullCompletedFuture();
}
- private static void
cleanupMetaStorageServiceFuture(CompletableFuture<MetaStorageServiceImpl>
future) {
- future.completeExceptionally(new NodeStoppingException());
-
- if (future.isCancelled() || future.isCompletedExceptionally()) {
- return;
- }
-
- assert future.isDone();
-
- MetaStorageServiceImpl res = future.join();
-
- assert res != null;
-
- res.close();
- }
-
@Override
public long appliedRevision() {
return appliedRevision;
diff --git
a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/AbstractCompactionKeyValueStorageTest.java
b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/AbstractCompactionKeyValueStorageTest.java
index 407ba9023a9..e5ac289d09c 100644
---
a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/AbstractCompactionKeyValueStorageTest.java
+++
b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/server/AbstractCompactionKeyValueStorageTest.java
@@ -1256,18 +1256,6 @@ public abstract class
AbstractCompactionKeyValueStorageTest extends AbstractKeyV
});
}
- private void watchExact(
- byte[] key,
- CompletableFuture<Void> startHandleWatchEventFuture,
- CompletableFuture<Void> finishHandleWatchEventFuture
- ) {
- storage.watchExact(key, storage.revision() + 1, event -> {
- startHandleWatchEventFuture.complete(null);
-
- return finishHandleWatchEventFuture;
- });
- }
-
private static String toUtf8String(byte[]... keys) {
return Arrays.stream(keys)
.map(KeyValueStorageUtils::toUtf8String)
diff --git
a/modules/network/src/test/java/org/apache/ignite/internal/network/UosProfilerTarget.java
b/modules/network/src/test/java/org/apache/ignite/internal/network/UosProfilerTarget.java
index ffcb881d8d5..e405b00706a 100644
---
a/modules/network/src/test/java/org/apache/ignite/internal/network/UosProfilerTarget.java
+++
b/modules/network/src/test/java/org/apache/ignite/internal/network/UosProfilerTarget.java
@@ -62,6 +62,7 @@ public class UosProfilerTarget {
deserialize();
}
+ @SuppressWarnings("PMD.UnusedPrivateMethod") // Used manually by toggling
the commented-out call in main()
private static void serialize() throws Exception {
int accumulatedCode = 1;
int count = (obj instanceof TestClass) ? 30_000_000 : 100_000;
diff --git
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/throttling/SpeedBasedMemoryConsumptionThrottlingStrategy.java
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/throttling/SpeedBasedMemoryConsumptionThrottlingStrategy.java
index 39808b36e90..6a44e95689f 100644
---
a/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/throttling/SpeedBasedMemoryConsumptionThrottlingStrategy.java
+++
b/modules/page-memory/src/main/java/org/apache/ignite/internal/pagememory/persistence/throttling/SpeedBasedMemoryConsumptionThrottlingStrategy.java
@@ -212,6 +212,7 @@ class SpeedBasedMemoryConsumptionThrottlingStrategy {
}
// TODO IGNITE-24937 Leads to negative estimations in some cases. Should
be fixed.
+ @SuppressWarnings("PMD.UnusedPrivateMethod") // Will be used after
IGNITE-24937 is fixed
private int notEvictedPagesTotal(int cpTotalPages) {
return Math.max(cpTotalPages - cpEvictedPages(), 0);
}
diff --git
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
index 246430f9b46..35db27e0351 100644
---
a/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
+++
b/modules/partition-replicator/src/integrationTest/java/org/apache/ignite/internal/partition/replicator/fixtures/Node.java
@@ -773,7 +773,6 @@ public class Node {
name,
registry,
gcConfiguration,
- transactionConfiguration,
replicationConfiguration,
clusterService.messagingService(),
clusterService.topologyService(),
diff --git
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/client/RaftCommandExecutor.java
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/client/RaftCommandExecutor.java
index fb293931f2f..07bf06417f4 100644
---
a/modules/raft/src/main/java/org/apache/ignite/internal/raft/client/RaftCommandExecutor.java
+++
b/modules/raft/src/main/java/org/apache/ignite/internal/raft/client/RaftCommandExecutor.java
@@ -22,7 +22,6 @@ import static
org.apache.ignite.internal.tostring.IgniteToStringBuilder.includeS
import static org.apache.ignite.internal.util.ExceptionUtils.unwrapCause;
import static org.apache.ignite.lang.ErrorGroups.Common.INTERNAL_ERR;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -651,20 +650,6 @@ class RaftCommandExecutor {
}
}
- private static boolean retriableError(@Nullable Throwable e,
NetworkMessage raftResponse) {
- int errorCode = raftResponse instanceof ErrorResponse ?
((ErrorResponse) raftResponse).errorCode() : 0;
- RaftError raftError = RaftError.forNumber(errorCode);
-
- if (e != null) {
- e = unwrapCause(e);
-
- // Retriable error but can be caused by an overload.
- return e instanceof TimeoutException || e instanceof IOException;
- }
-
- return raftError == RaftError.EBUSY || raftError == RaftError.EAGAIN;
- }
-
/**
* Resolves a peer to an internal cluster node.
*/
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
index 2c75521e15a..60d29f91e79 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
@@ -792,7 +792,6 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
name,
registry,
gcConfig,
- txConfiguration,
replicationConfiguration,
messagingServiceReturningToStorageOperationsPool,
clusterSvc.topologyService(),
diff --git
a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
index 11634c5a272..eaa1c794cac 100644
---
a/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
+++
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteImpl.java
@@ -1145,7 +1145,6 @@ public class IgniteImpl implements Ignite {
name,
registry,
gcConfig,
- txConfig,
replicationConfig,
messagingServiceReturningToStorageOperationsPool,
clusterSvc.topologyService(),
diff --git
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/PartialBinaryTupleMatcher.java
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/PartialBinaryTupleMatcher.java
index 09858b0d14b..bb83a80f758 100644
---
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/PartialBinaryTupleMatcher.java
+++
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/PartialBinaryTupleMatcher.java
@@ -29,7 +29,6 @@ import static
org.apache.ignite.internal.schema.BinaryTupleComparatorUtils.isFla
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.List;
-import org.apache.ignite.internal.binarytuple.BinaryTupleCommon;
import org.apache.ignite.internal.binarytuple.BinaryTupleParser.Readability;
import org.apache.ignite.internal.binarytuple.BinaryTupleReader;
import org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation;
@@ -171,27 +170,4 @@ public class PartialBinaryTupleMatcher {
}
}
- /**
- * Retrieves a trimmed portion of binary data from the specified tuple at
a given index.
- * The size of the retrieved data is limited to the specified maximum
length.
- *
- * @param tuple The BinaryTupleReader from which to retrieve the binary
data.
- * @param index The index in the tuple specifying the location of the data
to be retrieved.
- * @param maxLength The maximum allowable length for the trimmed portion
of the binary data.
- * @return A byte array containing the trimmed binary data.
- */
- private static byte[] getTrimmedBytes(BinaryTupleReader tuple, int index,
int maxLength) {
- tuple.seek(index);
-
- int begin = tuple.begin();
- int end = tuple.end();
-
- if (tuple.byteBuffer().get(begin) ==
BinaryTupleCommon.VARLEN_EMPTY_BYTE) {
- maxLength++;
- }
-
- int trimmedSize = Math.min(end - begin, maxLength);
-
- return tuple.bytesValue(begin, begin + trimmedSize);
- }
}
diff --git
a/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaManagerTest.java
b/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaManagerTest.java
index 32b1442f61a..e440494b725 100644
---
a/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaManagerTest.java
+++
b/modules/schema/src/test/java/org/apache/ignite/internal/schema/SchemaManagerTest.java
@@ -152,10 +152,6 @@ class SchemaManagerTest extends BaseIgniteAbstractTest {
return Objects.requireNonNull(tableAlteredListener.getValue(),
"tableAlteredListener is not registered with CatalogService");
}
- private EventListener<CatalogEventParameters> tableDestroyedListener() {
- return Objects.requireNonNull(tableDestroyedListener.getValue(),
"tableDestroyedListener is not registered with CatalogService");
- }
-
private static CatalogTableDescriptor tableDescriptorAfterColumnAddition()
{
List<CatalogTableColumnDescriptor> columns = List.of(
new CatalogTableColumnDescriptor("k1", ColumnType.INT16,
false, 0, 0, 0, null),
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/mapping/MappingServiceImpl.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/mapping/MappingServiceImpl.java
index bb75d8b378f..d6ef079e866 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/mapping/MappingServiceImpl.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/mapping/MappingServiceImpl.java
@@ -169,6 +169,7 @@ public class MappingServiceImpl implements MappingService,
LogicalTopologyEventL
.thenApply(frags -> new MappedFragments(frags,
topologySnapshot.version));
}
+ @SuppressWarnings("PMD.UnusedPrivateMethod") // TODO: IGNITE-26465 Part of
planned caching approach (see commented-out code above)
private MappingsCacheValue computeMappingCacheKey(
MappingsCacheValue val,
TopologySnapshot topologySnapshot,
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/metadata/IgniteMdSelectivity.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/metadata/IgniteMdSelectivity.java
index 114c444af1f..c5dcf115921 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/metadata/IgniteMdSelectivity.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/metadata/IgniteMdSelectivity.java
@@ -41,10 +41,6 @@ import org.apache.calcite.util.ImmutableIntList;
import org.apache.calcite.util.Util;
import org.apache.calcite.util.mapping.Mapping;
import org.apache.calcite.util.mapping.Mappings;
-import org.apache.ignite.internal.sql.engine.prepare.bounds.ExactBounds;
-import org.apache.ignite.internal.sql.engine.prepare.bounds.MultiBounds;
-import org.apache.ignite.internal.sql.engine.prepare.bounds.RangeBounds;
-import org.apache.ignite.internal.sql.engine.prepare.bounds.SearchBounds;
import org.apache.ignite.internal.sql.engine.rel.IgniteHashIndexSpool;
import org.apache.ignite.internal.sql.engine.rel.IgniteSortedIndexSpool;
import
org.apache.ignite.internal.sql.engine.rel.ProjectableFilterableTableScan;
@@ -334,27 +330,4 @@ public class IgniteMdSelectivity extends RelMdSelectivity {
return mq.getSelectivity(rel.getInput(), rel.condition());
}
- /** Guess cost multiplier regarding search bounds only. */
- private static double guessCostMultiplier(SearchBounds bounds) {
- if (bounds instanceof ExactBounds) {
- return .1;
- } else if (bounds instanceof RangeBounds) {
- RangeBounds rangeBounds = (RangeBounds) bounds;
-
- if (rangeBounds.condition() != null) {
- return ((RexCall) rangeBounds.condition()).op.kind ==
SqlKind.EQUALS ? .1 : .2;
- } else {
- return .35;
- }
- } else if (bounds instanceof MultiBounds) {
- MultiBounds multiBounds = (MultiBounds) bounds;
-
- return multiBounds.bounds().stream()
- .mapToDouble(IgniteMdSelectivity::guessCostMultiplier)
- .max()
- .orElseThrow(AssertionError::new);
- }
-
- return 1.0;
- }
}
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AbstractExecutionTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AbstractExecutionTest.java
index 78bdb8b1db7..3c95ef4bfa0 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AbstractExecutionTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/AbstractExecutionTest.java
@@ -293,10 +293,6 @@ public abstract class AbstractExecutionTest<T> extends
IgniteAbstractTest {
this.fieldCreators = fieldCreators;
}
- private static Object field(Integer rowNum) {
- return "val_" + rowNum;
- }
-
private static Object stringField(Integer rowNum) {
return "val_" + rowNum;
}
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/TableScanNodeExecutionTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/TableScanNodeExecutionTest.java
index 5db917e662c..8f682a761f9 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/TableScanNodeExecutionTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/rel/TableScanNodeExecutionTest.java
@@ -338,8 +338,6 @@ public class TableScanNodeExecutionTest extends
AbstractExecutionTest<Object[]>
mock(TransactionInflights.class),
null,
mock(StreamerReceiverRunner.class),
- () -> 10_000L,
- () -> 10_000L,
new TableMetricSource(QualifiedName.fromSimple("test"))
);
this.dataAmount = dataAmount;
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/SqlRowHandlerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/SqlRowHandlerTest.java
index 00f95f49bb4..eb1be21cdab 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/SqlRowHandlerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/SqlRowHandlerTest.java
@@ -34,7 +34,6 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
-import java.util.stream.Stream;
import org.apache.ignite.internal.schema.BinaryTuple;
import org.apache.ignite.internal.sql.engine.api.expressions.RowFactory;
import
org.apache.ignite.internal.sql.engine.api.expressions.RowFactory.RowBuilder;
@@ -50,10 +49,8 @@ import org.apache.ignite.internal.type.StructNativeType;
import org.apache.ignite.sql.ColumnType;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Named;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.MethodSource;
@@ -165,15 +162,6 @@ public class SqlRowHandlerTest extends IgniteAbstractTest {
assertEquals(1, mappedBinaryTuple.intValue(1));
}
- private static Stream<Arguments> concatTestArguments() {
- return Stream.of(
- Arguments.of(Named.of("array", false), Named.of("array",
false)),
- Arguments.of(Named.of("array", false), Named.of("tuple",
true)),
- Arguments.of(Named.of("tuple", true), Named.of("array",
false)),
- Arguments.of(Named.of("tuple", true), Named.of("tuple", true))
- );
- }
-
@ParameterizedTest
@MethodSource("columnTypes")
public void testRowBuilder(ColumnType type) {
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
index 52830a5db49..1438e54042c 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/AggregatePlannerTest.java
@@ -816,15 +816,6 @@ public class AggregatePlannerTest extends
AbstractAggregatePlannerTest {
));
}
- private void checkGroupWithNoAggregateUseIndexSingle(TestCase testCase)
throws Exception {
- assertPlan(testCase,
- nodeOrAnyChild(isInstanceOf(IgniteColocatedSortAggregate.class)
- .and(not(hasAggregate()))
- .and(hasGroups())
- .and(input(isIndexScan("TEST", "idx_grp0_grp1")))
- ));
- }
-
private void checkGroupWithNoAggregateUseIndexHash(TestCase testCase)
throws Exception {
assertPlan(testCase,
nodeOrAnyChild(isInstanceOf(IgniteReduceSortAggregate.class)
@@ -840,17 +831,6 @@ public class AggregatePlannerTest extends
AbstractAggregatePlannerTest {
));
}
- private void checkColocatedGroupWithNoAggregateUseIndexHash(TestCase
testCase) throws Exception {
- assertPlan(testCase,
- nodeOrAnyChild(isInstanceOf(IgniteExchange.class)
-
.and(input(isInstanceOf(IgniteColocatedSortAggregate.class)
- .and(not(hasAggregate()))
- .and(hasGroups())
- .and(input(isIndexScan("TEST",
"idx_grp0_grp1")))
- ))
- ));
- }
-
private void checkGroupsWithOrderByGroupColumnsSingle(TestCase testCase,
RelCollation collation) throws Exception {
assertPlan(testCase,
isInstanceOf(IgniteSort.class)
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ColocatedSortAggregatePlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ColocatedSortAggregatePlannerTest.java
index d5bade7f839..ae21e514df9 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ColocatedSortAggregatePlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/ColocatedSortAggregatePlannerTest.java
@@ -745,17 +745,6 @@ public class ColocatedSortAggregatePlannerTest extends
AbstractAggregatePlannerT
);
}
- private void checkGroupWi2thNoAggregateSingle(TestCase testCase) throws
Exception {
- assertPlan(testCase,
- nodeOrAnyChild(isInstanceOf(IgniteColocatedSortAggregate.class)
- .and(not(hasAggregate()))
- .and(hasGroups())
- .and(input(isIndexScan("TEST", "idx_grp0_grp1")))
- ),
- disableRules
- );
- }
-
private void checkGroupsWithOrderByGroupColumnsSingle(TestCase testCase,
RelCollation collation) throws Exception {
assertPlan(testCase,
isInstanceOf(IgniteColocatedSortAggregate.class)
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PrimaryKeyDeletePlannerTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PrimaryKeyDeletePlannerTest.java
index ad77c2a2082..11936a2618b 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PrimaryKeyDeletePlannerTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/planner/PrimaryKeyDeletePlannerTest.java
@@ -35,11 +35,8 @@ import
org.apache.ignite.internal.sql.engine.framework.TestBuilders;
import org.apache.ignite.internal.sql.engine.framework.TestCluster;
import org.apache.ignite.internal.sql.engine.framework.TestNode;
import org.apache.ignite.internal.sql.engine.prepare.KeyValueModifyPlan;
-import org.apache.ignite.internal.sql.engine.prepare.MultiStepPlan;
import org.apache.ignite.internal.sql.engine.prepare.QueryPlan;
import
org.apache.ignite.internal.sql.engine.rel.IgniteKeyValueModify.Operation;
-import org.apache.ignite.internal.sql.engine.rel.IgniteValues;
-import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -211,11 +208,6 @@ public class PrimaryKeyDeletePlannerTest extends
AbstractPlannerTest {
}
}
- private static void assertEmptyValuesNode(MultiStepPlan plan) {
- assertThat(plan.getRel(), instanceOf(IgniteValues.class));
- assertThat(((IgniteValues) plan.getRel()).tuples, Matchers.empty());
- }
-
private static void assertKeyExpressions(KeyValueModifyPlan plan,
String... expectedExpressions) {
List<String> keyExpressions = (plan.getRel()).expressions().stream()
.map(RexNode::toString)
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/LeastRestrictiveTypesTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/LeastRestrictiveTypesTest.java
index 7ae53bde1ef..15e5823a456 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/LeastRestrictiveTypesTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/prepare/LeastRestrictiveTypesTest.java
@@ -271,10 +271,6 @@ public class LeastRestrictiveTypesTest {
this.relDataType = relDataType;
}
- private static LeastRestrictiveType none() {
- return new LeastRestrictiveType(null);
- }
-
@Override
public String toString() {
return relDataType != null ? relDataType.toString() : "<none>";
diff --git
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItColocationTest.java
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItColocationTest.java
index 6a5167526bb..27156cdf13e 100644
---
a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItColocationTest.java
+++
b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItColocationTest.java
@@ -367,8 +367,6 @@ public class ItColocationTest extends
BaseIgniteAbstractTest {
transactionInflights,
null,
mock(StreamerReceiverRunner.class),
- () -> 10_000L,
- () -> 10_000L,
new TableMetricSource(QualifiedName.fromSimple("TEST"))
);
}
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 88afb63593a..917eb932946 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
@@ -170,7 +170,6 @@ import
org.apache.ignite.internal.table.metrics.TableMetricSource;
import org.apache.ignite.internal.thread.IgniteThreadFactory;
import org.apache.ignite.internal.tx.LockManager;
import org.apache.ignite.internal.tx.TxManager;
-import org.apache.ignite.internal.tx.configuration.TransactionConfiguration;
import org.apache.ignite.internal.tx.impl.RemotelyTriggeredResourceRegistry;
import org.apache.ignite.internal.tx.impl.TransactionInflights;
import org.apache.ignite.internal.tx.impl.TransactionStateResolver;
@@ -318,8 +317,6 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
private final TransactionInflights transactionInflights;
- private final TransactionConfiguration txCfg;
-
private final String nodeName;
private final PartitionReplicaLifecycleManager
partitionReplicaLifecycleManager;
@@ -367,7 +364,6 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
* @param nodeName Node name.
* @param registry Registry for versioned values.
* @param gcConfig Garbage collector configuration.
- * @param txCfg Transaction configuration.
* @param replicationConfiguration Replication configuration.
* @param lockMgr Lock manager.
* @param replicaSvc Replica service.
@@ -393,7 +389,6 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
String nodeName,
RevisionListenerRegistry registry,
GcConfiguration gcConfig,
- TransactionConfiguration txCfg,
ReplicationConfiguration replicationConfiguration,
MessagingService messagingService,
TopologyService topologyService,
@@ -444,7 +439,6 @@ public class TableManager implements IgniteTablesInternal,
IgniteComponent {
this.remotelyTriggeredResourceRegistry =
remotelyTriggeredResourceRegistry;
this.lowWatermark = lowWatermark;
this.transactionInflights = transactionInflights;
- this.txCfg = txCfg;
this.nodeName = nodeName;
this.indexMetaStorage = indexMetaStorage;
this.partitionReplicaLifecycleManager =
partitionReplicaLifecycleManager;
@@ -1197,8 +1191,6 @@ public class TableManager implements
IgniteTablesInternal, IgniteComponent {
transactionInflights,
this::streamerFlushExecutor,
Objects.requireNonNull(streamerReceiverRunner),
- () -> txCfg.value().readWriteTimeoutMillis(),
- () -> txCfg.value().readOnlyTimeoutMillis(),
createAndRegisterMetricsSource(tableStorage, tableName)
);
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/TablePartitionProcessor.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/TablePartitionProcessor.java
index 8c5d2b091d0..d0628a5b416 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/TablePartitionProcessor.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/TablePartitionProcessor.java
@@ -66,8 +66,6 @@ import
org.apache.ignite.internal.table.distributed.raft.handlers.MinimumActiveT
import org.apache.ignite.internal.tx.TxManager;
import org.apache.ignite.internal.tx.TxStateMeta;
import org.apache.ignite.internal.tx.UpdateCommandResult;
-import org.apache.ignite.internal.util.PendingComparableValuesTracker;
-import org.apache.ignite.internal.util.TrackerClosedException;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
@@ -534,17 +532,6 @@ public class TablePartitionProcessor implements
RaftTableProcessor {
return EMPTY_APPLIED_RESULT;
}
- private static <T extends Comparable<T>> void
updateTrackerIgnoringTrackerClosedException(
- PendingComparableValuesTracker<T, Void> tracker,
- T newValue
- ) {
- try {
- tracker.update(newValue, null);
- } catch (TrackerClosedException ignored) {
- // No-op.
- }
- }
-
private void replicaTouch(UUID txId, UUID txCoordinatorId, HybridTimestamp
commitTimestamp, boolean full) {
// Saving state is not needed for full transactions.
if (!full) {
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
index da23f76155d..662ce943e43 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImpl.java
@@ -196,12 +196,6 @@ public class InternalTableImpl implements InternalTable {
/** Placement driver. */
private final PlacementDriver placementDriver;
- /** Default read-write transaction timeout. */
- private final Supplier<Long> defaultRwTxTimeout;
-
- /** Default read-only transaction timeout. */
- private final Supplier<Long> defaultReadTxTimeout;
-
private final ReadWriteMetricSource metrics;
/**
@@ -220,8 +214,6 @@ public class InternalTableImpl implements InternalTable {
* @param transactionInflights Transaction inflights.
* @param streamerFlushExecutor Streamer flush executor.
* @param streamerReceiverRunner Streamer receiver runner.
- * @param defaultRwTxTimeout Default read-write transaction timeout.
- * @param defaultReadTxTimeout Default read-only transaction timeout.
*/
public InternalTableImpl(
QualifiedName tableName,
@@ -238,8 +230,6 @@ public class InternalTableImpl implements InternalTable {
TransactionInflights transactionInflights,
Supplier<ScheduledExecutorService> streamerFlushExecutor,
StreamerReceiverRunner streamerReceiverRunner,
- Supplier<Long> defaultRwTxTimeout,
- Supplier<Long> defaultReadTxTimeout,
ReadWriteMetricSource metrics
) {
this.tableName = tableName;
@@ -256,8 +246,6 @@ public class InternalTableImpl implements InternalTable {
this.transactionInflights = transactionInflights;
this.streamerFlushExecutor = streamerFlushExecutor;
this.streamerReceiverRunner = streamerReceiverRunner;
- this.defaultRwTxTimeout = defaultRwTxTimeout;
- this.defaultReadTxTimeout = defaultReadTxTimeout;
this.metrics = metrics;
}
@@ -1231,10 +1219,6 @@ public class InternalTableImpl implements InternalTable {
}).thenCompose(identity());
}
- private long getDefaultTimeout(InternalTransaction tx) {
- return tx.isReadOnly() ? defaultReadTxTimeout.get() :
defaultRwTxTimeout.get();
- }
-
/** {@inheritDoc} */
@Override
public CompletableFuture<BinaryRow> getAndUpsert(BinaryRowEx row,
InternalTransaction tx) {
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
index d93b06b04cf..c5f6b362428 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerRecoveryTest.java
@@ -563,7 +563,6 @@ public class TableManagerRecoveryTest extends
IgniteAbstractTest {
NODE_NAME,
revisionUpdater,
gcConfig,
- txConfig,
replicationConfiguration,
clusterService.messagingService(),
clusterService.topologyService(),
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
index aa67fbca1f8..afa7bd16407 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/TableManagerTest.java
@@ -573,7 +573,6 @@ public class TableManagerTest extends IgniteAbstractTest {
NODE_NAME,
revisionUpdater,
gcConfig,
- txConfig,
replicationConfiguration,
clusterService.messagingService(),
clusterService.topologyService(),
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableEstimatedSizeTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableEstimatedSizeTest.java
index 56321689c9c..12797dd12f6 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableEstimatedSizeTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableEstimatedSizeTest.java
@@ -225,8 +225,6 @@ public class InternalTableEstimatedSizeTest extends
BaseIgniteAbstractTest {
new TransactionInflights(placementDriver, clockService,
txStateVolatileStorage()),
() -> null,
mock(StreamerReceiverRunner.class),
- () -> 10_000L,
- () -> 10_000L,
new TableMetricSource(QualifiedName.fromSimple(TABLE_NAME))
);
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java
index 14c5a4837f4..3b57ab72050 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/storage/InternalTableImplTest.java
@@ -253,8 +253,6 @@ public class InternalTableImplTest extends
BaseIgniteAbstractTest {
new TransactionInflights(placementDriver, clockService,
txStateVolatileStorage),
() -> mock(ScheduledExecutorService.class),
mock(StreamerReceiverRunner.class),
- () -> 10_000L,
- () -> 10_000L,
new TableMetricSource(QualifiedName.fromSimple("test"))
);
}
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java
b/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java
index 31dde335c40..4a74efd6be1 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/distributed/ItTxTestCluster.java
@@ -700,8 +700,6 @@ public class ItTxTestCluster {
clientTransactionInflights,
null,
mock(StreamerReceiverRunner.class),
- () -> 10_000L,
- () -> 10_000L,
new TableMetricSource(QualifiedName.fromSimple(tableName))
);
diff --git
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
index 59ab5d1541d..9601ec163ae 100644
---
a/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
+++
b/modules/table/src/testFixtures/java/org/apache/ignite/internal/table/impl/DummyInternalTableImpl.java
@@ -310,8 +310,6 @@ public class DummyInternalTableImpl extends
InternalTableImpl {
transactionInflights,
null,
mock(StreamerReceiverRunner.class),
- () -> 10_000L,
- () -> 10_000L,
new TableMetricSource(QualifiedName.fromSimple("test"))
);
