ODP-1165|HIVE-26488: Fix NPE in DDLSemanticAnalyzerFactory

acceldata-io · Apr 12, 2024 · 030155d · 030155d
1 parent b2b0d5a
commit 030155d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ql/pom.xml b/ql/pom.xml
@@ -26,7 +26,7 @@
   <properties>
     <hive.path.to.root>..</hive.path.to.root>
     <powermock.version>2.0.2</powermock.version>
-    <reflections.version>0.9.10</reflections.version>
+    <reflections.version>0.10.2</reflections.version>
     <atlas.version>2.1.0</atlas.version>
   </properties>
   <dependencies>

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/DDLSemanticAnalyzerFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/DDLSemanticAnalyzerFactory.java
@@ -65,17 +65,17 @@ public interface DDLSemanticAnalyzerCategory {
       new HashMap<>();
 
   static {
-    Set<Class<? extends BaseSemanticAnalyzer>> analyzerClasses1 =
+    Set<Class<? extends BaseSemanticAnalyzer>> analyzerClasses =
         new Reflections(DDL_ROOT).getSubTypesOf(BaseSemanticAnalyzer.class);
-    Set<Class<? extends CalcitePlanner>> analyzerClasses2 =
-        new Reflections(DDL_ROOT).getSubTypesOf(CalcitePlanner.class);
-    Set<Class<? extends BaseSemanticAnalyzer>> analyzerClasses = Sets.union(analyzerClasses1, analyzerClasses2);
     for (Class<? extends BaseSemanticAnalyzer> analyzerClass : analyzerClasses) {
       if (Modifier.isAbstract(analyzerClass.getModifiers())) {
         continue;
       }
 
       DDLType ddlType = analyzerClass.getAnnotation(DDLType.class);
+      if (ddlType == null) {
+        continue;
+      }
       for (int type : ddlType.types()) {
         if (TYPE_TO_ANALYZER.containsKey(type)) {
           throw new IllegalStateException(
@@ -93,6 +93,9 @@ public interface DDLSemanticAnalyzerCategory {
       }
 
       DDLType ddlType = analyzerCategoryClass.getAnnotation(DDLType.class);
+      if (ddlType == null) {
+        continue;
+      }
       for (int type : ddlType.types()) {
         if (TYPE_TO_ANALYZERCATEGORY.containsKey(type)) {
           throw new IllegalStateException(