Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SNOW-1846830 allow triple slash file prefix (file:///) #2033

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

SNOW-1846830 allow triple slash file prefix (file:///) #2033

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
749bd6c
use path from java.io.File instead of raw user provided string to ena…
sfc-gh-mkubik Jan 14, 2025
21a7362
Merge branch 'master' into SNOW-1863648-allow-triple-slash-file-notation
sfc-gh-mkubik Jan 28, 2025
b17cd50
add test for triple slash, comment out the fix to test on windows
sfc-gh-mkubik Jan 31, 2025
6433ed2
add get to put test to verify if uploaded file can be downloaded
sfc-gh-mkubik Jan 31, 2025
b969470
re-enable fix, format everything
sfc-gh-mkubik Jan 31, 2025
72617fb
use tempdir and randomized stage name, remove obsolete exception inje…
sfc-gh-mkubik Jan 31, 2025
27c0e7e
Merge branch 'master' into SNOW-1863648-allow-triple-slash-file-notation
sfc-gh-mkubik Jan 31, 2025
22ddbd1
Merge branch 'master' of github.com:snowflakedb/snowflake-jdbc into S…
sfc-gh-mkubik Feb 3, 2025
e5c67ec
use File instead of Path in TempDir
sfc-gh-mkubik Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,7 @@ private void uploadFiles(Set<String> fileList, int parallel) throws SnowflakeSQL
threadExecutor.submit(
getUploadFileCallable(
stageInfo,
srcFile,
srcFileObj.getPath(),
fileMetadata,
(stageInfo.getStageType() == StageInfo.StageType.LOCAL_FS)
? null
Expand Down
27 changes: 27 additions & 0 deletions src/test/java/net/snowflake/client/jdbc/FileUploaderLatestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import org.apache.commons.io.FileUtils;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

/** Tests for SnowflakeFileTransferAgent that require an active connection */
@Tag(TestTags.OTHERS)
Expand Down Expand Up @@ -871,4 +872,30 @@ public void testUploadWithTildeInPath() throws SQLException, IOException {
FileUtils.deleteDirectory(subDir.toFile());
}
}

@Test
public void testUploadWithTripleSlashFilePrefix(@TempDir Path tempDir) throws SQLException {
String stageName = "testStage" + SnowflakeUtil.randomAlphaNumeric(10);
try (Connection connection = getConnection();
Statement statement = connection.createStatement()) {
try {
statement.execute("CREATE OR REPLACE STAGE " + stageName);
SFSession sfSession = connection.unwrap(SnowflakeConnectionV1.class).getSfSession();

String command =
"PUT file:///" + getFullPathFileInResource(TEST_DATA_FILE) + " @" + stageName;
SnowflakeFileTransferAgent sfAgent =
new SnowflakeFileTransferAgent(command, sfSession, new SFStatement(sfSession));
assertTrue(sfAgent.execute());

String getCommand = "GET @" + stageName + " file://" + tempDir;
SnowflakeFileTransferAgent sfAgent1 =
new SnowflakeFileTransferAgent(getCommand, sfSession, new SFStatement(sfSession));
assertTrue(sfAgent1.execute());
assertEquals(1, sfAgent1.statusRows.size());
} finally {
statement.execute("DROP STAGE if exists " + stageName);
}
}
}
}
Loading