[CALCITE-4585]when run RelNode error,Confuse log info be thrown(xiong duan)

core/src/main/java/org/apache/calcite/jdbc/CalciteConnectionImpl.java

@@ -44,6 +44,7 @@
 import org.apache.calcite.linq4j.tree.Expressions;
 import org.apache.calcite.materialize.Lattice;
 import org.apache.calcite.materialize.MaterializationService;
+import org.apache.calcite.plan.RelOptUtil;
 import org.apache.calcite.prepare.CalciteCatalogReader;
 import org.apache.calcite.rel.type.DelegatingTypeSystem;
 import org.apache.calcite.rel.type.RelDataTypeSystem;
@@ -222,8 +223,14 @@ private CalcitePreparedStatement prepareStatement_(
       server.getStatement(calcitePreparedStatement.handle).setSignature(signature);
       return calcitePreparedStatement;
     } catch (Exception e) {
-      throw Helper.INSTANCE.createException(
-          "Error while preparing statement [" + query.sql + "]", e);
+      if (null != query.rel) {
+        throw Helper.INSTANCE.createException(
+            "Error while preparing statement [" + System.lineSeparator()
+                + RelOptUtil.toString(query.rel) + "]", e);
+      } else {
+        throw Helper.INSTANCE.createException(
+            "Error while preparing statement [" + query.sql + "]", e);
+      }
     }
   }
 

core/src/test/java/org/apache/calcite/test/ExceptionMessageTest.java

@@ -18,13 +18,20 @@
 
 import org.apache.calcite.adapter.java.ReflectiveSchema;
 import org.apache.calcite.jdbc.CalciteConnection;
+import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.schema.SchemaPlus;
+import org.apache.calcite.sql.fun.SqlStdOperatorTable;
+import org.apache.calcite.tools.FrameworkConfig;
+import org.apache.calcite.tools.Frameworks;
+import org.apache.calcite.tools.RelBuilder;
+import org.apache.calcite.tools.RelRunner;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
 
@@ -39,6 +46,7 @@
  */
 public class ExceptionMessageTest {
   private Connection conn;
+  private RelBuilder builder;
 
   /**
    * Simple reflective schema that provides valid and invalid entries.
@@ -76,7 +84,11 @@ public void setUp() throws SQLException {
     SchemaPlus rootSchema = calciteConnection.getRootSchema();
     rootSchema.add("test", new ReflectiveSchema(new TestSchema()));
     calciteConnection.setSchema("test");
+    FrameworkConfig config = Frameworks.newConfigBuilder()
+        .defaultSchema(rootSchema)
+        .build();
     this.conn = calciteConnection;
+    this.builder = RelBuilder.create(config);
   }
 
   private void runQuery(String sql) throws SQLException {
@@ -94,6 +106,20 @@ private void runQuery(String sql) throws SQLException {
     }
   }
 
+  private void runQuery(RelNode relNode) throws SQLException {
+    RelRunner relRunner = conn.unwrap(RelRunner.class);
+    PreparedStatement preparedStatement = relRunner.prepare(relNode);
+    try {
+      preparedStatement.executeQuery();
+    } finally {
+      try {
+        preparedStatement.close();
+      } catch (Exception e) {
+        fail("Error on close");
+      }
+    }
+  }
+
   @Test void testValidQuery() throws SQLException {
     // Just ensure that we're actually dealing with a valid connection
     // to be sure that the results of the other tests can be trusted
@@ -141,4 +167,30 @@ private void runQuery(String sql) throws SQLException {
           containsString("Object 'nonexistentTable' not found"));
     }
   }
+
+  @Test void testValidRelNodeQuery() throws SQLException {
+    final RelNode relNode = builder
+        .scan("test", "entries")
+        .project(builder.field("name"))
+        .build();
+    runQuery(relNode);
+  }
+
+  @Test void testRelNodeQueryException() throws SQLException {
+    try {
+      final RelNode relNode = builder
+          .scan("test", "entries")
+          .project(builder.call(SqlStdOperatorTable.ABS, builder.field("name")))
+          .build();
+      runQuery(relNode);
+      fail("Query badEntries should result in an exception");
+    } catch (RuntimeException e) {
+      assertThat(
+          e.getMessage(), equalTo("java.sql.SQLException: "
+          + "Error while preparing statement [" + System.lineSeparator()
+          + "LogicalProject($f0=[ABS($1)])" + System.lineSeparator()
+          + "  LogicalTableScan(table=[[test, entries]])" + System.lineSeparator()
+          + "]"));
+    }
+  }
 }