Skip to content

Commit

Permalink
Replace os.OpenFile with os.Open where equivalent
Browse files Browse the repository at this point in the history
  • Loading branch information
ramikg authored and sfc-gh-pfus committed Aug 2, 2023
1 parent d9cae96 commit 98df002
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion azure_storage_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ func (util *snowflakeAzureClient) uploadFile(
})
} else {
var f *os.File
f, err = os.OpenFile(dataFile, os.O_RDONLY, readWriteFileMode)
f, err = os.Open(dataFile)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -889,7 +889,7 @@ both an escape character and as a separator in path names.
To send information from a stream (rather than a file) use code similar to the code below.
(The ReplaceAll() function is needed on Windows to handle backslashes in the path to the file.)
fileStream, _ := os.OpenFile(fname, os.O_RDONLY, 0666)
fileStream, _ := os.Open(fname)
defer func() {
if fileStream != nil {
fileStream.Close()
Expand Down
2 changes: 1 addition & 1 deletion encrypt_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func decryptFile(
return "", err
}
defer tmpOutputFile.Close()
infile, err := os.OpenFile(filename, os.O_RDONLY, readWriteFileMode)
infile, err := os.Open(filename)
if err != nil {
return "", err
}
Expand Down
6 changes: 3 additions & 3 deletions encrypt_util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func TestEncryptDecryptFile(t *testing.T) {
}
defer os.Remove(decryptedFile)

fd, err = os.OpenFile(decryptedFile, os.O_RDONLY, readWriteFileMode)
fd, err = os.Open(decryptedFile)
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -144,7 +144,7 @@ func encryptDecryptFile(t *testing.T, encMat snowflakeFileEncryption, expected i
defer os.Remove(decryptedFile)

cnt := 0
fd, err := os.OpenFile(decryptedFile, os.O_RDONLY, readWriteFileMode)
fd, err := os.Open(decryptedFile)
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -238,7 +238,7 @@ func generateKLinesOfNFiles(k int, n int, compress bool, tmpDir string) (string,
return "", err
}
w := gzip.NewWriter(fOut)
fIn, err := os.OpenFile(fname, os.O_RDONLY, readWriteFileMode)
fIn, err := os.Open(fname)
if err != nil {
return "", err
}
Expand Down
2 changes: 1 addition & 1 deletion file_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func (util *snowflakeFileUtil) compressFileWithGzip(fileName string, tmpDir stri
basename := baseName(fileName)
gzipFileName := filepath.Join(tmpDir, basename+"_c.gz")

fr, err := os.OpenFile(fileName, os.O_RDONLY, readWriteFileMode)
fr, err := os.Open(fileName)
if err != nil {
return "", -1, err
}
Expand Down
2 changes: 1 addition & 1 deletion gcs_storage_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func (util *snowflakeGcsClient) uploadFile(
uploadSrc = meta.realSrcStream
}
} else {
uploadSrc, err = os.OpenFile(dataFile, os.O_RDONLY, readWriteFileMode)
uploadSrc, err = os.Open(dataFile)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion local_storage_client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func TestLocalUpload(t *testing.T) {
if uploadMeta.resStatus != skipped {
t.Fatal("overwrite is false. should have skipped")
}
fileStream, _ := os.OpenFile(fname, os.O_RDONLY, readWriteFileMode)
fileStream, _ := os.Open(fname)
ctx := WithFileStream(context.Background(), fileStream)
uploadMeta.srcStream = getFileStream(ctx)

Expand Down
4 changes: 2 additions & 2 deletions put_get_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ func testPutGet(t *testing.T, isStream bool) {
runTests(t, dsn, func(dbt *DBTest) {
dbt.mustExec("create or replace table " + tableName +
" (a int, b string)")
fileStream, err := os.OpenFile(fname, os.O_RDONLY, readWriteFileMode)
fileStream, err := os.Open(fname)
if err != nil {
t.Error(err)
}
Expand Down Expand Up @@ -525,7 +525,7 @@ func TestPutGetGcsDownscopedCredential(t *testing.T) {
runTests(t, dsn, func(dbt *DBTest) {
dbt.mustExec("create or replace table " + tableName +
" (a int, b string)")
fileStream, err := os.OpenFile(fname, os.O_RDONLY, readWriteFileMode)
fileStream, err := os.Open(fname)
if err != nil {
t.Error(err)
}
Expand Down
2 changes: 1 addition & 1 deletion put_get_user_stage_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ func putGetUserStage(t *testing.T, tmpDir string, numberOfFiles int, numberOfLin
dbt.mustExec("rm @" + stageName)
var fs *os.File
if isStream {
fs, _ = os.OpenFile(files, os.O_RDONLY, readWriteFileMode)
fs, _ = os.Open(files)
dbt.mustExecContext(WithFileStream(context.Background(), fs),
fmt.Sprintf("put 'file://%v' @%v", strings.ReplaceAll(
files, "\\", "\\\\"), stageName))
Expand Down

0 comments on commit 98df002

Please sign in to comment.