Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions hbase-handler/src/test/results/positive/hbase_viewjoins.q.out
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@hbase_table_test_1
POSTHOOK: Output: database:default
POSTHOOK: Output: default@VIEW_HBASE_TABLE_TEST_1
POSTHOOK: Lineage: VIEW_HBASE_TABLE_TEST_1.ccount SIMPLE [(hbase_table_test_1)hbase_table_test_1.FieldSchema(name:ccount, type:int, comment:), ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: do you know why these are converted to lowercased, we don't change the HS2 side.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a Post Executor hook, this hook pulls out the metadata info from HMS and prints it out. So this is a expected change.

POSTHOOK: Lineage: VIEW_HBASE_TABLE_TEST_1.cvalue SIMPLE [(hbase_table_test_1)hbase_table_test_1.FieldSchema(name:cvalue, type:string, comment:), ]
POSTHOOK: Lineage: VIEW_HBASE_TABLE_TEST_1.pk SIMPLE [(hbase_table_test_1)hbase_table_test_1.FieldSchema(name:pk, type:string, comment:), ]
POSTHOOK: Lineage: view_hbase_table_test_1.ccount SIMPLE [(hbase_table_test_1)hbase_table_test_1.FieldSchema(name:ccount, type:int, comment:), ]
POSTHOOK: Lineage: view_hbase_table_test_1.cvalue SIMPLE [(hbase_table_test_1)hbase_table_test_1.FieldSchema(name:cvalue, type:string, comment:), ]
POSTHOOK: Lineage: view_hbase_table_test_1.pk SIMPLE [(hbase_table_test_1)hbase_table_test_1.FieldSchema(name:pk, type:string, comment:), ]
PREHOOK: query: CREATE EXTERNAL TABLE HBASE_TABLE_TEST_2(
cvalue string ,
pk string ,
Expand Down Expand Up @@ -121,9 +121,9 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@hbase_table_test_2
POSTHOOK: Output: database:default
POSTHOOK: Output: default@VIEW_HBASE_TABLE_TEST_2
POSTHOOK: Lineage: VIEW_HBASE_TABLE_TEST_2.ccount SIMPLE [(hbase_table_test_2)hbase_table_test_2.FieldSchema(name:ccount, type:int, comment:), ]
POSTHOOK: Lineage: VIEW_HBASE_TABLE_TEST_2.cvalue SIMPLE [(hbase_table_test_2)hbase_table_test_2.FieldSchema(name:cvalue, type:string, comment:), ]
POSTHOOK: Lineage: VIEW_HBASE_TABLE_TEST_2.pk SIMPLE [(hbase_table_test_2)hbase_table_test_2.FieldSchema(name:pk, type:string, comment:), ]
POSTHOOK: Lineage: view_hbase_table_test_2.ccount SIMPLE [(hbase_table_test_2)hbase_table_test_2.FieldSchema(name:ccount, type:int, comment:), ]
POSTHOOK: Lineage: view_hbase_table_test_2.cvalue SIMPLE [(hbase_table_test_2)hbase_table_test_2.FieldSchema(name:cvalue, type:string, comment:), ]
POSTHOOK: Lineage: view_hbase_table_test_2.pk SIMPLE [(hbase_table_test_2)hbase_table_test_2.FieldSchema(name:pk, type:string, comment:), ]
PREHOOK: query: SELECT p.cvalue cvalue
FROM `VIEW_HBASE_TABLE_TEST_1` `p`
LEFT OUTER JOIN `VIEW_HBASE_TABLE_TEST_2` `A1`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public void testTransactionalValidation() throws Throwable {
client.createTable(t);
fail("Expected exception");
} catch (MetaException e) {
assertEquals("'transactional' property of TBLPROPERTIES may only have value 'true': acidDb.acidTable",
assertEquals("'transactional' property of TBLPROPERTIES may only have value 'true': aciddb.acidtable",
e.getMessage());
}

Expand All @@ -108,7 +108,7 @@ public void testTransactionalValidation() throws Throwable {
client.createTable(t);
fail("Expected exception");
} catch (MetaException e) {
assertEquals("'transactional' property of TBLPROPERTIES may only have value 'true': acidDb.acidTable",
assertEquals("'transactional' property of TBLPROPERTIES may only have value 'true': aciddb.acidtable",
e.getMessage());
}

Expand All @@ -125,7 +125,7 @@ public void testTransactionalValidation() throws Throwable {
client.createTable(t);
fail("Expected exception");
} catch (MetaException e) {
assertEquals("The table must be stored using an ACID compliant format (such as ORC): acidDb.acidTable",
assertEquals("The table must be stored using an ACID compliant format (such as ORC): aciddb.acidtable",
e.getMessage());
}

Expand All @@ -145,7 +145,7 @@ public void testTransactionalValidation() throws Throwable {
client.createTable(t);
fail("Expected exception");
} catch (MetaException e) {
assertEquals("The table must be stored using an ACID compliant format (such as ORC): acidDb.acidTable",
assertEquals("The table must be stored using an ACID compliant format (such as ORC): aciddb.acidtable",
e.getMessage());
}

Expand Down Expand Up @@ -197,7 +197,7 @@ public void testTransactionalValidation() throws Throwable {
client.alter_table(dbName, tblName, t);
fail("Expected exception");
} catch (MetaException e) {
assertEquals("The table must be stored using an ACID compliant format (such as ORC): acidDb.acidTable1",
assertEquals("The table must be stored using an ACID compliant format (such as ORC): aciddb.acidtable1",
e.getMessage());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,7 @@ public void testOpenTxnEvent() throws Throwable {
primary.dump(primaryDbName);

long lastReplId = Long.parseLong(bootStrapDump.lastReplicationId);
primary.testEventCounts(primaryDbName, lastReplId, null, null, 10);
primary.testEventCounts(primaryDbName, lastReplId, null, null, 11);

// Test load
replica.load(replicatedDbName, primaryDbName)
Expand Down
5 changes: 5 additions & 0 deletions ql/src/test/queries/clientpositive/create_table.q
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,8 @@ describe formatted test31;
create table test32 as select * from test31;
show create table test32;
describe formatted test32;

-- create table with empty characters within quotes
create table ` default`.` table41`(i int);
show create table ` default`.` table41`;
describe formatted ` default`.` table41`;
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ set hive.compute.query.using.stats=false;

create table caseSensitive (a integer);
alter table casesEnsitivE set tblproperties('some'='one');

-- alter table with empty characters in quotes shouldn't throw error
alter table ` default`.` caseSensitive ` add columns(i int);
describe formatted caseSensitive;
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@src
POSTHOOK: Output: database:default
POSTHOOK: Output: default@testViewPart
POSTHOOK: Lineage: testViewPart.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: testviewpart.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
PREHOOK: query: ALTER VIEW testViewPart
ADD PARTITION (value='val_86') PARTITION (value='val_xyz')
PREHOOK: type: ALTERTABLE_ADDPARTS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@src
POSTHOOK: Output: database:default
POSTHOOK: Output: default@testView
POSTHOOK: Lineage: testView.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: testview.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
PREHOOK: query: ALTER VIEW testView SET TBLPROPERTIES ('propA'='100', 'propB'='200')
PREHOOK: type: ALTERVIEW_PROPERTIES
PREHOOK: Input: default@testview
Expand Down
61 changes: 61 additions & 0 deletions ql/src/test/results/clientpositive/create_table.q.out
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,67 @@ Table Parameters:
totalSize 2
#### A masked pattern was here ####

# Storage Information
SerDe Library: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
InputFormat: org.apache.hadoop.mapred.TextInputFormat
OutputFormat: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
Compressed: No
Num Buckets: -1
Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
PREHOOK: query: create table ` default`.` table41`(i int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: default@ table41
PREHOOK: Output: database:default
POSTHOOK: query: create table ` default`.` table41`(i int)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@ table41
POSTHOOK: Output: database:default
PREHOOK: query: show create table ` default`.` table41`
PREHOOK: type: SHOW_CREATETABLE
PREHOOK: Input: default@table41
POSTHOOK: query: show create table ` default`.` table41`
POSTHOOK: type: SHOW_CREATETABLE
POSTHOOK: Input: default@table41
CREATE TABLE `default`.`table41`(
`i` int)
ROW FORMAT SERDE
'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
STORED AS INPUTFORMAT
'org.apache.hadoop.mapred.TextInputFormat'
OUTPUTFORMAT
'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'
LOCATION
#### A masked pattern was here ####
TBLPROPERTIES (
'bucketing_version'='2',
#### A masked pattern was here ####
PREHOOK: query: describe formatted ` default`.` table41`
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@table41
POSTHOOK: query: describe formatted ` default`.` table41`
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table41
# col_name data_type comment
i int

# Detailed Table Information
Database: default
#### A masked pattern was here ####
Retention: 0
#### A masked pattern was here ####
Table Type: MANAGED_TABLE
Table Parameters:
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"i\":\"true\"}}
bucketing_version 2
numFiles 0
numRows 0
rawDataSize 0
totalSize 0
#### A masked pattern was here ####

# Storage Information
SerDe Library: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
InputFormat: org.apache.hadoop.mapred.TextInputFormat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@srcpart
POSTHOOK: Output: database:tv
POSTHOOK: Output: tv@testView
POSTHOOK: Lineage: testView.ds SIMPLE [(srcpart)srcpart.FieldSchema(name:ds, type:string, comment:null), ]
POSTHOOK: Lineage: testView.hr SIMPLE [(srcpart)srcpart.FieldSchema(name:hr, type:string, comment:null), ]
POSTHOOK: Lineage: testView.key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: testView.value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: testview.ds SIMPLE [(srcpart)srcpart.FieldSchema(name:ds, type:string, comment:null), ]
POSTHOOK: Lineage: testview.hr SIMPLE [(srcpart)srcpart.FieldSchema(name:hr, type:string, comment:null), ]
POSTHOOK: Lineage: testview.key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: testview.value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
PREHOOK: query: DESCRIBE FORMATTED tv.testView
PREHOOK: type: DESCTABLE
PREHOOK: Input: tv@testview
Expand Down
61 changes: 61 additions & 0 deletions ql/src/test/results/clientpositive/llap/create_table.q.out
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,67 @@ Table Parameters:
totalSize 2
#### A masked pattern was here ####

# Storage Information
SerDe Library: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
InputFormat: org.apache.hadoop.mapred.TextInputFormat
OutputFormat: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
Compressed: No
Num Buckets: -1
Bucket Columns: []
Sort Columns: []
Storage Desc Params:
serialization.format 1
PREHOOK: query: create table ` default`.` table41`(i int)
PREHOOK: type: CREATETABLE
PREHOOK: Output: default@ table41
PREHOOK: Output: database:default
POSTHOOK: query: create table ` default`.` table41`(i int)
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: default@ table41
POSTHOOK: Output: database:default
PREHOOK: query: show create table ` default`.` table41`
PREHOOK: type: SHOW_CREATETABLE
PREHOOK: Input: default@table41
POSTHOOK: query: show create table ` default`.` table41`
POSTHOOK: type: SHOW_CREATETABLE
POSTHOOK: Input: default@table41
CREATE TABLE `default`.`table41`(
`i` int)
ROW FORMAT SERDE
'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe'
STORED AS INPUTFORMAT
'org.apache.hadoop.mapred.TextInputFormat'
OUTPUTFORMAT
'org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat'
LOCATION
'hdfs://### HDFS PATH ###'
TBLPROPERTIES (
'bucketing_version'='2',
#### A masked pattern was here ####
PREHOOK: query: describe formatted ` default`.` table41`
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@table41
POSTHOOK: query: describe formatted ` default`.` table41`
POSTHOOK: type: DESCTABLE
POSTHOOK: Input: default@table41
# col_name data_type comment
i int

# Detailed Table Information
Database: default
#### A masked pattern was here ####
Retention: 0
#### A masked pattern was here ####
Table Type: MANAGED_TABLE
Table Parameters:
COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"i\":\"true\"}}
bucketing_version 2
numFiles 0
numRows 0
rawDataSize 0
totalSize 0
#### A masked pattern was here ####

# Storage Information
SerDe Library: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
InputFormat: org.apache.hadoop.mapred.TextInputFormat
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@t1_n50
POSTHOOK: Output: database:default
POSTHOOK: Output: default@V1_n5
POSTHOOK: Lineage: V1_n5.key SIMPLE [(t1_n50)t1_n50.FieldSchema(name:key, type:string, comment:null), ]
POSTHOOK: Lineage: v1_n5.key SIMPLE [(t1_n50)t1_n50.FieldSchema(name:key, type:string, comment:null), ]
PREHOOK: query: alter view V1_n5 set tblproperties ('test'='thisisatest')
PREHOOK: type: ALTERVIEW_PROPERTIES
PREHOOK: Input: default@v1_n5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: foo@t1_n40
POSTHOOK: Output: database:foo
POSTHOOK: Output: foo@V1_n3
POSTHOOK: Lineage: V1_n3.key SIMPLE [(t1_n40)t1_n40.FieldSchema(name:key, type:string, comment:null), ]
POSTHOOK: Lineage: v1_n3.key SIMPLE [(t1_n40)t1_n40.FieldSchema(name:key, type:string, comment:null), ]
PREHOOK: query: show tables
PREHOOK: type: SHOWTABLES
PREHOOK: Input: database:foo
Expand Down
4 changes: 2 additions & 2 deletions ql/src/test/results/clientpositive/llap/explain_ddl.q.out
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@src
POSTHOOK: Output: database:default
POSTHOOK: Output: default@V1_n0
POSTHOOK: Lineage: V1_n0.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: V1_n0.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: v1_n0.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: v1_n0.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
PREHOOK: query: select count(*) from V1_n0 where key > 0
PREHOOK: type: QUERY
PREHOOK: Input: default@src
Expand Down
28 changes: 14 additions & 14 deletions ql/src/test/results/clientpositive/llap/explain_dependency.q.out
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@src
POSTHOOK: Output: database:default
POSTHOOK: Output: default@V1_n6
POSTHOOK: Lineage: V1_n6.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: V1_n6.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: v1_n6.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: v1_n6.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
PREHOOK: query: CREATE VIEW V2_n1 AS SELECT ds, key, value FROM srcpart WHERE ds IS NOT NULL
PREHOOK: type: CREATEVIEW
PREHOOK: Input: default@srcpart
Expand All @@ -20,9 +20,9 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@srcpart
POSTHOOK: Output: database:default
POSTHOOK: Output: default@V2_n1
POSTHOOK: Lineage: V2_n1.ds SIMPLE [(srcpart)srcpart.FieldSchema(name:ds, type:string, comment:null), ]
POSTHOOK: Lineage: V2_n1.key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: V2_n1.value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: v2_n1.ds SIMPLE [(srcpart)srcpart.FieldSchema(name:ds, type:string, comment:null), ]
POSTHOOK: Lineage: v2_n1.key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: v2_n1.value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
PREHOOK: query: CREATE VIEW V3 AS
SELECT src1.key, src2.value FROM V2_n1 src1
JOIN src src2 ON src1.key = src2.key WHERE src1.ds IS NOT NULL
Expand All @@ -41,8 +41,8 @@ POSTHOOK: Input: default@srcpart
POSTHOOK: Input: default@v2_n1
POSTHOOK: Output: database:default
POSTHOOK: Output: default@V3
POSTHOOK: Lineage: V3.key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: V3.value SIMPLE [(src)src2.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: v3.key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: v3.value SIMPLE [(src)src2.FieldSchema(name:value, type:string, comment:default), ]
PREHOOK: query: CREATE VIEW V4 AS
SELECT src1.key, src2.value as value1, src3.value as value2
FROM V1_n6 src1 JOIN V2_n1 src2 on src1.key = src2.key JOIN src src3 ON src2.key = src3.key
Expand All @@ -63,9 +63,9 @@ POSTHOOK: Input: default@v1_n6
POSTHOOK: Input: default@v2_n1
POSTHOOK: Output: database:default
POSTHOOK: Output: default@V4
POSTHOOK: Lineage: V4.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: V4.value1 SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: V4.value2 SIMPLE [(src)src3.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: v4.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: v4.value1 SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: v4.value2 SIMPLE [(src)src3.FieldSchema(name:value, type:string, comment:default), ]
PREHOOK: query: EXPLAIN DEPENDENCY
SELECT key, count(1) FROM srcpart WHERE ds IS NOT NULL GROUP BY key
PREHOOK: type: QUERY
Expand Down Expand Up @@ -230,10 +230,10 @@ POSTHOOK: type: CREATEVIEW
POSTHOOK: Input: default@srcpart
POSTHOOK: Output: database:default
POSTHOOK: Output: default@V5
POSTHOOK: Lineage: V5.ds SIMPLE []
POSTHOOK: Lineage: V5.hr SIMPLE [(srcpart)srcpart.FieldSchema(name:hr, type:string, comment:null), ]
POSTHOOK: Lineage: V5.key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: V5.value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
POSTHOOK: Lineage: v5.ds SIMPLE []
POSTHOOK: Lineage: v5.hr SIMPLE [(srcpart)srcpart.FieldSchema(name:hr, type:string, comment:null), ]
POSTHOOK: Lineage: v5.key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
POSTHOOK: Lineage: v5.value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V5
PREHOOK: type: QUERY
PREHOOK: Input: default@srcpart
Expand Down
Loading