From 3a5f6860a705fcb5e17dd2c8ba219e41ed00b769 Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Tue, 30 Jun 2020 12:06:40 +0100 Subject: [PATCH] fix tests related to compiler cache due to reduced class generation --- .../logstash/config/ir/compiler/ComputeStepSyntaxElement.java | 1 - .../java/org/logstash/config/ir/CompiledPipelineTest.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/logstash-core/src/main/java/org/logstash/config/ir/compiler/ComputeStepSyntaxElement.java b/logstash-core/src/main/java/org/logstash/config/ir/compiler/ComputeStepSyntaxElement.java index 9de1b8d18..42541f2a5 100644 --- a/logstash-core/src/main/java/org/logstash/config/ir/compiler/ComputeStepSyntaxElement.java +++ b/logstash-core/src/main/java/org/logstash/config/ir/compiler/ComputeStepSyntaxElement.java @@ -101,7 +101,6 @@ public final class ComputeStepSyntaxElement { public static void cleanClassCache() { synchronized (COMPILER) { CLASS_CACHE.clear(); - COMPILER.setParentClassLoader(null); } } diff --git a/logstash-core/src/test/java/org/logstash/config/ir/CompiledPipelineTest.java b/logstash-core/src/test/java/org/logstash/config/ir/CompiledPipelineTest.java index 11417de37..d4851926f 100644 --- a/logstash-core/src/test/java/org/logstash/config/ir/CompiledPipelineTest.java +++ b/logstash-core/src/test/java/org/logstash/config/ir/CompiledPipelineTest.java @@ -615,12 +615,12 @@ public final class CompiledPipelineTest extends RubyEnvTestCase { final CompiledPipeline testCompiledPipeline = new CompiledPipeline(testPipelineIR, pluginFactory); - final long compilationBaseline = time(ChronoUnit.SECONDS, () -> { + final long compilationBaseline = time(ChronoUnit.MILLIS, () -> { final CompiledPipeline.CompiledExecution compiledExecution = baselineCompiledPipeline.buildExecution(); compiledExecution.compute(RubyUtil.RUBY.newArray(testEvent), false, false); }); - final long compilationTest = time(ChronoUnit.SECONDS, () -> { + final long compilationTest = time(ChronoUnit.MILLIS, () -> { final CompiledPipeline.CompiledExecution compiledExecution = testCompiledPipeline.buildExecution(); compiledExecution.compute(RubyUtil.RUBY.newArray(testEvent), false, false); });