This is an automated email from the ASF dual-hosted git repository.
mpochatkin 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 b9553f2f3cb IGNITE-26113 Create noop event log (#6359)
b9553f2f3cb is described below
commit b9553f2f3cb8f06d3a7d48607bde0f2655db9d45
Author: Vadim Pakhnushev <[email protected]>
AuthorDate: Mon Aug 4 16:38:54 2025 +0300
IGNITE-26113 Create noop event log (#6359)
---
.../java/org/apache/ignite/client/handler/TestServer.java | 14 +-------------
.../org/apache/ignite/internal/eventlog/api/EventLog.java | 13 +++++++++++++
.../apache/ignite/internal/rest/RestComponentTest.java | 13 +------------
.../internal/runner/app/ItIgniteNodeRestartTest.java | 15 +--------------
.../authentication/AuthenticationManagerImplTest.java | 14 +-------------
.../ignite/internal/sql/engine/framework/TestNode.java | 14 +-------------
6 files changed, 18 insertions(+), 65 deletions(-)
diff --git
a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/TestServer.java
b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/TestServer.java
index d2d444a9ecd..fd335df4b77 100644
---
a/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/TestServer.java
+++
b/modules/client-handler/src/integrationTest/java/org/apache/ignite/client/handler/TestServer.java
@@ -24,14 +24,12 @@ import static org.mockito.Mockito.mock;
import java.util.List;
import java.util.UUID;
-import java.util.function.Supplier;
import
org.apache.ignite.client.handler.configuration.ClientConnectorConfiguration;
import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.cluster.management.ClusterTag;
import
org.apache.ignite.internal.cluster.management.network.messages.CmgMessagesFactory;
import org.apache.ignite.internal.components.SystemPropertiesNodeProperties;
import org.apache.ignite.internal.compute.IgniteComputeInternal;
-import org.apache.ignite.internal.eventlog.api.Event;
import org.apache.ignite.internal.eventlog.api.EventLog;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.TestClockService;
@@ -84,17 +82,7 @@ public class TestServer {
this.testSslConfig = testSslConfig;
this.authenticationManager = securityConfiguration == null
? new DummyAuthenticationManager()
- : new AuthenticationManagerImpl(securityConfiguration, new
EventLog() {
- @Override
- public void log(Event event) {
-
- }
-
- @Override
- public void log(String type, Supplier<Event>
eventProvider) {
-
- }
- });
+ : new AuthenticationManagerImpl(securityConfiguration,
EventLog.NOOP);
this.clientConnectorConfiguration = clientConnectorConfiguration;
this.networkConfiguration = networkConfiguration;
diff --git
a/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/api/EventLog.java
b/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/api/EventLog.java
index bd864dea9fc..06eb7b683e7 100644
---
a/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/api/EventLog.java
+++
b/modules/eventlog/src/main/java/org/apache/ignite/internal/eventlog/api/EventLog.java
@@ -56,4 +56,17 @@ public interface EventLog {
* @param eventProvider the event provider.
*/
void log(String type, Supplier<Event> eventProvider);
+
+ EventLog NOOP = new EventLog() {
+ @Override
+ public void log(Event event) {
+ // No-op.
+ }
+
+ @Override
+ public void log(String type, Supplier<Event> eventProvider) {
+ // No-op.
+ }
+ };
+
}
diff --git
a/modules/rest/src/test/java/org/apache/ignite/internal/rest/RestComponentTest.java
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/RestComponentTest.java
index 1070943fb5a..5ec36a173c8 100644
---
a/modules/rest/src/test/java/org/apache/ignite/internal/rest/RestComponentTest.java
+++
b/modules/rest/src/test/java/org/apache/ignite/internal/rest/RestComponentTest.java
@@ -43,7 +43,6 @@ import
org.apache.ignite.internal.configuration.NodeConfiguration;
import
org.apache.ignite.internal.configuration.storage.TestConfigurationStorage;
import
org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import
org.apache.ignite.internal.configuration.validation.TestConfigurationValidator;
-import org.apache.ignite.internal.eventlog.api.Event;
import org.apache.ignite.internal.eventlog.api.EventLog;
import org.apache.ignite.internal.manager.ComponentContext;
import
org.apache.ignite.internal.network.configuration.MulticastNodeFinderConfigurationSchema;
@@ -102,17 +101,7 @@ public class RestComponentTest extends
BaseIgniteAbstractTest {
Mockito.when(cmg.clusterState()).then(invocation ->
CompletableFuture.completedFuture(state));
- AuthenticationManager authenticationManager = new
AuthenticationManagerImpl(securityConfiguration, new EventLog() {
- @Override
- public void log(Event event) {
-
- }
-
- @Override
- public void log(String type, Supplier<Event> eventProvider) {
-
- }
- });
+ AuthenticationManager authenticationManager = new
AuthenticationManagerImpl(securityConfiguration, EventLog.NOOP);
Supplier<RestFactory> authProviderFactory = () -> new
AuthenticationProviderFactory(authenticationManager);
Supplier<RestFactory> restPresentationFactory = () -> new
PresentationsFactory(
configurationManager,
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 acb1fae440f..678092d2432 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
@@ -129,7 +129,6 @@ import
org.apache.ignite.internal.disaster.system.ClusterIdService;
import
org.apache.ignite.internal.disaster.system.SystemDisasterRecoveryStorage;
import org.apache.ignite.internal.distributionzones.DistributionZoneManager;
import
org.apache.ignite.internal.distributionzones.rebalance.ZoneRebalanceUtil;
-import org.apache.ignite.internal.eventlog.api.Event;
import org.apache.ignite.internal.eventlog.api.EventLog;
import org.apache.ignite.internal.failure.NoOpFailureManager;
import org.apache.ignite.internal.hlc.ClockService;
@@ -823,18 +822,6 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
lowWatermark
);
- EventLog noopEventLog = new EventLog() {
- @Override
- public void log(Event event) {
- // No-op.
- }
-
- @Override
- public void log(String type, Supplier<Event> eventProvider) {
- // No-op.
- }
- };
-
SqlQueryProcessor qryEngine = new SqlQueryProcessor(
clusterSvc,
logicalTopologyService,
@@ -857,7 +844,7 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
lowWatermark,
threadPoolsManager.commonScheduler(),
new KillCommandHandler(name, logicalTopologyService,
clusterSvc.messagingService()),
- noopEventLog
+ EventLog.NOOP
);
sqlRef.set(new IgniteSqlImpl(qryEngine,
HybridTimestampTracker.atomicTracker(null),
threadPoolsManager.commonScheduler()));
diff --git
a/modules/security/src/test/java/org/apache/ignite/internal/security/authentication/AuthenticationManagerImplTest.java
b/modules/security/src/test/java/org/apache/ignite/internal/security/authentication/AuthenticationManagerImplTest.java
index c67d771158f..5813eb5f97e 100644
---
a/modules/security/src/test/java/org/apache/ignite/internal/security/authentication/AuthenticationManagerImplTest.java
+++
b/modules/security/src/test/java/org/apache/ignite/internal/security/authentication/AuthenticationManagerImplTest.java
@@ -41,13 +41,11 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Consumer;
-import java.util.function.Supplier;
import org.apache.ignite.configuration.annotation.ConfigurationType;
import org.apache.ignite.internal.configuration.ClusterConfiguration;
import
org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
import
org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
import org.apache.ignite.internal.event.EventListener;
-import org.apache.ignite.internal.eventlog.api.Event;
import org.apache.ignite.internal.eventlog.api.EventLog;
import org.apache.ignite.internal.manager.ComponentContext;
import
org.apache.ignite.internal.security.authentication.basic.BasicAuthenticationProviderChange;
@@ -95,17 +93,7 @@ class AuthenticationManagerImplTest extends
BaseIgniteAbstractTest {
void setUp() {
securityConfiguration = ((SecurityExtensionConfiguration)
clusterConfiguration).security();
- manager = new AuthenticationManagerImpl(securityConfiguration, new
EventLog() {
- @Override
- public void log(Event event) {
-
- }
-
- @Override
- public void log(String type, Supplier<Event> eventProvider) {
-
- }
- });
+ manager = new AuthenticationManagerImpl(securityConfiguration,
EventLog.NOOP);
Arrays.stream(AuthenticationEvent.values()).forEach(event ->
manager.listen(event, listener));
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java
index 834716e8319..d8b4c7f8e91 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java
@@ -31,11 +31,9 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
-import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.components.SystemPropertiesNodeProperties;
-import org.apache.ignite.internal.eventlog.api.Event;
import org.apache.ignite.internal.eventlog.api.EventLog;
import org.apache.ignite.internal.failure.FailureContext;
import org.apache.ignite.internal.failure.FailureManager;
@@ -240,17 +238,7 @@ public class TestNode implements LifecycleAware {
executionService,
NoOpTransactionalOperationTracker.INSTANCE,
new QueryIdGenerator(nodeName.hashCode()),
- new EventLog() {
- @Override
- public void log(Event event) {
- // No-op.
- }
-
- @Override
- public void log(String type, Supplier<Event>
eventProvider) {
- // No-op.
- }
- },
+ EventLog.NOOP,
new SqlQueryMetricSource()
));
}
