Skip to content

painless: Fix method references to ctor with the new LambdaBootstrap and cleanup code #24406

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 10 commits into from
May 1, 2017
Merged

painless: Fix method references to ctor with the new LambdaBootstrap and cleanup code #24406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c806eac
Fix wrong delegation to constructors when compiling lambdas with meth…
uschindler Apr 29, 2017
1befcf7
Cleanup code and remove unneeded transformations between binary and i…
uschindler Apr 29, 2017
6c850f9
Fix whitespace
uschindler Apr 29, 2017
20d254b
Cleanup Exception handling
uschindler Apr 29, 2017
ab898aa
Simplification by moving the type adaption to the outside
uschindler Apr 29, 2017
2b57e9d
Remove STATIC access flag from our Lambda class (not required and als…
uschindler Apr 29, 2017
b547fa9
Move the lambda counter to the classloader, so we have a per-script l…
uschindler Apr 30, 2017
3a5abd3
Change Codesource of generated lambdas to be consistent
uschindler Apr 30, 2017
6adf56e
whitespace cleanup
uschindler Apr 30, 2017
56535b7
Update LambdaBootstrap.java
jdconrad May 1, 2017
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
13 changes: 12 additions & 1 deletion modules/lang-painless/src/main/java/org/elasticsearch/painless/Compiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.security.SecureClassLoader;
import java.security.cert.Certificate;
import java.util.BitSet;
import java.util.concurrent.atomic.AtomicInteger;

import static org.elasticsearch.painless.WriterConstants.CLASS_NAME;

Expand Down Expand Up @@ -66,6 +67,8 @@ final class Compiler {
* A secure class loader used to define Painless scripts.
*/
static final class Loader extends SecureClassLoader {
private final AtomicInteger lambdaCounter = new AtomicInteger(0);

/**
* @param parent The parent ClassLoader.
*/
Expand All @@ -90,7 +93,15 @@ Class<? extends PainlessScript> defineScript(String name, byte[] bytes) {
* @return A Class object.
*/
Class<?> defineLambda(String name, byte[] bytes) {
return defineClass(name, bytes, 0, bytes.length);
return defineClass(name, bytes, 0, bytes.length, CODESOURCE);
}

/**
* A counter used to generate a unique name for each lambda
* function/reference class in this classloader.
*/
int newLambdaIdentifier() {
return lambdaCounter.getAndIncrement();
}
}

Expand Down
Loading