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

Merge pull request #18871 from jdconrad/cast 

Fix Casting Bug
This commit is contained in:
Jack Conradson 2016-06-14 14:45:26 -07:00 committed by GitHub
parent 14d6b04944 5cef06fa3e
commit f132a8f1c8
2 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
modules/lang-painless/src/main/java/org/elasticsearch/painless/AnalyzerCaster.java
View File

@ -40,6 +40,10 @@ public final class AnalyzerCaster {
case DEF:
return new Cast(actual, Definition.DEF_TYPE, explicit, false, false, true, false);
case OBJECT:
if (Definition.OBJECT_TYPE.equals(expected) && internal)
return new Cast(actual, actual, explicit, false, false, false, true);
break;
case BOOL_OBJ:
if (internal)
return new Cast(actual, actual, explicit, false, false, false, true);
@ -62,6 +66,10 @@ public final class AnalyzerCaster {
case DEF:
return new Cast(actual, Definition.DEF_TYPE, explicit, false, false, true, false);
case OBJECT:
if (Definition.OBJECT_TYPE.equals(expected) && internal)
return new Cast(actual, actual, explicit, false, false, false, true);
break;
case NUMBER:
case BYTE_OBJ:
if (internal)
@ -117,6 +125,10 @@ public final class AnalyzerCaster {
case DEF:
return new Cast(actual, Definition.DEF_TYPE, explicit, false, false, true, false);
case OBJECT:
if (Definition.OBJECT_TYPE.equals(expected) && internal)
return new Cast(actual, actual, explicit, false, false, false, true);
break;
case NUMBER:
case SHORT_OBJ:
if (internal)
@ -172,6 +184,10 @@ public final class AnalyzerCaster {
case DEF:
return new Cast(actual, Definition.DEF_TYPE, explicit, false, false, true, false);
case OBJECT:
if (Definition.OBJECT_TYPE.equals(expected) && internal)
return new Cast(actual, actual, explicit, false, false, false, true);
break;
case NUMBER:
case CHAR_OBJ:
if (internal)
@ -229,6 +245,10 @@ public final class AnalyzerCaster {
case DEF:
return new Cast(actual, Definition.DEF_TYPE, explicit, false, false, true, false);
case OBJECT:
if (Definition.OBJECT_TYPE.equals(expected) && internal)
return new Cast(actual, actual, explicit, false, false, false, true);
break;
case NUMBER:
case INT_OBJ:
if (internal)
@ -284,6 +304,10 @@ public final class AnalyzerCaster {
case DEF:
return new Cast(actual, Definition.DEF_TYPE, explicit, false, false, true, false);
case OBJECT:
if (Definition.OBJECT_TYPE.equals(expected) && internal)
return new Cast(actual, actual, explicit, false, false, false, true);
break;
case NUMBER:
case LONG_OBJ:
if (internal)
@ -339,6 +363,10 @@ public final class AnalyzerCaster {
case DEF:
return new Cast(actual, Definition.DEF_TYPE, explicit, false, false, true, false);
case OBJECT:
if (Definition.OBJECT_TYPE.equals(expected) && internal)
return new Cast(actual, actual, explicit, false, false, false, true);
break;
case NUMBER:
case FLOAT_OBJ:
if (internal)
@ -392,6 +420,10 @@ public final class AnalyzerCaster {
case DEF:
return new Cast(actual, Definition.DEF_TYPE, explicit, false, false, true, false);
case OBJECT:
if (Definition.OBJECT_TYPE.equals(expected) && internal)
return new Cast(actual, actual, explicit, false, false, false, true);
break;
case NUMBER:
case DOUBLE_OBJ:
if (internal)
@ -432,6 +464,45 @@ public final class AnalyzerCaster {
break;
case OBJECT:
if (Definition.OBJECT_TYPE.equals(actual))
switch (expected.sort) {
case BYTE:
if (internal && explicit)
return new Cast(actual, Definition.BYTE_OBJ_TYPE, true, false, true, false, false);
break;
case SHORT:
if (internal && explicit)
return new Cast(actual, Definition.SHORT_OBJ_TYPE, true, false, true, false, false);
break;
case CHAR:
if (internal && explicit)
return new Cast(actual, Definition.CHAR_OBJ_TYPE, true, false, true, false, false);
break;
case INT:
if (internal && explicit)
return new Cast(actual, Definition.INT_OBJ_TYPE, true, false, true, false, false);
break;
case LONG:
if (internal && explicit)
return new Cast(actual, Definition.LONG_OBJ_TYPE, true, false, true, false, false);
break;
case FLOAT:
if (internal && explicit)
return new Cast(actual, Definition.FLOAT_OBJ_TYPE, true, false, true, false, false);
break;
case DOUBLE:
if (internal && explicit)
return new Cast(actual, Definition.DOUBLE_OBJ_TYPE, true, false, true, false, false);
break;
}
break;
case NUMBER:
switch (expected.sort) {
case BYTE:

5
modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java
View File

@ -229,4 +229,9 @@ public class WhenThingsGoWrongTests extends ScriptTestCase {
assertThat(e.getMessage(), containsString("\\ujjjj"));
}
public void testBadBoxingCast() {
expectScriptThrows(ClassCastException.class, () -> {
exec("BitSet bs = new BitSet(); bs.and(2);");
});
}
}