You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@drill.apache.org by ja...@apache.org on 2013/08/16 03:44:54 UTC

[16/27] cleanup comparison function tests. use a single json file, and abstract out redundant code.

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/longEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/longEqual.json
deleted file mode 100644
index 0a7827b..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "REQUIRED"},
-            	  {name: "red", type: "BIGINT", mode: "REQUIRED"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "REQUIRED"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red == red"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/longGreaterThan.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longGreaterThan.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/longGreaterThan.json
deleted file mode 100644
index 6d2a415..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longGreaterThan.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "REQUIRED"},
-            	  {name: "red", type: "BIGINT", mode: "REQUIRED"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "REQUIRED"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red > red"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/longGreaterThanEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longGreaterThanEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/longGreaterThanEqual.json
deleted file mode 100644
index 7dffbe8..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longGreaterThanEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "REQUIRED"},
-            	  {name: "red", type: "BIGINT", mode: "REQUIRED"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "REQUIRED"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red >= red"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/longLessThan.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longLessThan.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/longLessThan.json
deleted file mode 100644
index ace6eb0..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longLessThan.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "REQUIRED"},
-            	  {name: "red", type: "BIGINT", mode: "REQUIRED"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "REQUIRED"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red < red"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/longLessThanEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longLessThanEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/longLessThanEqual.json
deleted file mode 100644
index 5900f73..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longLessThanEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "REQUIRED"},
-            	  {name: "red", type: "BIGINT", mode: "REQUIRED"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "REQUIRED"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red <= red"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/longNotEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longNotEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/longNotEqual.json
deleted file mode 100644
index 4db69c8..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/longNotEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "REQUIRED"},
-            	  {name: "red", type: "BIGINT", mode: "REQUIRED"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "REQUIRED"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red <> red"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntEqual.json
deleted file mode 100644
index 212c73a..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "REQUIRED"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red == red"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntGreaterThan.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntGreaterThan.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntGreaterThan.json
deleted file mode 100644
index c1d42fa..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntGreaterThan.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "OPTIONAL"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red > red"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntGreaterThanEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntGreaterThanEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntGreaterThanEqual.json
deleted file mode 100644
index c560d0b..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntGreaterThanEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "OPTIONAL"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red >= red"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntLessThan.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntLessThan.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntLessThan.json
deleted file mode 100644
index 2cf2869..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntLessThan.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "OPTIONAL"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red < (red + 1)"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntLessThanEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntLessThanEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntLessThanEqual.json
deleted file mode 100644
index 16b19d3..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntLessThanEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "OPTIONAL"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red <= (red + 1)"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntNotEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntNotEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntNotEqual.json
deleted file mode 100644
index 2e9778a..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableBigIntNotEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "BIGINT", mode: "OPTIONAL"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "red != (green + red)"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntEqual.json
deleted file mode 100644
index ba9cba8..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "REQUIRED"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "REQUIRED"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "blue == blue"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntGreaterThan.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntGreaterThan.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntGreaterThan.json
deleted file mode 100644
index 6a3fc33..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntGreaterThan.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "OPTIONAL"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "blue > blue"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntGreaterThanEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntGreaterThanEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntGreaterThanEqual.json
deleted file mode 100644
index daa34f9..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntGreaterThanEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "OPTIONAL"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "blue >= blue"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntLessThan.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntLessThan.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntLessThan.json
deleted file mode 100644
index 0186e17..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntLessThan.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "OPTIONAL"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "blue < blue"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntLessThanEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntLessThanEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntLessThanEqual.json
deleted file mode 100644
index 2ee40eb..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntLessThanEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "OPTIONAL"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "blue <= blue"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/be77d5aa/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntNotEqual.json
----------------------------------------------------------------------
diff --git a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntNotEqual.json b/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntNotEqual.json
deleted file mode 100644
index 494f938..0000000
--- a/sandbox/prototype/exec/java-exec/src/test/resources/functions/nullableIntNotEqual.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    head:{
-        type:"APACHE_DRILL_PHYSICAL",
-        version:"1",
-        generator:{
-            type:"manual"
-        }
-    },
-	graph:[
-        {
-            @id:1,
-            pop:"mock-sub-scan",
-            url: "http://apache.org",
-            entries:[
-            	{records: 100, types: [
-            	  {name: "blue", type: "INT", mode: "OPTIONAL"},
-            	  {name: "red", type: "BIGINT", mode: "OPTIONAL"},
-            	  {name: "yellow", type: "FLOAT8", mode: "REQUIRED"},
-            	  {name: "green", type: "INT", mode: "OPTIONAL"}
-            	]}
-            ]
-        },
-        {
-            @id:2,
-            child: 1,
-            pop:"filter",
-            expr: "blue != (green + blue)"
-        },
-        {
-            @id: 3,
-            child: 2,
-            pop: "screen"
-        }
-    ]
-}
\ No newline at end of file