diff --git ql/src/test/queries/clientpositive/decimal_3.q ql/src/test/queries/clientpositive/decimal_3.q index 2fed7ad..28211e3 100644 --- ql/src/test/queries/clientpositive/decimal_3.q +++ ql/src/test/queries/clientpositive/decimal_3.q @@ -7,24 +7,22 @@ STORED AS TEXTFILE; LOAD DATA LOCAL INPATH '../data/files/kv7.txt' INTO TABLE DECIMAL_3; -SELECT * FROM DECIMAL_3; +SELECT * FROM DECIMAL_3 ORDER BY key, value; -SELECT * FROM DECIMAL_3 ORDER BY key; +SELECT * FROM DECIMAL_3 ORDER BY key DESC, value DESC; -SELECT * FROM DECIMAL_3 ORDER BY key DESC; +SELECT * FROM DECIMAL_3 ORDER BY key, value; -SELECT * FROM DECIMAL_3 ORDER BY (key, value); - -SELECT DISTINCT key FROM DECIMAL_3; +SELECT DISTINCT key FROM DECIMAL_3 ORDER BY key; SELECT key, sum(value) FROM DECIMAL_3 GROUP BY key ORDER BY key; -SELECT value, sum(key) FROM DECIMAL_3 GROUP BY value; +SELECT value, sum(key) FROM DECIMAL_3 GROUP BY value ORDER BY value; -SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key); +SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key) ORDER BY a.key, a.value, b.value; -SELECT * FROM DECIMAL_3 WHERE key=3.14; +SELECT * FROM DECIMAL_3 WHERE key=3.14 ORDER BY key, value; -SELECT * FROM DECIMAL_3 WHERE key=3.140; +SELECT * FROM DECIMAL_3 WHERE key=3.140 ORDER BY key, value; DROP TABLE DECIMAL_3; diff --git ql/src/test/queries/clientpositive/decimal_serde.q ql/src/test/queries/clientpositive/decimal_serde.q index d199c85..3556807 100644 --- ql/src/test/queries/clientpositive/decimal_serde.q +++ ql/src/test/queries/clientpositive/decimal_serde.q @@ -10,7 +10,7 @@ STORED AS TEXTFILE; LOAD DATA LOCAL INPATH '../data/files/kv7.txt' INTO TABLE DECIMAL_TEXT; -SELECT * FROM DECIMAL_TEXT ORDER BY key; +SELECT * FROM DECIMAL_TEXT ORDER BY key, value; CREATE TABLE DECIMAL_RC STORED AS RCFile AS @@ -29,7 +29,7 @@ MAP KEYS TERMINATED BY '\003' STORED AS SEQUENCEFILE AS SELECT * FROM DECIMAL_LAZY_COL ORDER BY key; -SELECT * FROM DECIMAL_SEQUENCE; +SELECT * FROM DECIMAL_SEQUENCE ORDER BY key, value; DROP TABLE IF EXISTS DECIMAL_TEXT; DROP TABLE IF EXISTS DECIMAL_RC; diff --git ql/src/test/results/clientpositive/decimal_3.q.out ql/src/test/results/clientpositive/decimal_3.q.out index 30e6d92..440ce9e 100644 --- ql/src/test/results/clientpositive/decimal_3.q.out +++ ql/src/test/results/clientpositive/decimal_3.q.out @@ -19,57 +19,11 @@ PREHOOK: Output: default@decimal_3 POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv7.txt' INTO TABLE DECIMAL_3 POSTHOOK: type: LOAD POSTHOOK: Output: default@decimal_3 -PREHOOK: query: SELECT * FROM DECIMAL_3 +PREHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key, value PREHOOK: type: QUERY PREHOOK: Input: default@decimal_3 #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_3 -POSTHOOK: type: QUERY -POSTHOOK: Input: default@decimal_3 -#### A masked pattern was here #### --4.4E+3 4400 -1E+99 0 -1E-99 0 -0 0 -1E+2 100 -1E+1 10 -1 1 -0.1 0 -0.01 0 -2E+2 200 -2E+1 20 -2 2 -0 0 -0.2 0 -0.02 0 -0.3 0 -0.33 0 -0.333 0 --0.3 0 --0.33 0 --0.333 0 -1 1 -2 2 -3.14 3 --1.12 -1 --1.12 -1 --1.122 -11 -1.12 1 -1.122 1 -124 124 -125.2 125 --1255.49 -1255 -3.14 3 -3.14 3 -3.14 4 -0.9999999999999999999999999 1 --1234567890.123456789 -1234567890 -1234567890.12345678 1234567890 -PREHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key -PREHOOK: type: QUERY -PREHOOK: Input: default@decimal_3 -#### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key +POSTHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_3 #### A masked pattern was here #### @@ -111,11 +65,11 @@ POSTHOOK: Input: default@decimal_3 2E+2 200 1234567890.12345678 1234567890 1E+99 0 -PREHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key DESC +PREHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key DESC, value DESC PREHOOK: type: QUERY PREHOOK: Input: default@decimal_3 #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key DESC +POSTHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key DESC, value DESC POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_3 #### A masked pattern was here #### @@ -127,9 +81,9 @@ POSTHOOK: Input: default@decimal_3 1E+2 100 2E+1 20 1E+1 10 +3.14 4 3.14 3 3.14 3 -3.14 4 3.14 3 2 2 2 2 @@ -157,11 +111,11 @@ POSTHOOK: Input: default@decimal_3 -1255.49 -1255 -4.4E+3 4400 -1234567890.123456789 -1234567890 -PREHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY (key, value) +PREHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key, value PREHOOK: type: QUERY PREHOOK: Input: default@decimal_3 #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY (key, value) +POSTHOOK: query: SELECT * FROM DECIMAL_3 ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_3 #### A masked pattern was here #### @@ -203,11 +157,11 @@ POSTHOOK: Input: default@decimal_3 2E+2 200 1234567890.12345678 1234567890 1E+99 0 -PREHOOK: query: SELECT DISTINCT key FROM DECIMAL_3 +PREHOOK: query: SELECT DISTINCT key FROM DECIMAL_3 ORDER BY key PREHOOK: type: QUERY PREHOOK: Input: default@decimal_3 #### A masked pattern was here #### -POSTHOOK: query: SELECT DISTINCT key FROM DECIMAL_3 +POSTHOOK: query: SELECT DISTINCT key FROM DECIMAL_3 ORDER BY key POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_3 #### A masked pattern was here #### @@ -281,11 +235,11 @@ POSTHOOK: Input: default@decimal_3 2E+2 200 1234567890.12345678 1234567890 1E+99 0 -PREHOOK: query: SELECT value, sum(key) FROM DECIMAL_3 GROUP BY value +PREHOOK: query: SELECT value, sum(key) FROM DECIMAL_3 GROUP BY value ORDER BY value PREHOOK: type: QUERY PREHOOK: Input: default@decimal_3 #### A masked pattern was here #### -POSTHOOK: query: SELECT value, sum(key) FROM DECIMAL_3 GROUP BY value +POSTHOOK: query: SELECT value, sum(key) FROM DECIMAL_3 GROUP BY value ORDER BY value POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_3 #### A masked pattern was here #### @@ -306,11 +260,11 @@ POSTHOOK: Input: default@decimal_3 200 2E+2 4400 -4.4E+3 1234567890 1234567890.12345678 -PREHOOK: query: SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key) +PREHOOK: query: SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key) ORDER BY a.key, a.value, b.value PREHOOK: type: QUERY PREHOOK: Input: default@decimal_3 #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key) +POSTHOOK: query: SELECT * FROM DECIMAL_3 a JOIN DECIMAL_3 b ON (a.key = b.key) ORDER BY a.key, a.value, b.value POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_3 #### A masked pattern was here #### @@ -351,15 +305,15 @@ POSTHOOK: Input: default@decimal_3 3.14 3 3.14 3 3.14 3 3.14 3 3.14 3 3.14 3 -3.14 3 3.14 4 3.14 3 3.14 3 3.14 3 3.14 3 3.14 3 3.14 3 -3.14 3 3.14 4 3.14 3 3.14 3 3.14 3 3.14 3 3.14 3 3.14 3 3.14 3 3.14 4 +3.14 3 3.14 4 +3.14 3 3.14 4 3.14 4 3.14 3 3.14 4 3.14 3 3.14 4 3.14 3 @@ -372,11 +326,11 @@ POSTHOOK: Input: default@decimal_3 2E+2 200 2E+2 200 1234567890.12345678 1234567890 1234567890.12345678 1234567890 1E+99 0 1E+99 0 -PREHOOK: query: SELECT * FROM DECIMAL_3 WHERE key=3.14 +PREHOOK: query: SELECT * FROM DECIMAL_3 WHERE key=3.14 ORDER BY key, value PREHOOK: type: QUERY PREHOOK: Input: default@decimal_3 #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_3 WHERE key=3.14 +POSTHOOK: query: SELECT * FROM DECIMAL_3 WHERE key=3.14 ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_3 #### A masked pattern was here #### @@ -384,11 +338,11 @@ POSTHOOK: Input: default@decimal_3 3.14 3 3.14 3 3.14 4 -PREHOOK: query: SELECT * FROM DECIMAL_3 WHERE key=3.140 +PREHOOK: query: SELECT * FROM DECIMAL_3 WHERE key=3.140 ORDER BY key, value PREHOOK: type: QUERY PREHOOK: Input: default@decimal_3 #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_3 WHERE key=3.140 +POSTHOOK: query: SELECT * FROM DECIMAL_3 WHERE key=3.140 ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_3 #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/decimal_serde.q.out ql/src/test/results/clientpositive/decimal_serde.q.out index 10e9fd5..a90be8c 100644 --- ql/src/test/results/clientpositive/decimal_serde.q.out +++ ql/src/test/results/clientpositive/decimal_serde.q.out @@ -31,11 +31,11 @@ PREHOOK: Output: default@decimal_text POSTHOOK: query: LOAD DATA LOCAL INPATH '../data/files/kv7.txt' INTO TABLE DECIMAL_TEXT POSTHOOK: type: LOAD POSTHOOK: Output: default@decimal_text -PREHOOK: query: SELECT * FROM DECIMAL_TEXT ORDER BY key +PREHOOK: query: SELECT * FROM DECIMAL_TEXT ORDER BY key, value PREHOOK: type: QUERY PREHOOK: Input: default@decimal_text #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_TEXT ORDER BY key +POSTHOOK: query: SELECT * FROM DECIMAL_TEXT ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_text #### A masked pattern was here #### @@ -120,11 +120,11 @@ SELECT * FROM DECIMAL_LAZY_COL ORDER BY key POSTHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: Input: default@decimal_lazy_col POSTHOOK: Output: default@DECIMAL_SEQUENCE -PREHOOK: query: SELECT * FROM DECIMAL_SEQUENCE +PREHOOK: query: SELECT * FROM DECIMAL_SEQUENCE ORDER BY key, value PREHOOK: type: QUERY PREHOOK: Input: default@decimal_sequence #### A masked pattern was here #### -POSTHOOK: query: SELECT * FROM DECIMAL_SEQUENCE +POSTHOOK: query: SELECT * FROM DECIMAL_SEQUENCE ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@decimal_sequence #### A masked pattern was here ####