diff --git common/src/test/org/apache/hive/common/util/TestHiveStringUtils.java common/src/test/org/apache/hive/common/util/TestHiveStringUtils.java index 45d0deedf4..368a18747b 100644 --- common/src/test/org/apache/hive/common/util/TestHiveStringUtils.java +++ common/src/test/org/apache/hive/common/util/TestHiveStringUtils.java @@ -84,6 +84,9 @@ public void testStripComments() throws Exception { assertEquals("insert into foo (values(\"-\n--\n--\")", removeComments("--comment\n\ninsert into foo (values(\"-\n--\n--\")")); assertEquals("insert into foo (values(\"-\n--\n--\")", removeComments("\n\n--comment\n\ninsert into foo (values(\"-\n--\n--\")\n\n")); assertEquals("insert into foo (values('abc');\ninsert into foo (values('def');", removeComments( "insert into foo (values('abc');\n--comment\ninsert into foo (values('def');")); + + assertEquals("select 1,\n2", removeComments("select 1, --comments\n2 --comments")); + assertEquals("select 1 '--comments',\n2", removeComments("select 1 '--comments', --comments\n2 --comments")); } @Test diff --git ql/src/test/queries/clientpositive/cmdwithcomments.q ql/src/test/queries/clientpositive/cmdwithcomments.q index e9c0d434c6..4c2963e067 100644 --- ql/src/test/queries/clientpositive/cmdwithcomments.q +++ ql/src/test/queries/clientpositive/cmdwithcomments.q @@ -10,4 +10,6 @@ limit 1; --comment7 select "this is another --string value" from numt where idx =2; --comment8 +select 1, --comment +2; drop table numt; diff --git ql/src/test/results/clientpositive/cmdwithcomments.q.out ql/src/test/results/clientpositive/cmdwithcomments.q.out index 93c9431334..151a82c206 100644 --- ql/src/test/results/clientpositive/cmdwithcomments.q.out +++ ql/src/test/results/clientpositive/cmdwithcomments.q.out @@ -63,12 +63,23 @@ POSTHOOK: Input: default@numt this is another --string value PREHOOK: query: --comment8 -drop table numt +select 1, --comment +2 +PREHOOK: type: QUERY +PREHOOK: Input: _dummy_database@_dummy_table +#### A masked pattern was here #### +POSTHOOK: query: --comment8 +select 1, --comment +2 +POSTHOOK: type: QUERY +POSTHOOK: Input: _dummy_database@_dummy_table +#### A masked pattern was here #### +1 2 +PREHOOK: query: drop table numt PREHOOK: type: DROPTABLE PREHOOK: Input: default@numt PREHOOK: Output: default@numt -POSTHOOK: query: --comment8 -drop table numt +POSTHOOK: query: drop table numt POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@numt POSTHOOK: Output: default@numt