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

Merge pull request #19022 from rmuir/loopCounter 

Fix disabled loop counter
This commit is contained in:
Robert Muir 2016-06-23 07:45:06 -04:00 committed by GitHub
parent 5a08e36f9c f8c55a5e7b
commit f35cd0e30a
5 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/lang-painless/src/main/java/org/elasticsearch/painless/MethodWriter.java
View File

@ -118,17 +118,16 @@ public final class MethodWriter extends GeneratorAdapter {
} }
public void writeLoopCounter(int slot, int count, Location location) { public void writeLoopCounter(int slot, int count, Location location) {
if (slot > -1) { assert slot != -1;
writeDebugInfo(location); writeDebugInfo(location);
final Label end = new Label(); final Label end = new Label();
iinc(slot, -count); iinc(slot, -count);
visitVarInsn(Opcodes.ILOAD, slot); visitVarInsn(Opcodes.ILOAD, slot);
push(0); push(0);
ifICmp(GeneratorAdapter.GT, end); ifICmp(GeneratorAdapter.GT, end);
throwException(PAINLESS_ERROR_TYPE, "The maximum number of statements that can be executed in a loop has been reached."); throwException(PAINLESS_ERROR_TYPE, "The maximum number of statements that can be executed in a loop has been reached.");
mark(end); mark(end);
}
} }
public void writeCast(final Cast cast) { public void writeCast(final Cast cast) {

4
modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDo.java
View File

@ -113,7 +113,9 @@ public final class SDo extends AStatement {
condition.fals = end; condition.fals = end;
condition.write(writer, globals); condition.write(writer, globals);
writer.writeLoopCounter(loopCounter.getSlot(), Math.max(1, block.statementCount), location); if (loopCounter != null) {
writer.writeLoopCounter(loopCounter.getSlot(), Math.max(1, block.statementCount), location);
}
writer.goTo(start); writer.goTo(start);
writer.mark(end); writer.mark(end);

8
modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFor.java
View File

@ -176,10 +176,14 @@ public final class SFor extends AStatement {
++statementCount; ++statementCount;
} }
writer.writeLoopCounter(loopCounter.getSlot(), statementCount, location); if (loopCounter != null) {
writer.writeLoopCounter(loopCounter.getSlot(), statementCount, location);
}
block.write(writer, globals); block.write(writer, globals);
} else { } else {
writer.writeLoopCounter(loopCounter.getSlot(), 1, location); if (loopCounter != null) {
writer.writeLoopCounter(loopCounter.getSlot(), 1, location);
}
} }
if (afterthought != null) { if (afterthought != null) {

8
modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SWhile.java
View File

@ -113,13 +113,17 @@ public final class SWhile extends AStatement {
condition.write(writer, globals); condition.write(writer, globals);
if (block != null) { if (block != null) {
writer.writeLoopCounter(loopCounter.getSlot(), Math.max(1, block.statementCount), location); if (loopCounter != null) {
writer.writeLoopCounter(loopCounter.getSlot(), Math.max(1, block.statementCount), location);
}
block.continu = begin; block.continu = begin;
block.brake = end; block.brake = end;
block.write(writer, globals); block.write(writer, globals);
} else { } else {
writer.writeLoopCounter(loopCounter.getSlot(), 1, location); if (loopCounter != null) {
writer.writeLoopCounter(loopCounter.getSlot(), 1, location);
}
} }
if (block == null || !block.allEscape) { if (block == null || !block.allEscape) {

23
modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicStatementTests.java
View File

@ -1,5 +1,7 @@
package org.elasticsearch.painless; package org.elasticsearch.painless;
import java.util.Collections;
/* /*
* Licensed to Elasticsearch under one or more contributor * Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with * license agreements. See the NOTICE file distributed with
@ -223,4 +225,25 @@ public class BasicStatementTests extends ScriptTestCase {
assertEquals(10, exec("def i = 1; if (i == 1) {i = 2; return 10}")); assertEquals(10, exec("def i = 1; if (i == 1) {i = 2; return 10}"));
assertEquals(10, exec("def i = 1; if (i == 1) {i = 2; return 10} else {return 12}")); assertEquals(10, exec("def i = 1; if (i == 1) {i = 2; return 10} else {return 12}"));
} }
public void testArrayLoopWithoutCounter() {
assertEquals(6L, exec("long sum = 0; long[] array = new long[] { 1, 2, 3 };" +
"for (int i = 0; i < array.length; i++) { sum += array[i] } return sum",
Collections.emptyMap(),
Collections.singletonMap(CompilerSettings.MAX_LOOP_COUNTER, "0"),
null
));
assertEquals(6L, exec("long sum = 0; long[] array = new long[] { 1, 2, 3 };" +
"int i = 0; while (i < array.length) { sum += array[i++] } return sum",
Collections.emptyMap(),
Collections.singletonMap(CompilerSettings.MAX_LOOP_COUNTER, "0"),
null
));
assertEquals(6L, exec("long sum = 0; long[] array = new long[] { 1, 2, 3 };" +
"int i = 0; do { sum += array[i++] } while (i < array.length); return sum",
Collections.emptyMap(),
Collections.singletonMap(CompilerSettings.MAX_LOOP_COUNTER, "0"),
null
));
}
} }