rangadi commented on code in PR #38384:
URL: https://github.com/apache/spark/pull/38384#discussion_r1024513027
##########
connector/protobuf/src/main/scala/org/apache/spark/sql/protobuf/utils/ProtobufUtils.scala:
##########
@@ -155,21 +155,52 @@ private[sql] object ProtobufUtils extends Logging {
* Loads the given protobuf class and returns Protobuf descriptor for it.
*/
def buildDescriptorFromJavaClass(protobufClassName: String): Descriptor = {
+
+ // Default 'Message' class here is shaded while using the package (as in
production).
+ // The incoming classes might not be shaded. Check both.
+ val shadedMessageClass = classOf[Message] // Shaded in prod, not in unit
tests.
+ val missingShadingErrorMessage = "The jar with Protobuf classes needs to
be shaded " +
+ s"(com.google.protobuf.* --> ${shadedMessageClass.getPackage.getName}.*)"
+
val protobufClass = try {
Utils.classForName(protobufClassName)
} catch {
case e: ClassNotFoundException =>
- throw QueryCompilationErrors.protobufClassLoadError(protobufClassName,
e)
+ val explanation =
+ if (protobufClassName.contains(".")) "Ensure the class include in
the jar"
+ else "Ensure the class name includes package prefix"
+ throw QueryCompilationErrors.protobufClassLoadError(protobufClassName,
explanation, e)
+
+ case e: NoClassDefFoundError if
e.getMessage.matches("com/google/proto.*Generated.*") =>
+ // This indicates the the the Java classes are not shaded.
Review Comment:
Oops! Will fix in a follow up.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
