From 2a0223933fcee5f7b463c88358c097a6d956be8d Mon Sep 17 00:00:00 2001 From: Terry Kim Date: Tue, 3 Mar 2020 17:15:05 -0800 Subject: [PATCH] initial checkin --- .../Microsoft.Spark/Interop/Ipc/JvmBridge.cs | 6 ++--- .../api/dotnet/DotnetBackendHandler.scala | 26 +++++++++---------- .../api/dotnet/DotnetBackendHandler.scala | 26 +++++++++---------- .../api/dotnet/DotnetBackendHandler.scala | 26 +++++++++---------- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/csharp/Microsoft.Spark/Interop/Ipc/JvmBridge.cs b/src/csharp/Microsoft.Spark/Interop/Ipc/JvmBridge.cs index 887e8304f..abfa63b19 100644 --- a/src/csharp/Microsoft.Spark/Interop/Ipc/JvmBridge.cs +++ b/src/csharp/Microsoft.Spark/Interop/Ipc/JvmBridge.cs @@ -244,9 +244,9 @@ private string BuildErrorMessage( object[] args) { var errorMessage = new StringBuilder("JVM method execution failed: "); - const string ConstructorFormat = "Constructor failed for class {0}"; - const string StaticMethodFormat = "Static method {0} failed for class {1}"; - const string NonStaticMethodFormat = "Nonstatic method {0} failed for class {1}"; + const string ConstructorFormat = "Constructor failed for class '{0}'"; + const string StaticMethodFormat = "Static method '{0}' failed for class '{1}'"; + const string NonStaticMethodFormat = "Nonstatic method '{0}' failed for class '{1}'"; try { diff --git a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala b/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala index 295bfe4c7..f4e9490a0 100644 --- a/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala +++ b/src/scala/microsoft-spark-2.3.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala @@ -185,21 +185,21 @@ class DotnetBackendHandler(server: DotnetBackend) case Some(jObj) => jObj.getClass.getName case None => "NullObject" } - logError(s"On object of type $jvmObjName failed", e) + val argsStr = args.map(arg => { + if (arg != null) { + s"[Type=${arg.getClass.getCanonicalName}, Value: $arg]" + } else { + "[Value: NULL]" + } + }).mkString(", ") + + logError(s"Failed to execute '$methodName' on '$jvmObjName' with args=($argsStr)") + if (methods != null) { - logError("methods:") - methods.foreach(m => logError(m.toString)) - } - if (args != null) { - logError("args:") - args.foreach(arg => { - if (arg != null) { - logError(s"argType: ${arg.getClass.getCanonicalName}, argValue: $arg") - } else { - logError("arg: NULL") - } - }) + logDebug(s"All methods for $jvmObjName:") + methods.foreach(m => logDebug(m.toString)) } + writeInt(dos, -1) writeString(dos, Utils.exceptionString(e.getCause)) } diff --git a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala b/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala index 295bfe4c7..f4e9490a0 100644 --- a/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala +++ b/src/scala/microsoft-spark-2.4.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala @@ -185,21 +185,21 @@ class DotnetBackendHandler(server: DotnetBackend) case Some(jObj) => jObj.getClass.getName case None => "NullObject" } - logError(s"On object of type $jvmObjName failed", e) + val argsStr = args.map(arg => { + if (arg != null) { + s"[Type=${arg.getClass.getCanonicalName}, Value: $arg]" + } else { + "[Value: NULL]" + } + }).mkString(", ") + + logError(s"Failed to execute '$methodName' on '$jvmObjName' with args=($argsStr)") + if (methods != null) { - logError("methods:") - methods.foreach(m => logError(m.toString)) - } - if (args != null) { - logError("args:") - args.foreach(arg => { - if (arg != null) { - logError(s"argType: ${arg.getClass.getCanonicalName}, argValue: $arg") - } else { - logError("arg: NULL") - } - }) + logDebug(s"All methods for $jvmObjName:") + methods.foreach(m => logDebug(m.toString)) } + writeInt(dos, -1) writeString(dos, Utils.exceptionString(e.getCause)) } diff --git a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala b/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala index 295bfe4c7..f4e9490a0 100644 --- a/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala +++ b/src/scala/microsoft-spark-3.0.x/src/main/scala/org/apache/spark/api/dotnet/DotnetBackendHandler.scala @@ -185,21 +185,21 @@ class DotnetBackendHandler(server: DotnetBackend) case Some(jObj) => jObj.getClass.getName case None => "NullObject" } - logError(s"On object of type $jvmObjName failed", e) + val argsStr = args.map(arg => { + if (arg != null) { + s"[Type=${arg.getClass.getCanonicalName}, Value: $arg]" + } else { + "[Value: NULL]" + } + }).mkString(", ") + + logError(s"Failed to execute '$methodName' on '$jvmObjName' with args=($argsStr)") + if (methods != null) { - logError("methods:") - methods.foreach(m => logError(m.toString)) - } - if (args != null) { - logError("args:") - args.foreach(arg => { - if (arg != null) { - logError(s"argType: ${arg.getClass.getCanonicalName}, argValue: $arg") - } else { - logError("arg: NULL") - } - }) + logDebug(s"All methods for $jvmObjName:") + methods.foreach(m => logDebug(m.toString)) } + writeInt(dos, -1) writeString(dos, Utils.exceptionString(e.getCause)) }