* revert change to queryHandler and related tests, based on review co…

…mments

sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java

@@ -684,7 +684,16 @@ private DruidException buildSQLPlanningError(RelOptPlanner.CannotPlanException e
                           .ofCategory(DruidException.Category.UNSUPPORTED)
                           .build(exception, "Unhandled Query Planning Failure, see broker logs for details");
     } else {
-      throw InvalidSqlInput.exception("Query could not be planned. A possible reason is [%s]", errorMessage);
+      // Planning errors are more like hints: it isn't guaranteed that the planning error is actually what went wrong.
+      // For this reason, we consider these as targetting a more expert persona, i.e. the admin instead of the actual
+      // user.
+      throw DruidException.forPersona(DruidException.Persona.ADMIN)
+                          .ofCategory(DruidException.Category.INVALID_INPUT)
+                          .build(
+                              exception,
+                              "Query could not be planned. A possible reason is [%s]",
+                              errorMessage
+                          );
     }
   }
 

sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java

@@ -664,7 +664,11 @@ public void assertQueryIsUnplannable(final PlannerConfig plannerConfig, final St
 
   private DruidExceptionMatcher buildUnplannableExceptionMatcher()
   {
-    return new DruidExceptionMatcher(Persona.USER, Category.INVALID_INPUT, "invalidInput");
+    if (testBuilder().isDecoupledMode()) {
+      return new DruidExceptionMatcher(Persona.USER, Category.INVALID_INPUT, "invalidInput");
+    } else {
+      return new DruidExceptionMatcher(Persona.ADMIN, Category.INVALID_INPUT, "general");
+    }
   }
 
   /**