[2/2] hive git commit: HIVE-19166: TestMiniLlapLocalCliDriver sysdb failure (Daniel Dai, reviewed by Vaibhav Gumashta)
HIVE-19166: TestMiniLlapLocalCliDriver sysdb failure (Daniel Dai, reviewed by
Vaibhav Gumashta)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6a3d42b3
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6a3d42b3
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6a3d42b3
Branch: refs/heads/branch-3
Commit: 6a3d42b3b9d032b771aa0ebcb9f0cb1b4f1af309
Parents: c0a9d3b
Author: Daniel Dai
Authored: Thu Sep 20 14:32:06 2018 -0700
Committer: Daniel Dai
Committed: Thu Sep 20 14:32:36 2018 -0700
--
.../TestInformationSchemaWithPrivilege.java |8 +-
.../hadoop/hive/cli/control/CliConfigs.java |1 -
.../upgrade/hive/hive-schema-3.1.0.hive.sql | 78 +-
ql/src/test/queries/clientpositive/sysdb.q | 12 +-
.../clientpositive/llap/resourceplan.q.out | 156 +--
.../llap/strict_managed_tables_sysdb.q.out | 156 +--
.../results/clientpositive/llap/sysdb.q.out | 1250 +-
7 files changed, 1075 insertions(+), 586 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hive/blob/6a3d42b3/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java
--
diff --git
a/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java
b/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java
index 610e646..18b0b13 100644
---
a/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java
+++
b/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java
@@ -581,20 +581,20 @@ public class TestInformationSchemaWithPrivilege {
opHandle = serviceClient.executeStatement(sessHandle, "select * from
INFORMATION_SCHEMA.SCHEMATA", confOverlay);
rowSet = serviceClient.fetchResults(opHandle);
-Assert.assertTrue(rowSet.numRows() > 2);
+Assert.assertEquals(rowSet.numRows(), 5);
opHandle = serviceClient.executeStatement(sessHandle, "select * from
INFORMATION_SCHEMA.TABLES", confOverlay);
rowSet = serviceClient.fetchResults(opHandle);
-Assert.assertTrue(rowSet.numRows() > 10);
+Assert.assertTrue(rowSet.numRows() > 50);
opHandle = serviceClient.executeStatement(sessHandle, "select * from
INFORMATION_SCHEMA.TABLE_PRIVILEGES",
confOverlay);
rowSet = serviceClient.fetchResults(opHandle);
-Assert.assertEquals(rowSet.numRows(), 7);
+Assert.assertTrue(rowSet.numRows() > 200);
opHandle = serviceClient.executeStatement(sessHandle, "select * from
INFORMATION_SCHEMA.COLUMNS", confOverlay);
rowSet = serviceClient.fetchResults(opHandle);
-Assert.assertTrue(rowSet.numRows() > 10);
+Assert.assertTrue(rowSet.numRows() > 350);
opHandle = serviceClient.executeStatement(sessHandle, "select * from
INFORMATION_SCHEMA.COLUMN_PRIVILEGES",
confOverlay);
http://git-wip-us.apache.org/repos/asf/hive/blob/6a3d42b3/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
--
diff --git
a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
index c9ae676..fb7062f 100644
---
a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
+++
b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
@@ -223,7 +223,6 @@ public class CliConfigs {
includesFrom(testConfigProps, "minillaplocal.shared.query.files");
excludeQuery("bucket_map_join_tez1.q"); // Disabled in HIVE-19509
excludeQuery("special_character_in_tabnames_1.q"); // Disabled in
HIVE-19509
-excludeQuery("sysdb.q"); // Disabled in HIVE-19509
excludeQuery("tez_smb_1.q"); // Disabled in HIVE-19509
excludeQuery("union_fast_stats.q"); // Disabled in HIVE-19509
excludeQuery("schema_evol_orc_acidvec_part.q"); // Disabled in
HIVE-19509
http://git-wip-us.apache.org/repos/asf/hive/blob/6a3d42b3/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql
--
diff --git a/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql
b/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql
index f98894f..2d67242 100644
--- a/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql
+++ b/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql
@@ -1080,11 +1080,10 @@ SELECT DISTINCT
cast(null as string),
`DB_LOCATION_URI`
FROM
- `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P
+ `sys`.`DBS` D LEFT JOIN
[2/2] hive git commit: HIVE-19166: TestMiniLlapLocalCliDriver sysdb failure (Daniel Dai, reviewed by Vaibhav Gumashta)
HIVE-19166: TestMiniLlapLocalCliDriver sysdb failure (Daniel Dai, reviewed by
Vaibhav Gumashta)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/487714aa
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/487714aa
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/487714aa
Branch: refs/heads/master
Commit: 487714aaf65f1e7a148cd13e3fbea6615a335666
Parents: 657995d
Author: Daniel Dai
Authored: Wed Sep 19 11:11:55 2018 -0700
Committer: Daniel Dai
Committed: Wed Sep 19 11:11:55 2018 -0700
--
.../TestInformationSchemaWithPrivilege.java |8 +-
.../hadoop/hive/cli/control/CliConfigs.java |1 -
.../upgrade/hive/hive-schema-3.1.0.hive.sql | 78 +-
ql/src/test/queries/clientpositive/sysdb.q | 13 +-
.../clientpositive/llap/resourceplan.q.out | 156 +--
.../llap/strict_managed_tables_sysdb.q.out | 156 +--
.../results/clientpositive/llap/sysdb.q.out | 1259 +-
7 files changed, 1079 insertions(+), 592 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hive/blob/487714aa/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java
--
diff --git
a/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java
b/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java
index 610e646..18b0b13 100644
---
a/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java
+++
b/itests/hive-unit/src/test/java/org/apache/hive/service/server/TestInformationSchemaWithPrivilege.java
@@ -581,20 +581,20 @@ public class TestInformationSchemaWithPrivilege {
opHandle = serviceClient.executeStatement(sessHandle, "select * from
INFORMATION_SCHEMA.SCHEMATA", confOverlay);
rowSet = serviceClient.fetchResults(opHandle);
-Assert.assertTrue(rowSet.numRows() > 2);
+Assert.assertEquals(rowSet.numRows(), 5);
opHandle = serviceClient.executeStatement(sessHandle, "select * from
INFORMATION_SCHEMA.TABLES", confOverlay);
rowSet = serviceClient.fetchResults(opHandle);
-Assert.assertTrue(rowSet.numRows() > 10);
+Assert.assertTrue(rowSet.numRows() > 50);
opHandle = serviceClient.executeStatement(sessHandle, "select * from
INFORMATION_SCHEMA.TABLE_PRIVILEGES",
confOverlay);
rowSet = serviceClient.fetchResults(opHandle);
-Assert.assertEquals(rowSet.numRows(), 7);
+Assert.assertTrue(rowSet.numRows() > 200);
opHandle = serviceClient.executeStatement(sessHandle, "select * from
INFORMATION_SCHEMA.COLUMNS", confOverlay);
rowSet = serviceClient.fetchResults(opHandle);
-Assert.assertTrue(rowSet.numRows() > 10);
+Assert.assertTrue(rowSet.numRows() > 350);
opHandle = serviceClient.executeStatement(sessHandle, "select * from
INFORMATION_SCHEMA.COLUMN_PRIVILEGES",
confOverlay);
http://git-wip-us.apache.org/repos/asf/hive/blob/487714aa/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
--
diff --git
a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
index 0e4fb97..15029d2 100644
---
a/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
+++
b/itests/util/src/main/java/org/apache/hadoop/hive/cli/control/CliConfigs.java
@@ -205,7 +205,6 @@ public class CliConfigs {
includesFrom(testConfigProps, "minillaplocal.shared.query.files");
excludeQuery("bucket_map_join_tez1.q"); // Disabled in HIVE-19509
excludeQuery("special_character_in_tabnames_1.q"); // Disabled in
HIVE-19509
-excludeQuery("sysdb.q"); // Disabled in HIVE-19509
excludeQuery("tez_smb_1.q"); // Disabled in HIVE-19509
excludeQuery("union_fast_stats.q"); // Disabled in HIVE-19509
excludeQuery("schema_evol_orc_acidvec_part.q"); // Disabled in
HIVE-19509
http://git-wip-us.apache.org/repos/asf/hive/blob/487714aa/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql
--
diff --git a/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql
b/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql
index f98894f..2d67242 100644
--- a/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql
+++ b/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql
@@ -1080,11 +1080,10 @@ SELECT DISTINCT
cast(null as string),
`DB_LOCATION_URI`
FROM
- `sys`.`DBS` D, `sys`.`TBLS` T, `sys`.`TBL_PRIVS` P
+ `sys`.`DBS` D LEFT JOIN
