Skip to content

Commit 787fd2c

Browse files
authored
Removed unused configHash computation that can be replaced by PipelineConfig.configHash() (elastic#17336)
Removed unused configHash computation happening in AbstractPipeline and used only in tests replaced by PipelineConfig.configHash() invocation
1 parent 193af6a commit 787fd2c

File tree

2 files changed

+1
-15
lines changed

2 files changed

+1
-15
lines changed

logstash-core/spec/logstash/pipeline_action/reload_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
it "run the new pipeline code" do
6262
subject.execute(agent, pipelines)
63-
expect(pipelines.get_pipeline(pipeline_id).config_hash).to eq(new_pipeline_config.config_hash)
63+
expect(pipelines.get_pipeline(pipeline_id).pipeline_config.config_hash).to eq(new_pipeline_config.config_hash)
6464
end
6565
end
6666

logstash-core/src/main/java/org/logstash/execution/AbstractPipelineExt.java

-14
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.nio.file.FileStore;
2727
import java.nio.file.Files;
2828
import java.nio.file.Paths;
29-
import java.security.MessageDigest;
3029
import java.security.NoSuchAlgorithmException;
3130
import java.time.temporal.ChronoUnit;
3231
import java.time.temporal.TemporalUnit;
@@ -48,7 +47,6 @@
4847
import java.util.stream.Stream;
4948

5049
import com.google.common.annotations.VisibleForTesting;
51-
import org.apache.commons.codec.binary.Hex;
5250
import org.apache.logging.log4j.LogManager;
5351
import org.apache.logging.log4j.Logger;
5452
import org.jruby.Ruby;
@@ -146,8 +144,6 @@ public class AbstractPipelineExt extends RubyBasicObject {
146144
@SuppressWarnings({"rawtypes", "serial"})
147145
private List<SourceWithMetadata> configParts;
148146

149-
private RubyString configHash;
150-
151147
private transient IRubyObject settings;
152148

153149
private transient IRubyObject pipelineSettings;
@@ -263,11 +259,6 @@ private AbstractPipelineExt initialize(final ThreadContext context,
263259
pipelineSettings = pipelineConfig;
264260
configString = (RubyString) pipelineSettings.callMethod(context, "config_string");
265261
configParts = pipelineSettings.toJava(PipelineConfig.class).getConfigParts();
266-
configHash = context.runtime.newString(
267-
Hex.encodeHexString(
268-
MessageDigest.getInstance("SHA1").digest(configString.getBytes())
269-
)
270-
);
271262
settings = pipelineSettings.callMethod(context, "settings");
272263
final IRubyObject id = getSetting(context, SettingKeyDefinitions.PIPELINE_ID);
273264
if (id.isNil()) {
@@ -356,11 +347,6 @@ public final RubyString configStr() {
356347
return configString;
357348
}
358349

359-
@JRubyMethod(name = "config_hash")
360-
public final RubyString configHash() {
361-
return configHash;
362-
}
363-
364350
@JRubyMethod(name = "ephemeral_id")
365351
public final RubyString ephemeralId() {
366352
return ephemeralId;

0 commit comments

Comments
 (0)