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

zhangbutao pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/branch-4.1 by this push:
     new aeabe393686 HIVE-28667: Error initializing field trimmer instance when 
starting HS2 (#5879) (#5913)
aeabe393686 is described below

commit aeabe39368633a7f06c038c97b590e1ea9094968
Author: Butao Zhang <[email protected]>
AuthorDate: Wed Jul 2 09:15:48 2025 +0800

    HIVE-28667: Error initializing field trimmer instance when starting HS2 
(#5879) (#5913)
    
    Co-authored-by: Stamatis Zampetakis <[email protected]>
---
 .../optimizer/calcite/rules/RelFieldTrimmer.java   | 20 ++++++---------
 .../hadoop/hive/ql/parse/CalcitePlanner.java       |  2 +-
 .../calcite/rules/TestHiveRelFieldTrimmer.java     | 30 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/RelFieldTrimmer.java
 
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/RelFieldTrimmer.java
index a556ddf504d..88f99eb1bc0 100644
--- 
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/RelFieldTrimmer.java
+++ 
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/RelFieldTrimmer.java
@@ -19,7 +19,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import org.apache.calcite.adapter.jdbc.JdbcConvention;
-import org.apache.calcite.adapter.jdbc.JdbcRel;
 import org.apache.calcite.adapter.jdbc.JdbcRules.JdbcAggregate;
 import org.apache.calcite.adapter.jdbc.JdbcRules.JdbcAggregateRule;
 import org.apache.calcite.adapter.jdbc.JdbcRules.JdbcFilter;
@@ -28,6 +27,7 @@
 import org.apache.calcite.adapter.jdbc.JdbcRules.JdbcJoinRule;
 import org.apache.calcite.adapter.jdbc.JdbcRules.JdbcProject;
 import org.apache.calcite.adapter.jdbc.JdbcRules.JdbcProjectRule;
+import org.apache.calcite.adapter.jdbc.JdbcRules.JdbcSort;
 import org.apache.calcite.linq4j.Ord;
 import org.apache.calcite.plan.RelOptCluster;
 import org.apache.calcite.plan.RelOptUtil;
@@ -361,17 +361,6 @@ public TrimResult trimFields(
     return result(rel,
         Mappings.createIdentity(rel.getRowType().getFieldCount()));
   }
-
-  public TrimResult trimFields(
-      JdbcRel rel,
-      ImmutableBitSet fieldsUsed,
-      Set<RelDataTypeField> extraFields) {
-    // We don't know how to trim this kind of relational expression, so give
-    // it back intact.
-    Util.discard(fieldsUsed);
-    return result(rel,
-        Mappings.createIdentity(rel.getRowType().getFieldCount()));
-  }
   
   public TrimResult trimFields(
       HiveJdbcConverter converter,
@@ -587,6 +576,13 @@ public TrimResult trimFields(
     return result(relBuilder.build(), inputMapping);
   }
 
+  public TrimResult trimFields(
+      JdbcSort rel,
+      ImmutableBitSet fieldsUsed,
+      Set<RelDataTypeField> extraFields) {
+    return result(rel, 
Mappings.createIdentity(rel.getRowType().getFieldCount()));
+  }
+
   /**
    * Variant of {@link #trimFields(RelNode, ImmutableBitSet, Set)} for
    * {@link org.apache.calcite.rel.core.Sort}.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java 
b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
index 9e35f40ab94..053e344d329 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/CalcitePlanner.java
@@ -420,7 +420,7 @@ public class CalcitePlanner extends SemanticAnalyzer {
   /**
    * This is the list of operators that are specifically used in Hive.
    */
-  private static final List<Class<? extends RelNode>> HIVE_REL_NODE_CLASSES =
+  public static final List<Class<? extends RelNode>> HIVE_REL_NODE_CLASSES =
       ImmutableList.of(
           RelNode.class,
           AbstractRelNode.class,
diff --git 
a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHiveRelFieldTrimmer.java
 
b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHiveRelFieldTrimmer.java
new file mode 100644
index 00000000000..f4a38d4a79c
--- /dev/null
+++ 
b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/calcite/rules/TestHiveRelFieldTrimmer.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.ql.optimizer.calcite.rules;
+
+import org.apache.hadoop.hive.ql.parse.CalcitePlanner;
+import org.junit.Test;
+
+public class TestHiveRelFieldTrimmer {
+
+  @Test
+  public void testRegisterDefaultClassesNoException() throws Throwable {
+    HiveRelFieldTrimmer trimmer = new HiveRelFieldTrimmer(false);
+    trimmer.register(CalcitePlanner.HIVE_REL_NODE_CLASSES);
+  }
+}

Reply via email to