Skip to content

Drop stored scripts with the old style-id #48078

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

Merged
merged 6 commits into from
Oct 16, 2019
Merged

Drop stored scripts with the old style-id #48078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
724f6bf
Drop stored scripts with the old style-id
jdconrad Oct 15, 2019
1a224c3
Fix imports
jdconrad Oct 15, 2019
3d0bfa9
add another test
jdconrad Oct 15, 2019
2ef82ff
Merge branch 'master' into fixstored2
jdconrad Oct 16, 2019
8cebace
Merge branch 'master' into fixstored2
jdconrad Oct 16, 2019
e08e692
Merge branch 'master' into fixstored2
jdconrad Oct 16, 2019
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
7 changes: 6 additions & 1 deletion server/src/main/java/org/elasticsearch/script/ScriptMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,12 @@ public static ScriptMetaData fromXContent(XContentParser parser) throws IOExcept
source = StoredScriptSource.fromXContent(parser, true);

if (exists == null) {
scripts.put(id, source);
// due to a bug (https://github.com/elastic/elasticsearch/issues/47593)
// scripts may have been retained during upgrade that include the old-style
// id of lang#id; these scripts are unreachable after 7.0, so they are dropped
if (id.contains("#") == false) {
scripts.put(id, source);
}
} else if (exists.getLang().equals(source.getLang()) == false) {
throw new IllegalArgumentException("illegal stored script, id [" + id + "] used for multiple scripts with " +
"different languages [" + exists.getLang() + "] and [" + source.getLang() + "]; scripts using the old " +
Expand Down
37 changes: 37 additions & 0 deletions server/src/test/java/org/elasticsearch/script/ScriptMetaDataTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Collections;

public class ScriptMetaDataTests extends AbstractSerializingTestCase<ScriptMetaData> {

Expand Down Expand Up @@ -168,6 +169,42 @@ public void testLoadEmptyScripts() throws IOException {
assertWarnings("empty templates should no longer be used");
}

public void testOldStyleDropped() throws IOException {
XContentBuilder builder = XContentBuilder.builder(XContentType.JSON.xContent());

builder.startObject();
{
builder.startObject("painless#test");
{
builder.field("lang", "painless");
builder.field("source", "code");
}
builder.endObject();
builder.startObject("lang#test");
{
builder.field("lang", "test");
builder.field("source", "code");
}
builder.endObject();
builder.startObject("test");
{
builder.field("lang", "painless");
builder.field("source", "code");
}
builder.endObject();
}
builder.endObject();

XContentParser parser = XContentType.JSON.xContent()
.createParser(NamedXContentRegistry.EMPTY, DeprecationHandler.THROW_UNSUPPORTED_OPERATION,
BytesReference.bytes(builder).streamInput());
ScriptMetaData smd = ScriptMetaData.fromXContent(parser);
assertNull(smd.getStoredScript("painless#test"));
assertNull(smd.getStoredScript("lang#test"));
Copy link
Member

@rjernst rjernst Oct 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe check the size of the Map returned from getStoredScripts()?

Copy link
Contributor Author

@jdconrad jdconrad Oct 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Added.

assertEquals(new StoredScriptSource("painless", "code", Collections.emptyMap()), smd.getStoredScript("test"));
assertEquals(1, smd.getStoredScripts().size());
}

@Override
protected boolean enableWarningsCheck() {
return true;
Expand Down