[NO ISSUE][OTH] Stabilize geo/like-expression tests
Change-Id: Ib0ba72560a098a0b3b9c9efa7ced05cfd206a222
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19216
Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Ali Alsuliman <ali.al.solaiman@gmail.com>
Reviewed-by: Peeyush Gupta <peeyush.gupta@couchbase.com>
Tested-by: Ali Alsuliman <ali.al.solaiman@gmail.com>
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/geojson/single-method/predicate.15.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/geojson/single-method/predicate.15.query.sqlpp
index c1637ce..c43c64e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/geojson/single-method/predicate.15.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/geojson/single-method/predicate.15.query.sqlpp
@@ -16,18 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-st_z_max(st_geom_from_text("POLYGON EMPTY"));
-st_z_min(st_geom_from_text("POLYGON EMPTY"));
-st_z_max(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 0, 1 -1 0, 0 0 0))"));
-st_z_min(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 0, 1 -1 0, 0 0 0))"));
-st_z_max(st_geom_from_text("POLYGON Z ((0 0 1, 1 1 2, 1 -1 3, 0 0 1))"));
-st_z_min(st_geom_from_text("POLYGON Z ((0 0 1, 1 1 2, 1 -1 3, 0 0 1))"));
-st_z_max(st_geom_from_text("POLYGON Z ((0 0 -1, 1 1 -2, 1 -1 -3, 0 0 -1))"));
-st_z_min(st_geom_from_text("POLYGON Z ((0 0 -1, 1 1 -2, 1 -1 -3, 0 0 -1))"));
-st_z_max(st_geom_from_text("POLYGON Z ((0 0 -1, 1 1 0, 1 -1 1, 0 0 -1))"));
-st_z_min(st_geom_from_text("POLYGON Z ((0 0 -1, 1 1 0, 1 -1 1, 0 0 -1))"));
-st_z_max(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 0, 1 -1 2, 0 0 0))"));
-st_z_min(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 0, 1 -1 2, 0 0 0))"));
-st_z_max(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 -1, 1 -1 0, 0 0 0))"));
-st_z_min(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 -1, 1 -1 0, 0 0 0))"));
\ No newline at end of file
+{
+"a": st_z_max(st_geom_from_text("POLYGON EMPTY")),
+"b": st_z_min(st_geom_from_text("POLYGON EMPTY")),
+"c": st_z_max(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 0, 1 -1 0, 0 0 0))")),
+"d": st_z_min(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 0, 1 -1 0, 0 0 0))")),
+"e": st_z_max(st_geom_from_text("POLYGON Z ((0 0 1, 1 1 2, 1 -1 3, 0 0 1))")),
+"f": st_z_min(st_geom_from_text("POLYGON Z ((0 0 1, 1 1 2, 1 -1 3, 0 0 1))")),
+"g": st_z_max(st_geom_from_text("POLYGON Z ((0 0 -1, 1 1 -2, 1 -1 -3, 0 0 -1))")),
+"h": st_z_min(st_geom_from_text("POLYGON Z ((0 0 -1, 1 1 -2, 1 -1 -3, 0 0 -1))")),
+"i": st_z_max(st_geom_from_text("POLYGON Z ((0 0 -1, 1 1 0, 1 -1 1, 0 0 -1))")),
+"j": st_z_min(st_geom_from_text("POLYGON Z ((0 0 -1, 1 1 0, 1 -1 1, 0 0 -1))")),
+"k": st_z_max(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 0, 1 -1 2, 0 0 0))")),
+"l": st_z_min(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 0, 1 -1 2, 0 0 0))")),
+"m": st_z_max(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 -1, 1 -1 0, 0 0 0))")),
+"n": st_z_min(st_geom_from_text("POLYGON Z ((0 0 0, 1 1 -1, 1 -1 0, 0 0 0))"))
+};
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/like-expression/like-expression.23.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/like-expression/like-expression.23.query.sqlpp
index 6e0749c..cbeca01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/like-expression/like-expression.23.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/like-expression/like-expression.23.query.sqlpp
@@ -16,16 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-select * from [{"x":"fvxb%"}] p where x like "fvxb\\%";
-select * from [{"x":"fv%%\\bn\\%"}] p where x like "fv\\%\\%\\\\bn\\\\%";
-select * from [{"x":"fvxbx"}] p where x like "fvxb\\%";
-select * from [{"x":"fv%xbx"}] p where x like "fv\\%xb%";
-select * from [{"x":"a\\%bcd"}] p where x like "a\\\\\\%bcd";
-select * from [{"x":"abc\n%"}] p where x like "abc\n\\%";
-select * from [{"x":"abc\n%"}] p where x like "abc\n%";
-select * from [{"x":"abc%cbz"},{"x":"abc%%x"},{"x":"abc"}] p where x like "abc\\%%";
-select * from [{"x":"vhjdbvsabc_fjdhf"},{"x":"abc%%x"},{"x":"abc"}] p where x like "%abc\\_%";
-select * from [{"x":"abc_fjdhf"},{"x":"abc%%x"},{"x":"abc"}] p where x like "abc\\_%";
-select * from [{"x":"abc_fjdhf"},{"x":"abc%x"},{"x":"abc%yz"}] p where x like "abc\\%_";
-select * from [{"x":"abc_fjdhf"},{"x":"abc%x"},{"x":"abc%yz"},{"x":"abc_"}] p where x like "abc\\_";
+{
+"t1": (select * from [{"x":"fvxb%"}] p where x like "fvxb\\%"),
+"t2": (select * from [{"x":"fv%%\\bn\\%"}] p where x like "fv\\%\\%\\\\bn\\\\%"),
+"t3": (select * from [{"x":"fvxbx"}] p where x like "fvxb\\%"),
+"t4": (select * from [{"x":"fv%xbx"}] p where x like "fv\\%xb%"),
+"t5": (select * from [{"x":"a\\%bcd"}] p where x like "a\\\\\\%bcd"),
+"t6": (select * from [{"x":"abc\n%"}] p where x like "abc\n\\%"),
+"t7": (select * from [{"x":"abc\n%"}] p where x like "abc\n%"),
+"t8": (select * from [{"x":"abc%cbz"},{"x":"abc%%x"},{"x":"abc"}] p where x like "abc\\%%"),
+"t9": (select * from [{"x":"vhjdbvsabc_fjdhf"},{"x":"abc%%x"},{"x":"abc"}] p where x like "%abc\\_%"),
+"t10": (select * from [{"x":"abc_fjdhf"},{"x":"abc%%x"},{"x":"abc"}] p where x like "abc\\_%"),
+"t11": (select * from [{"x":"abc_fjdhf"},{"x":"abc%x"},{"x":"abc%yz"}] p where x like "abc\\%_"),
+"t12": (select * from [{"x":"abc_fjdhf"},{"x":"abc%x"},{"x":"abc%yz"},{"x":"abc_"}] p where x like "abc\\_")
+}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/geojson/single-method/result.15.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/geojson/single-method/result.15.adm
index 9243a76..14ec637 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/geojson/single-method/result.15.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/geojson/single-method/result.15.adm
@@ -1,14 +1 @@
-NaN
-NaN
-0.0
-0.0
-3.0
-1.0
--1.0
--3.0
-1.0
--1.0
-2.0
-0.0
-0.0
--1.0
\ No newline at end of file
+{ "a": NaN, "b": NaN, "c": 0.0, "d": 0.0, "e": 3.0, "f": 1.0, "g": -1.0, "h": -3.0, "i": 1.0, "j": -1.0, "k": 2.0, "l": 0.0, "m": 0.0, "n": -1.0 }
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/like-expression/like-expression.23.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/like-expression/like-expression.23.adm
index 30dd010..77eef00 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/like-expression/like-expression.23.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/like-expression/like-expression.23.adm
@@ -1,14 +1 @@
-{ "p": { "x": "fvxb%" } }
-{ "p": { "x": "fv%%\\bn\\%" } }
-
-{ "p": { "x": "fv%xbx" } }
-{ "p": { "x": "a\\%bcd" } }
-{ "p": { "x": "abc\n%" } }
-{ "p": { "x": "abc\n%" } }
-{ "p": { "x": "abc%cbz" } }
-{ "p": { "x": "abc%%x" } }
-
-{ "p": { "x": "vhjdbvsabc_fjdhf" } }
-{ "p": { "x": "abc_fjdhf" } }
-{ "p": { "x": "abc%x" } }
-{ "p": { "x": "abc_" } }
\ No newline at end of file
+{ "t1": [ { "p": { "x": "fvxb%" } } ], "t2": [ { "p": { "x": "fv%%\\bn\\%" } } ], "t3": [ ], "t4": [ { "p": { "x": "fv%xbx" } } ], "t5": [ { "p": { "x": "a\\%bcd" } } ], "t6": [ { "p": { "x": "abc\n%" } } ], "t7": [ { "p": { "x": "abc\n%" } } ], "t8": [ { "p": { "x": "abc%cbz" } }, { "p": { "x": "abc%%x" } } ], "t9": [ { "p": { "x": "vhjdbvsabc_fjdhf" } } ], "t10": [ { "p": { "x": "abc_fjdhf" } } ], "t11": [ { "p": { "x": "abc%x" } } ], "t12": [ { "p": { "x": "abc_" } } ] }
\ No newline at end of file