honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Scripting - mvel: Fix thread safety misuse when compiling scripts, first go it so use ParserConfiguration, second is a fix in mvel itself, relates to #886.

This commit is contained in:
kimchy 2011-04-27 00:38:51 +03:00
parent 6ecbef463f
commit 5c8fe598a6
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/elasticsearch/src/main/java/org/elasticsearch/script/mvel/MvelScriptEngineService.java
View File

@ -26,6 +26,7 @@ import org.elasticsearch.common.component.AbstractComponent;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.math.UnboxedMathUtils; import org.elasticsearch.common.math.UnboxedMathUtils;
import org.elasticsearch.common.mvel2.MVEL; import org.elasticsearch.common.mvel2.MVEL;
import org.elasticsearch.common.mvel2.ParserConfiguration;
import org.elasticsearch.common.mvel2.ParserContext; import org.elasticsearch.common.mvel2.ParserContext;
import org.elasticsearch.common.mvel2.compiler.ExecutableStatement; import org.elasticsearch.common.mvel2.compiler.ExecutableStatement;
import org.elasticsearch.common.mvel2.integration.impl.MapVariableResolverFactory; import org.elasticsearch.common.mvel2.integration.impl.MapVariableResolverFactory;
@ -45,20 +46,20 @@ import java.util.Map;
*/ */
public class MvelScriptEngineService extends AbstractComponent implements ScriptEngineService { public class MvelScriptEngineService extends AbstractComponent implements ScriptEngineService {
private final ParserContext parserContext; private final ParserConfiguration parserConfiguration;
@Inject public MvelScriptEngineService(Settings settings) { @Inject public MvelScriptEngineService(Settings settings) {
super(settings); super(settings);
parserContext = new ParserContext(); parserConfiguration = new ParserConfiguration();
parserContext.addPackageImport("java.util"); parserConfiguration.addPackageImport("java.util");
parserContext.addPackageImport("org.elasticsearch.common.trove"); parserConfiguration.addPackageImport("org.elasticsearch.common.trove");
parserContext.addPackageImport("org.elasticsearch.common.joda"); parserConfiguration.addPackageImport("org.elasticsearch.common.joda");
parserContext.addImport("time", MVEL.getStaticMethod(System.class, "currentTimeMillis", new Class[0])); parserConfiguration.addImport("time", MVEL.getStaticMethod(System.class, "currentTimeMillis", new Class[0]));
// unboxed version of Math, better performance since conversion from boxed to unboxed my mvel is not needed // unboxed version of Math, better performance since conversion from boxed to unboxed my mvel is not needed
for (Method m : UnboxedMathUtils.class.getMethods()) { for (Method m : UnboxedMathUtils.class.getMethods()) {
if ((m.getModifiers() & Modifier.STATIC) > 0) { if ((m.getModifiers() & Modifier.STATIC) > 0) {
parserContext.addImport(m.getName(), m); parserConfiguration.addImport(m.getName(), m);
} }
} }
} }
@ -76,7 +77,7 @@ public class MvelScriptEngineService extends AbstractComponent implements Script
} }
@Override public Object compile(String script) { @Override public Object compile(String script) {
return MVEL.compileExpression(script, parserContext); return MVEL.compileExpression(script, new ParserContext(parserConfiguration));
} }
@Override public Object execute(Object compiledScript, Map vars) { @Override public Object execute(Object compiledScript, Map vars) {