Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Watcher: Reduce script cache churn by checking for mustache tags #33978

Merged
merged 4 commits into from
Sep 27, 2018
Merged

Watcher: Reduce script cache churn by checking for mustache tags #33978

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28e2c81
Watcher: Reduce script cache churn by checking for mustache tags
spinscale Sep 24, 2018
beb7906
Merge branch 'master' into 1809-reduce-script-compilation-in-watcher
spinscale Sep 25, 2018
76424f4
review comment: remove check for closed brackets, could be wrong
spinscale Sep 26, 2018
d0eaee4
Merge branch 'master' into 1809-reduce-script-compilation-in-watcher
spinscale Sep 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...watcher/src/main/java/org/elasticsearch/xpack/watcher/common/text/TextTemplateEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ public String render(TextTemplate textTemplate, Map<String, Object> model) {
String mediaType = compileParams(detectContentType(template));
template = trimContentType(textTemplate);

int indexStartMustacheExpression = template.indexOf("{{");
if (indexStartMustacheExpression == -1) {
return template;
}

Map<String, Object> mergedModel = new HashMap<>();
if (textTemplate.getParams() != null) {
mergedModel.putAll(textTemplate.getParams());
Expand Down
43 changes: 40 additions & 3 deletions .../watcher/src/test/java/org/elasticsearch/xpack/watcher/common/text/TextTemplateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;

import static java.util.Collections.singletonMap;
Expand All @@ -31,7 +32,10 @@
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;

public class TextTemplateTests extends ESTestCase {
Expand All @@ -47,7 +51,7 @@ public void init() throws Exception {
}

public void testRender() throws Exception {
String templateText = "_template";
String templateText = "{{_template}}";
Map<String, Object> params = singletonMap("param_key", "param_val");
Map<String, Object> model = singletonMap("model_key", "model_val");
Map<String, Object> merged = new HashMap<>(params);
Expand All @@ -72,7 +76,7 @@ public String execute() {
}

public void testRenderOverridingModel() throws Exception {
String templateText = "_template";
String templateText = "{{_template}}";
Map<String, Object> params = singletonMap("key", "param_val");
Map<String, Object> model = singletonMap("key", "model_val");
ScriptType type = randomFrom(ScriptType.values());
Expand All @@ -94,7 +98,7 @@ public String execute() {
}

public void testRenderDefaults() throws Exception {
String templateText = "_template";
String templateText = "{{_template}}";
Map<String, Object> model = singletonMap("key", "model_val");

TemplateScript.Factory compiledTemplate = templateParams ->
Expand All @@ -113,6 +117,39 @@ public String execute() {
assertThat(engine.render(template, model), is("rendered_text"));
}

public void testDontInvokeScriptServiceOnNonMustacheText() {
assertNoCompilation("this is my text");
assertScriptServiceInvoked("}}{{");
assertScriptServiceInvoked("}}{{ctx.payload}}");
}

private void assertNoCompilation(String input) {
String output = engine.render(new TextTemplate(input), Collections.emptyMap());
assertThat(input, is(output));
verifyZeroInteractions(service);
}

private void assertScriptServiceInvoked(final String input) {
ScriptService scriptService = mock(ScriptService.class);
TextTemplateEngine e = new TextTemplateEngine(Settings.EMPTY, scriptService);

TemplateScript.Factory compiledTemplate = templateParams ->
new TemplateScript(templateParams) {
@Override
public String execute() {
return input.toUpperCase(Locale.ROOT);
}
};

when(scriptService.compile(new Script(ScriptType.INLINE, lang, input,
Collections.singletonMap("content_type", "text/plain"), Collections.emptyMap()), Watcher.SCRIPT_TEMPLATE_CONTEXT))
.thenReturn(compiledTemplate);

String output = e.render(new TextTemplate(input), Collections.emptyMap());
verify(scriptService).compile(any(), any());
assertThat(output, is(input.toUpperCase(Locale.ROOT)));
}

public void testParser() throws Exception {
ScriptType type = randomScriptType();
TextTemplate template =
Expand Down