Merge branch 'master' into ml/countvectorizer

GoEddie · web-flow · commit a766146f5601 · 2020-08-12T10:36:55.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -367,3 +367,6 @@ hs_err_pid*
 
 # The target folder contains the output of building
 **/target/**
+
+# F# vs code 
+.ionide/
diff --git a/.ionide/symbolCache.db b/.ionide/symbolCache.db
diff --git a/src/csharp/Microsoft.Spark.Worker/Processor/BroadcastVariableProcessor.cs b/src/csharp/Microsoft.Spark.Worker/Processor/BroadcastVariableProcessor.cs
@@ -54,7 +54,8 @@ internal BroadcastVariables Process(Stream stream)
                     else
                     {
                         string path = SerDe.ReadString(stream);
-                        using FileStream fStream = File.Open(path, FileMode.Open, FileAccess.Read);
+                        using FileStream fStream = 
+                            File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read);
                         object value = formatter.Deserialize(fStream);
                         BroadcastRegistry.Add(bid, value);
                     }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ internal BroadcastVariables Process(Stream stream)`
`54`	`54`	`else`
`55`	`55`	`{`
`56`	`56`	`string path = SerDe.ReadString(stream);`
`57`		`- using FileStream fStream = File.Open(path, FileMode.Open, FileAccess.Read);`
	`57`	`+ using FileStream fStream =`
	`58`	`+ File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read);`
`58`	`59`	`object value = formatter.Deserialize(fStream);`
`59`	`60`	`BroadcastRegistry.Add(bid, value);`
`60`	`61`	`}`