test cleanup
diff --git a/asterix-app/data/type_promotion.adm b/asterix-app/data/type_promotion.adm
index 415ae1b..5a120d4 100644
--- a/asterix-app/data/type_promotion.adm
+++ b/asterix-app/data/type_promotion.adm
@@ -26,19 +26,7 @@
"int32": 10000i16,
"int64": 10000i16,
"float": 10000i16,
- "double": 10000i16,
- "int8_u": {{ }},
- "int8_o": [ ],
- "int16_u": {{ }},
- "int16_o": [ ],
- "int32_u": {{ }},
- "int32_o": [ ],
- "int64_u": {{ }},
- "int64_o": [ ],
- "float_u": {{ }},
- "float_o": [ ],
- "double_u": {{ }},
- "double_o": [ ]
+ "double": 10000i16
}
{
"id": 3,
@@ -47,19 +35,7 @@
"int32": 1000000i32,
"int64": 1000000i32,
"float": 1000000i32,
- "double": 1000000i32,
- "int8_u": {{ }},
- "int8_o": [ ],
- "int16_u": {{ }},
- "int16_o": [ ],
- "int32_u": {{ }},
- "int32_o": [ ],
- "int64_u": {{ }},
- "int64_o": [ ],
- "float_u": {{ }},
- "float_o": [ ],
- "double_u": {{ }},
- "double_o": [ ]
+ "double": 1000000i32
}
{
"id": 4,
@@ -68,19 +44,7 @@
"int32": 1000000,
"int64": 1000000,
"float": 1000000,
- "double": 1000000,
- "int8_u": {{ }},
- "int8_o": [ ],
- "int16_u": {{ }},
- "int16_o": [ ],
- "int32_u": {{ }},
- "int32_o": [ ],
- "int64_u": {{ }},
- "int64_o": [ ],
- "float_u": {{ }},
- "float_o": [ ],
- "double_u": {{ }},
- "double_o": [ ]
+ "double": 1000000
}
{
"id": 5,
@@ -89,17 +53,5 @@
"int32": 1000000,
"int64": 10000000000,
"float": 1000000,
- "double": 10000000000,
- "int8_u": {{ }},
- "int8_o": [ ],
- "int16_u": {{ }},
- "int16_o": [ ],
- "int32_u": {{ }},
- "int32_o": [ ],
- "int64_u": {{ }},
- "int64_o": [ ],
- "float_u": {{ }},
- "float_o": [ ],
- "double_u": {{ }},
- "double_o": [ ]
-}
\ No newline at end of file
+ "double": 10000000000
+}
diff --git a/asterix-app/src/test/resources/runtimets/queries/load/type_promotion_0/type_promotion_0.2.update.aql b/asterix-app/src/test/resources/runtimets/queries/load/type_promotion_0/type_promotion_0.2.update.aql
index 891d41a..55fc590 100644
--- a/asterix-app/src/test/resources/runtimets/queries/load/type_promotion_0/type_promotion_0.2.update.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/load/type_promotion_0/type_promotion_0.2.update.aql
@@ -1,3 +1,3 @@
use dataverse TestDataverse;
-load dataset TestSet using localfs (("path"="nc1://data/type_promotion.adm"),("format"="adm"));
\ No newline at end of file
+load dataset TestSet using localfs (("path"="nc1://data/type_promotion.adm"),("format"="adm"));
diff --git a/asterix-app/src/test/resources/runtimets/results/load/type_promotion_0/type_promotion_0.1.adm b/asterix-app/src/test/resources/runtimets/results/load/type_promotion_0/type_promotion_0.1.adm
index be6a5d0..7b0720f 100644
--- a/asterix-app/src/test/resources/runtimets/results/load/type_promotion_0/type_promotion_0.1.adm
+++ b/asterix-app/src/test/resources/runtimets/results/load/type_promotion_0/type_promotion_0.1.adm
@@ -1,5 +1,5 @@
-{ "id": 1i64, "int8_u": {{ 100i8 }}, "int8_o": [ 100i8 ], "int16_u": {{ 100i16, 10000i16 }}, "int16_o": [ 100i16, 10000i16 ], "int32_u": {{ 100, 10000, 1000000, 1000000 }}, "int32_o": [ 100, 10000, 1000000, 1000000 ], "int64_u": {{ 100i64, 10000i64, 1000000i64, 1000000i64, 10000000000i64 }}, "int64_o": [ 100i64, 10000i64, 1000000i64, 1000000i64, 10000000000i64 ], "float_u": {{ 100.0f, 10000.0f, 1000000.0f, 1000000.0f }}, "float_o": [ 100.0f, 10000.0f, 1000000.0f, 1000000.0f ], "double_u": {{ 100.0d, 10000.0d, 1000000.0d, 1000000.0d, 1.0E10d }}, "double_o": [ 100.0d, 10000.0d, 1000000.0d, 1000000.0d, 1.0E10d ], "int8": 100i8, "int16": 100i8, "int32": 100i8, "int64": 100i8, "float": 100i8, "double": 100i8 }
-{ "id": 2i64, "int8_u": {{ }}, "int8_o": [ ], "int16_u": {{ }}, "int16_o": [ ], "int32_u": {{ }}, "int32_o": [ ], "int64_u": {{ }}, "int64_o": [ ], "float_u": {{ }}, "float_o": [ ], "double_u": {{ }}, "double_o": [ ], "int8": 100i8, "int16": 10000i16, "int32": 10000i16, "int64": 10000i16, "float": 10000i16, "double": 10000i16 }
-{ "id": 3i64, "int8_u": {{ }}, "int8_o": [ ], "int16_u": {{ }}, "int16_o": [ ], "int32_u": {{ }}, "int32_o": [ ], "int64_u": {{ }}, "int64_o": [ ], "float_u": {{ }}, "float_o": [ ], "double_u": {{ }}, "double_o": [ ], "int8": 100i8, "int16": 10000i16, "int32": 1000000, "int64": 1000000, "float": 1000000, "double": 1000000 }
-{ "id": 4i64, "int8_u": {{ }}, "int8_o": [ ], "int16_u": {{ }}, "int16_o": [ ], "int32_u": {{ }}, "int32_o": [ ], "int64_u": {{ }}, "int64_o": [ ], "float_u": {{ }}, "float_o": [ ], "double_u": {{ }}, "double_o": [ ], "int8": 100i8, "int16": 10000i16, "int32": 1000000, "int64": 1000000, "float": 1000000, "double": 1000000 }
-{ "id": 5i64, "int8_u": {{ }}, "int8_o": [ ], "int16_u": {{ }}, "int16_o": [ ], "int32_u": {{ }}, "int32_o": [ ], "int64_u": {{ }}, "int64_o": [ ], "float_u": {{ }}, "float_o": [ ], "double_u": {{ }}, "double_o": [ ], "int8": 100i8, "int16": 10000i16, "int32": 1000000, "int64": 1410065408, "float": 1000000, "double": 1410065408 }
+{ "id": 1i64, "int8": 100i8, "int16": 100i16, "int32": 100, "int64": 100i64, "float": 100.0f, "double": 100.0d, "int8_u": {{ 100i8 }}, "int8_o": [ 100i8 ], "int16_u": {{ 100i16, 10000i16 }}, "int16_o": [ 100i16, 10000i16 ], "int32_u": {{ 100, 10000, 1000000, 1000000 }}, "int32_o": [ 100, 10000, 1000000, 1000000 ], "int64_u": {{ 100i64, 10000i64, 1000000i64, 1000000i64, 10000000000i64 }}, "int64_o": [ 100i64, 10000i64, 1000000i64, 1000000i64, 10000000000i64 ], "float_u": {{ 100.0f, 10000.0f, 1000000.0f, 1000000.0f }}, "float_o": [ 100.0f, 10000.0f, 1000000.0f, 1000000.0f ], "double_u": {{ 100.0d, 10000.0d, 1000000.0d, 1000000.0d, 1.0E10d }}, "double_o": [ 100.0d, 10000.0d, 1000000.0d, 1000000.0d, 1.0E10d ] }
+{ "id": 2i64, "int8": 100i8, "int16": 10000i16, "int32": 10000, "int64": 10000i64, "float": 10000.0f, "double": 10000.0d, "int8_u": null, "int8_o": null, "int16_u": null, "int16_o": null, "int32_u": null, "int32_o": null, "int64_u": null, "int64_o": null, "float_u": null, "float_o": null, "double_u": null, "double_o": null }
+{ "id": 3i64, "int8": 100i8, "int16": 10000i16, "int32": 1000000, "int64": 1000000i64, "float": 1000000.0f, "double": 1000000.0d, "int8_u": null, "int8_o": null, "int16_u": null, "int16_o": null, "int32_u": null, "int32_o": null, "int64_u": null, "int64_o": null, "float_u": null, "float_o": null, "double_u": null, "double_o": null }
+{ "id": 4i64, "int8": 100i8, "int16": 10000i16, "int32": 1000000, "int64": 1000000i64, "float": 1000000.0f, "double": 1000000.0d, "int8_u": null, "int8_o": null, "int16_u": null, "int16_o": null, "int32_u": null, "int32_o": null, "int64_u": null, "int64_o": null, "float_u": null, "float_o": null, "double_u": null, "double_o": null }
+{ "id": 5i64, "int8": 100i8, "int16": 10000i16, "int32": 1000000, "int64": 10000000000i64, "float": 1000000.0f, "double": 1.0E10d, "int8_u": null, "int8_o": null, "int16_u": null, "int16_o": null, "int32_u": null, "int32_o": null, "int64_u": null, "int64_o": null, "float_u": null, "float_o": null, "double_u": null, "double_o": null }