Skip to content

Commit

Permalink
HIVE-25379 : Fix external_jdbc_table.q and external_jdbc_table_perf.q
Browse files Browse the repository at this point in the history
  • Loading branch information
rkirti committed Dec 10, 2023
1 parent 918d23d commit 654edc1
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
14 changes: 7 additions & 7 deletions ql/src/test/queries/clientpositive/external_jdbc_table.q
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set hive.strict.checks.cartesian.product= false;

DROP TABLE APP.SIMPLE_DERBY_TABLE1;
DROP TABLE APP.SIMPLE_DERBY_TESTTABLE1;
CREATE TABLE simple_hive_table1 (ikey INT, bkey BIGINT, fkey FLOAT, dkey DOUBLE );

CREATE TEMPORARY FUNCTION dboutput AS 'org.apache.hadoop.hive.contrib.genericudf.example.GenericUDFDBOutput';
Expand All @@ -13,19 +13,19 @@ FROM src
SELECT

dboutput ( 'jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true','','',
'CREATE TABLE SIMPLE_DERBY_TABLE1 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' ),
'CREATE TABLE SIMPLE_DERBY_TESTTABLE1 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' ),

dboutput('jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true','','',
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','20','20','20.0','20.0'),
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','20','20','20.0','20.0'),

dboutput('jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true','','',
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','-20','-20','-20.0','-20.0'),
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','-20','-20','-20.0','-20.0'),

dboutput('jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true','','',
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','100','-15','65.0','-74.0'),
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','100','-15','65.0','-74.0'),

dboutput('jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true','','',
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','44','53','-455.454','330.76')
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','44','53','-455.454','330.76')

limit 1;

Expand Down Expand Up @@ -65,7 +65,7 @@ TBLPROPERTIES (
"hive.sql.jdbc.url" = "jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true;collation=TERRITORY_BASED:PRIMARY",
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
"hive.sql.table" = "SIMPLE_DERBY_TABLE1",
"hive.sql.table" = "SIMPLE_DERBY_TESTTABLE1",
"hive.sql.dbcp.maxActive" = "1"
);

Expand Down
32 changes: 16 additions & 16 deletions ql/src/test/results/clientpositive/llap/external_jdbc_table.q.out
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PREHOOK: query: DROP TABLE APP.SIMPLE_DERBY_TABLE1
PREHOOK: query: DROP TABLE APP.SIMPLE_DERBY_TESTTABLE1
PREHOOK: type: DROPTABLE
POSTHOOK: query: DROP TABLE APP.SIMPLE_DERBY_TABLE1
POSTHOOK: query: DROP TABLE APP.SIMPLE_DERBY_TESTTABLE1
POSTHOOK: type: DROPTABLE
PREHOOK: query: CREATE TABLE simple_hive_table1 (ikey INT, bkey BIGINT, fkey FLOAT, dkey DOUBLE )
PREHOOK: type: CREATETABLE
Expand All @@ -21,19 +21,19 @@ PREHOOK: query: FROM src
SELECT

#### A masked pattern was here ####
'CREATE TABLE SIMPLE_DERBY_TABLE1 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' ),
'CREATE TABLE SIMPLE_DERBY_TESTTABLE1 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' ),

#### A masked pattern was here ####
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','20','20','20.0','20.0'),
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','20','20','20.0','20.0'),

#### A masked pattern was here ####
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','-20','-20','-20.0','-20.0'),
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','-20','-20','-20.0','-20.0'),

#### A masked pattern was here ####
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','100','-15','65.0','-74.0'),
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','100','-15','65.0','-74.0'),

#### A masked pattern was here ####
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','44','53','-455.454','330.76')
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','44','53','-455.454','330.76')

limit 1
PREHOOK: type: QUERY
Expand All @@ -44,19 +44,19 @@ POSTHOOK: query: FROM src
SELECT

#### A masked pattern was here ####
'CREATE TABLE SIMPLE_DERBY_TABLE1 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' ),
'CREATE TABLE SIMPLE_DERBY_TESTTABLE1 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' ),

#### A masked pattern was here ####
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','20','20','20.0','20.0'),
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','20','20','20.0','20.0'),

#### A masked pattern was here ####
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','-20','-20','-20.0','-20.0'),
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','-20','-20','-20.0','-20.0'),

#### A masked pattern was here ####
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','100','-15','65.0','-74.0'),
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','100','-15','65.0','-74.0'),

#### A masked pattern was here ####
'INSERT INTO SIMPLE_DERBY_TABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','44','53','-455.454','330.76')
'INSERT INTO SIMPLE_DERBY_TESTTABLE1 ("ikey","bkey","fkey","dkey") VALUES (?,?,?,?)','44','53','-455.454','330.76')

limit 1
POSTHOOK: type: QUERY
Expand Down Expand Up @@ -124,7 +124,7 @@ TBLPROPERTIES (
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
"hive.sql.table" = "SIMPLE_DERBY_TABLE1",
"hive.sql.table" = "SIMPLE_DERBY_TESTTABLE1",
"hive.sql.dbcp.maxActive" = "1"
)
PREHOOK: type: CREATETABLE
Expand All @@ -144,7 +144,7 @@ TBLPROPERTIES (
#### A masked pattern was here ####
"hive.sql.dbcp.username" = "APP",
"hive.sql.dbcp.password" = "mine",
"hive.sql.table" = "SIMPLE_DERBY_TABLE1",
"hive.sql.table" = "SIMPLE_DERBY_TESTTABLE1",
"hive.sql.dbcp.maxActive" = "1"
)
POSTHOOK: type: CREATETABLE
Expand Down Expand Up @@ -323,7 +323,7 @@ STAGE PLANS:
alias: ext_simple_derby_table1
properties:
hive.sql.query SELECT "bkey"
FROM "SIMPLE_DERBY_TABLE1"
FROM "SIMPLE_DERBY_TESTTABLE1"
WHERE 100 < "ikey"
hive.sql.query.fieldNames bkey
hive.sql.query.fieldTypes bigint
Expand Down Expand Up @@ -401,7 +401,7 @@ STAGE PLANS:
properties:
hive.sql.query SELECT "t0"."fkey", "t2"."dkey"
FROM (SELECT "ikey", "fkey"
FROM "SIMPLE_DERBY_TABLE1"
FROM "SIMPLE_DERBY_TESTTABLE1"
WHERE "ikey" IS NOT NULL) AS "t0"
INNER JOIN (SELECT "ikey", "dkey"
FROM "SIMPLE_DERBY_TABLE2"
Expand Down

0 comments on commit 654edc1

Please sign in to comment.