[hive] branch master updated: HIVE-26261: Fix some issues with Spark engine removal (#3320) (Peter Vary reviewed by Zoltan Haindrich)

[pvary]

This is an automated email from the ASF dual-hosted git repository.

pvary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new bd7b8a10336 HIVE-26261: Fix some issues with Spark engine removal 
(#3320) (Peter Vary reviewed by Zoltan Haindrich)
bd7b8a10336 is described below

commit bd7b8a1033645fa780509e8d2a6943578e1f4e08
Author: pvary <pv...@cloudera.com>
AuthorDate: Thu May 26 10:43:01 2022 +0200

    HIVE-26261: Fix some issues with Spark engine removal (#3320) (Peter Vary 
reviewed by Zoltan Haindrich)
---
 .../ql/exec/persistence/MapJoinTableContainerSerDe.java    | 14 --------------
 .../authorization/command/CommandAuthorizerV2.java         |  9 +++++++++
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java
 
b/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java
index 514a8c92fb5..6f675f44a23 100644
--- 
a/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java
+++ 
b/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinTableContainerSerDe.java
@@ -170,18 +170,4 @@ public class MapJoinTableContainerSerDe {
       throw new HiveException(msg, e);
     }
   }
-
-  // Get an empty container when the small table is empty.
-  private static MapJoinTableContainer getDefaultEmptyContainer(Configuration 
hconf,
-      MapJoinObjectSerDeContext keyCtx, MapJoinObjectSerDeContext valCtx) 
throws SerDeException {
-    boolean useOptimizedContainer = HiveConf.getBoolVar(
-        hconf, HiveConf.ConfVars.HIVEMAPJOINUSEOPTIMIZEDTABLE);
-    if (useOptimizedContainer) {
-      return new MapJoinBytesTableContainer(hconf, valCtx, -1, 0);
-    }
-    MapJoinTableContainer container = new HashMapWrapper();
-    container.setSerde(keyCtx, valCtx);
-    container.seal();
-    return container;
-  }
 }
diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/command/CommandAuthorizerV2.java
 
b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/command/CommandAuthorizerV2.java
index 114d9b3186a..13281980cc1 100644
--- 
a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/command/CommandAuthorizerV2.java
+++ 
b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/command/CommandAuthorizerV2.java
@@ -158,6 +158,15 @@ final class CommandAuthorizerV2 {
     if (TableType.MATERIALIZED_VIEW.name().equals(tableType) || 
TableType.VIRTUAL_VIEW.name().equals(tableType)) {
       isView = true;
     }
+    if (isView) {
+      Map<String, String> params = t.getParameters();
+      if (params != null && params.containsKey(authorizedKeyword)) {
+        String authorizedValue = params.get(authorizedKeyword);
+        if ("false".equalsIgnoreCase(authorizedValue)) {
+          return true;
+        }
+      }
+    }
     return false;
   }