-
Notifications
You must be signed in to change notification settings - Fork 175
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.
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-1947501: Create AST API in JDBC #2112
Merged
sfc-gh-bli
merged 6 commits into
snowflakedb:dataframe_ast_poc
from
sfc-gh-rysun:dataframe_ast_poc
Mar 11, 2025
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
92203cd
Added params and finished Todos
sfc-gh-rysun 814e514
Fixed dataframe==null change and testing fixes
sfc-gh-rysun 7447314
Added dataframeAst to QueryExecDTO, passes basic test
sfc-gh-rysun d9e07a0
Resolve comments and add DataframeAst test
sfc-gh-rysun 68e86d7
Renamed function from Execute SQL->DataframeAST query
sfc-gh-rysun fc005b5
Added comment to describe if (dataframe == null)
sfc-gh-rysun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
src/test/java/net/snowflake/client/jdbc/DataframeAstTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
package net.snowflake.client.jdbc; | ||
|
||
import com.fasterxml.jackson.databind.ObjectMapper; | ||
import net.snowflake.client.core.*; | ||
import org.apache.http.client.methods.HttpPost; | ||
import org.junit.jupiter.api.Test; | ||
import org.mockito.ArgumentCaptor; | ||
import org.mockito.MockedStatic; | ||
import org.mockito.Mockito; | ||
import static org.mockito.Mockito.when; | ||
import static org.mockito.Mockito.any; | ||
import static org.mockito.Mockito.anyInt; | ||
import static org.mockito.Mockito.anyBoolean; | ||
import static org.mockito.Mockito.mock; | ||
|
||
import java.io.ByteArrayInputStream; | ||
import java.io.IOException; | ||
import java.nio.charset.StandardCharsets; | ||
import java.sql.ResultSet; | ||
import java.sql.SQLException; | ||
|
||
public class DataframeAstTest { | ||
|
||
@Test | ||
public void testSendAst() throws SQLException, IOException { | ||
String ast = "dummyAst"; | ||
SnowflakeConnectionV1 mockedConn = mock(SnowflakeConnectionV1.class); | ||
SFConnectionHandler mockedHandler = mock(SFConnectionHandler.class); | ||
when(mockedConn.getHandler()).thenReturn(mockedHandler); | ||
HttpClientSettingsKey mockedHttpClientSettingsKey = mock(HttpClientSettingsKey.class); | ||
SFSession mockedSession = mock(SFSession.class); | ||
SFBaseStatement sfBaseStatement = new SFStatement(mockedSession); | ||
when(mockedHandler.getSFStatement()).thenReturn(sfBaseStatement); | ||
when(mockedSession.getServerUrl()).thenReturn("dummy"); | ||
when(mockedSession.getHttpClientKey()).thenReturn(mockedHttpClientSettingsKey); | ||
when(mockedHttpClientSettingsKey.getGzipDisabled()).thenReturn(true); | ||
|
||
ArgumentCaptor<HttpPost> captor = ArgumentCaptor.forClass(HttpPost.class); | ||
try(MockedStatic<HttpUtil> mockedHttpUtil = Mockito.mockStatic(HttpUtil.class)) { | ||
mockedHttpUtil.when(() -> HttpUtil.executeRequest( | ||
captor.capture(), | ||
anyInt(), | ||
anyInt(), | ||
anyInt(), | ||
anyInt(), | ||
anyInt(), | ||
any(), | ||
anyBoolean(), | ||
anyBoolean(), | ||
any(), | ||
any() | ||
)).thenReturn("dummy"); | ||
SnowflakeStatementV1 stmt = new SnowflakeStatementV1( | ||
mockedConn, | ||
ResultSet.TYPE_FORWARD_ONLY, | ||
ResultSet.CONCUR_READ_ONLY, | ||
ResultSet.CLOSE_CURSORS_AT_COMMIT); | ||
stmt.executeDataframeAst(ast); | ||
} catch (Exception e) { | ||
// do nothing, let it terminate early | ||
} | ||
HttpPost result = captor.getValue(); | ||
ObjectMapper mapper = new ObjectMapper(); | ||
ByteArrayInputStream bais = (ByteArrayInputStream) result.getEntity().getContent(); | ||
int size = bais.available(); | ||
byte[] buffer = new byte[size]; | ||
bais.read(buffer); | ||
String resultStr = new String(buffer, StandardCharsets.UTF_8); | ||
assert mapper.readTree(resultStr).get("dataframeAst").asText().equals(ast); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
write a comment above this line, to mention why we skip those code.