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

Merge pull request #20146 from jdconrad/break 

Fix break bug in for/foreach loops.
This commit is contained in:
Jack Conradson 2016-08-25 09:30:26 -07:00 committed by GitHub
parent fbcfddbb77 0fdadf4737
commit 139d3f957f
4 changed files with 202 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,6 +183,8 @@ public final class SFor extends AStatement {
writer.writeLoopCounter(loopCounter.getSlot(), statementCount, location);
}
block.continu = begin;
block.brake = end;
block.write(writer, globals);
} else {
if (loopCounter != null) {

2
modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachArray.java
View File

@ -100,6 +100,8 @@ final class SSubEachArray extends AStatement {
writer.writeLoopCounter(loopCounter.getSlot(), statementCount, location);
}
block.continu = begin;
block.brake = end;
block.write(writer, globals);
writer.goTo(begin);

2
modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SSubEachIterable.java
View File

@ -122,6 +122,8 @@ final class SSubEachIterable extends AStatement {
writer.writeLoopCounter(loopCounter.getSlot(), statementCount, location);
}
block.continu = begin;
block.brake = end;
block.write(writer, globals);
writer.goTo(begin);

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

@ -1,5 +1,6 @@
package org.elasticsearch.painless;
import java.util.ArrayList;
import java.util.Collections;
/*
@ -22,6 +23,7 @@ import java.util.Collections;
*/
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class BasicStatementTests extends ScriptTestCase {
@ -272,4 +274,198 @@ public class BasicStatementTests extends ScriptTestCase {
null, true
));
}
// tests both single break and multiple breaks used in a script
public void testForWithBreak() {
// single break test
assertEquals(1, exec(
"Map settings = ['test1' : '1'];" +
"int i = 0;" +
"List keys = ['test0', 'test1', 'test2'];" +
"for (; i < keys.size(); ++i) {" +
" if (settings.containsKey(keys[i])) {" +
" break;" +
" }" +
"}" +
"return i;"
));
List<Integer> expected = new ArrayList<>();
expected.add(1);
expected.add(0);
// multiple breaks test
assertEquals(expected, exec(
"Map outer = ['test1' : '1'];" +
"Map inner = ['test0' : '2'];" +
"boolean found = false;" +
"int i = 0, j = 0;" +
"List keys = ['test0', 'test1', 'test2'];" +
"for (; i < keys.size(); ++i) {" +
" if (outer.containsKey(keys[i])) {" +
" for (; j < keys.size(); ++j) {" +
" if (inner.containsKey(keys[j])) {" +
" found = true;" +
" break;" +
" }" +
" }" +
" if (found) {" +
" break;" +
" }" +
" }" +
"}" +
"[i, j];"
));
expected.set(1, 3);
// multiple breaks test, ignore inner break
assertEquals(expected, exec(
"Map outer = ['test1' : '1'];" +
"Map inner = ['test3' : '2'];" +
"int i = 0, j = 0;" +
"boolean found = false;" +
"List keys = ['test0', 'test1', 'test2'];" +
"for (; i < keys.size(); ++i) {" +
" if (outer.containsKey(keys[i])) {" +
" for (; j < keys.size(); ++j) {" +
" if (found) {" +
" break;" +
" }" +
" }" +
" found = true;" +
" if (found) {" +
" break;" +
" }" +
" }" +
"}" +
"[i, j];"
));
expected.set(0, 3);
expected.set(1, 1);
// multiple breaks test, ignore outer break
assertEquals(expected, exec(
"Map outer = ['test3' : '1'];" +
"Map inner = ['test1' : '2'];" +
"int i = 0, j = 0;" +
"boolean found = false;" +
"List keys = ['test0', 'test1', 'test2'];" +
"for (; i < keys.size(); ++i) {" +
" if (outer.containsKey('test3')) {" +
" for (; j < keys.size(); ++j) {" +
" if (inner.containsKey(keys[j])) {" +
" break;" +
" }" +
" }" +
" if (found) {" +
" break;" +
" }" +
" }" +
"}" +
"[i, j];"
));
}
// tests both single break and multiple breaks used in a script
public void testForEachWithBreak() {
// single break test
assertEquals(1, exec(
"Map settings = ['test1' : '1'];" +
"int i = 0;" +
"List keys = ['test0', 'test1', 'test2'];" +
"for (String key : keys) {" +
" if (settings.containsKey(key)) {" +
" break;" +
" }" +
" ++i;" +
"}" +
"return i;"
));
List<Integer> expected = new ArrayList<>();
expected.add(1);
expected.add(0);
// multiple breaks test
assertEquals(expected, exec(
"Map outer = ['test1' : '1'];" +
"Map inner = ['test0' : '2'];" +
"int i = 0, j = 0;" +
"boolean found = false;" +
"List keys = ['test0', 'test1', 'test2'];" +
"for (String okey : keys) {" +
" if (outer.containsKey(okey)) {" +
" for (String ikey : keys) {" +
" if (inner.containsKey(ikey)) {" +
" found = true;" +
" break;" +
" }" +
" ++j;" +
" }" +
" if (found) {" +
" break;" +
" }" +
" }" +
" ++i;" +
"}" +
"[i, j];"
));
expected.set(0, 3);
expected.set(1, 1);
// multiple breaks test, ignore outer break
assertEquals(expected, exec(
"Map outer = ['test1' : '1'];" +
"Map inner = ['test1' : '1'];" +
"int i = 0, j = 0;" +
"boolean found = false;" +
"List keys = ['test0', 'test1', 'test2'];" +
"for (String okey : keys) {" +
" if (outer.containsKey(okey)) {" +
" for (String ikey : keys) {" +
" if (inner.containsKey(ikey)) {" +
" break;" +
" }" +
" ++j;" +
" }" +
" if (found) {" +
" break;" +
" }" +
" }" +
" ++i;" +
"}" +
"[i, j];"
));
expected.set(0, 1);
expected.set(1, 3);
// multiple breaks test, ignore inner break
assertEquals(expected, exec(
"Map outer = ['test1' : '1'];" +
"Map inner = ['test1' : '1'];" +
"int i = 0, j = 0;" +
"boolean found = false;" +
"List keys = ['test0', 'test1', 'test2'];" +
"for (String okey : keys) {" +
" if (outer.containsKey(okey)) {" +
" for (String ikey : keys) {" +
" if (found) {" +
" break;" +
" }" +
" ++j;" +
" }" +
" found = true;" +
" if (found) {" +
" break;" +
" }" +
" }" +
" ++i;" +
"}" +
"[i, j];"
));
}
}