fix review comments

snowflakedb · Sep 2, 2024 · 27d63df · 27d63df
1 parent a8f9d7e
commit 27d63df
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 30 deletions.
diff --git a/Snowflake.Data/Core/FileTransfer/EncryptionProvider.cs b/Snowflake.Data/Core/FileTransfer/EncryptionProvider.cs
@@ -122,7 +122,7 @@ private static byte[] encryptFileKey(byte[] masterKey, byte[] unencryptedFileKey
                 aes.Mode = CipherMode.ECB;
                 aes.Padding = PaddingMode.PKCS7;
 
-                using (MemoryStream cipherStream = new MemoryStream())
+                MemoryStream cipherStream = new MemoryStream();
                 using (var encryptor = aes.CreateEncryptor())
                 using (CryptoStream cryptoStream = new CryptoStream(cipherStream, encryptor, CryptoStreamMode.Write))
                 {
@@ -238,7 +238,7 @@ private static byte[] decryptFileKey(byte[] masterKey, byte[] unencryptedFileKey
                 aes.Mode = CipherMode.ECB;
                 aes.Padding = PaddingMode.PKCS7;
 
-                using (MemoryStream cipherStream = new MemoryStream())
+                MemoryStream cipherStream = new MemoryStream();
                 using (var decryptor = aes.CreateDecryptor())
                 using (CryptoStream cryptoStream = new CryptoStream(cipherStream, decryptor, CryptoStreamMode.Write))
                 {

diff --git a/Snowflake.Data/Core/FileTransfer/StorageClient/SFLocalStorageUtil.cs b/Snowflake.Data/Core/FileTransfer/StorageClient/SFLocalStorageUtil.cs
@@ -62,7 +62,7 @@ internal static void DownloadOneFile(SFFileMetadata fileMetadata)
             }
 
             // Create stream object for reader and writer
-            using (Stream stream = new MemoryStream(File.ReadAllBytes(realSrcFilePath)))
+            Stream stream = new MemoryStream(File.ReadAllBytes(realSrcFilePath));
             using (var fileStream = File.Create(output))
             {
                 // Write file

diff --git a/Snowflake.Data/Core/SFBindUploader.cs b/Snowflake.Data/Core/SFBindUploader.cs
@@ -75,36 +75,29 @@ public void Upload(Dictionary<string, BindingDTO> bindings)
 
                 StringBuilder sBuffer = new StringBuilder();
                 MemoryStream ms = new MemoryStream();
-                try
+                using (StreamWriter tw = new StreamWriter(ms))
                 {
-                    using (StreamWriter tw = new StreamWriter(ms))
+
+                    for (int i = startIndex; i < rowNum; i++)
                     {
+                        sBuffer.Append(dataRows[i]);
+                    }
 
-                        for (int i = startIndex; i < rowNum; i++)
-                        {
-                            sBuffer.Append(dataRows[i]);
-                        }
-
-                        tw.Write(sBuffer.ToString());
-                        tw.Flush();
-
-                        try
-                        {
-                            string fileName = (++fileCount).ToString();
-                            UploadStream(ref ms, fileName);
-                            startIndex = rowNum;
-                            curBytes = 0;
-                        }
-                        catch (IOException e)
-                        {
-                            // failure using stream put
-                            throw new Exception("file stream upload error." + e.ToString());
-                        }
+                    tw.Write(sBuffer.ToString());
+                    tw.Flush();
+
+                    try
+                    {
+                        string fileName = (++fileCount).ToString();
+                        UploadStream(ref ms, fileName);
+                        startIndex = rowNum;
+                        curBytes = 0;
+                    }
+                    catch (IOException e)
+                    {
+                        // failure using stream put
+                        throw new Exception("file stream upload error." + e.ToString());
                     }
-                }
-                finally
-                {
-                    ms.Dispose();
                 }
             }
         }
@@ -132,7 +125,7 @@ internal async Task UploadAsync(Dictionary<string, BindingDTO> bindings, Cancell
                 }
 
                 StringBuilder sBuffer = new StringBuilder();
-                using (MemoryStream ms = new MemoryStream())
+                MemoryStream ms = new MemoryStream();
                 using (StreamWriter tw = new StreamWriter(ms))
                 {
                     for (int i = startIndex; i < rowNum; i++)