Move EnvVar variable into AssemblyLoader. Add EnvVar to PythonFunction.

Author: AeroXuk

src/csharp/Microsoft.Spark/Services/ConfigurationService.cs

@@ -22,9 +22,6 @@ internal sealed class ConfigurationService : IConfigurationService
         private const string DotnetBackendPortEnvVarName = "DOTNETBACKEND_PORT";
         private const int DotnetBackendDebugPort = 5567;
 
-        private const string DotNetApplicationArchiveEnvVarName = "DOTNET_APPLICATION_ARCHIVE";
-        private string _applicationArchive;
-
         private static readonly string s_procBaseFileName = "Microsoft.Spark.Worker";
         private static readonly string s_procFileName =
             RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
@@ -80,26 +77,5 @@ public string GetWorkerExePath()
             _workerPath = s_procFileName;
             return _workerPath;
         }
-
-        public string GetApplicationArchiveName()
-        {
-            if(_applicationArchive != null)
-            {
-                return _applicationArchive;
-            }
-
-            string appArchive = Environment.GetEnvironmentVariable(DotNetApplicationArchiveEnvVarName);
-
-            if(!string.IsNullOrEmpty(appArchive))
-            {
-                _logger.LogInfo("Application archive variable not set.");
-                return null;
-            }
-
-            _logger.LogInfo($"Application archive is {appArchive}.");
-
-            _applicationArchive = appArchive;
-            return _applicationArchive;
-        }
     }
 }

src/csharp/Microsoft.Spark/Services/IConfigurationService.cs

@@ -18,11 +18,5 @@ internal interface IConfigurationService
         /// The full path to the .NET worker executable.
         /// </summary>
         string GetWorkerExePath();
-
-        /// <summary>
-        /// The name of the Application Archive.
-        /// </summary>
-        /// <returns></returns>
-        string GetApplicationArchiveName();
     }
 }

src/csharp/Microsoft.Spark/Utils/AssemblyLoader.cs

@@ -8,13 +8,13 @@
 using System.IO.Compression;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using Microsoft.Spark.Interop;
 
 namespace Microsoft.Spark.Utils
 {
     internal static class AssemblySearchPathResolver
     {
         internal const string AssemblySearchPathsEnvVarName = "DOTNET_ASSEMBLY_SEARCH_PATHS";
+        internal const string DotNetApplicationArchiveEnvVarName = "DOTNET_APPLICATION_ARCHIVE";
 
         /// <summary>
         /// Returns the paths to search when loading assemblies in the following order of
@@ -58,22 +58,21 @@ internal static string[] GetAssemblySearchPaths()
             searchPaths.Add(Directory.GetCurrentDirectory());
             searchPaths.Add(AppDomain.CurrentDomain.BaseDirectory);
 
-            string archiveName = SparkEnvironment.ConfigurationService.GetApplicationArchiveName();
+            string archiveName = Environment.GetEnvironmentVariable(
+                DotNetApplicationArchiveEnvVarName);
             if(!string.IsNullOrEmpty(archiveName))
             {
-                string archivePath = Path.Combine(Directory.GetCurrentDirectory(), archiveName);
-                if (File.Exists(archivePath))
-                {
-                    string extractedPath = Path.Combine(
-                        Path.GetDirectoryName(archivePath),
+                string
+                    archivePath = Path.Combine(Directory.GetCurrentDirectory(), archiveName),
+                    extractPath = Path.Combine(Directory.GetCurrentDirectory(),
                         Path.GetFileNameWithoutExtension(archiveName));
-                    if (!File.Exists(extractedPath))
-                    {
-                        ZipFile.ExtractToDirectory(archivePath, extractedPath);
-                        searchPaths.Add(extractedPath);
-                    }
+                if (File.Exists(archivePath) && !File.Exists(extractPath))
+                {
+                    ZipFile.ExtractToDirectory(archivePath, extractPath);
+                    searchPaths.Add(extractPath);
                 }
             }
+
             return searchPaths.ToArray();
         }
     }

src/csharp/Microsoft.Spark/Utils/UdfUtils.cs

@@ -177,6 +177,17 @@ private static JvmObjectReference CreateEnvVarsForPythonFunction(IJvmBridge jvm)
                     assemblySearchPath);
             }
 
+            string assemblyArchivePath = Environment.GetEnvironmentVariable(
+                AssemblySearchPathResolver.DotNetApplicationArchiveEnvVarName);
+            if (!string.IsNullOrEmpty(assemblyArchivePath))
+            {
+                jvm.CallNonStaticJavaMethod(
+                    environmentVars,
+                    "put",
+                    AssemblySearchPathResolver.DotNetApplicationArchiveEnvVarName,
+                    assemblyArchivePath);
+            }
+
             return environmentVars;
         }