PLUGIN-1883: SnowFlake Plugin - Fetch schema using Named Table #48
Conversation
This file contains hidden or 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
| @@ -23,7 +23,6 @@ | |||
| import io.cdap.plugin.snowflake.common.BaseSnowflakeConfig; | |||
| import io.cdap.plugin.snowflake.common.client.SnowflakeAccessor; | |||
| import io.cdap.plugin.snowflake.common.util.SchemaHelper; | |||
|
|
|||
| import io.cdap.cdap.api.annotation.Description; | ||
| import io.cdap.cdap.api.annotation.Macro; | ||
| import io.cdap.cdap.api.annotation.Name; | ||
| import io.cdap.cdap.etl.api.FailureCollector; | ||
| import io.cdap.plugin.snowflake.common.BaseSnowflakeConfig; | ||
|
|
src/main/java/io/cdap/plugin/snowflake/source/batch/ImportQueryType.java
Outdated
Show resolved
Hide resolved
src/main/java/io/cdap/plugin/snowflake/source/batch/SnowflakeBatchSourceConfig.java
Show resolved
Hide resolved
src/main/java/io/cdap/plugin/snowflake/source/batch/SnowflakeBatchSourceConfig.java
Outdated
Show resolved
Hide resolved
src/main/java/io/cdap/plugin/snowflake/source/batch/SnowflakeBatchSourceConfig.java
Outdated
Show resolved
Hide resolved
Comment on lines
132
to
140
| List<Schema.Field> fields = result.stream() | ||
| .map(fieldDescriptor -> Schema.Field.of(fieldDescriptor.getName(), getSchema(fieldDescriptor))) | ||
| .collect(Collectors.toList()); | ||
| return Schema.recordOf("data", fields); | ||
| } catch (SQLException e) { | ||
| throw new SchemaParseException(e); | ||
| } catch (IOException e) { | ||
| throw new RuntimeException(e); | ||
| } |
There was a problem hiding this comment.
any exception should be returned as SchemaParseException here
src/main/java/io/cdap/plugin/snowflake/common/util/SchemaHelper.java
Outdated
Show resolved
Hide resolved
| @@ -95,5 +129,11 @@ public void validate(FailureCollector collector) { | |||
| collector.addFailure("Maximum Slit Size cannot be a negative number.", null) | |||
| .withConfigProperty(PROPERTY_MAX_SPLIT_SIZE); | |||
| } | |||
|
|
|||
| if (Strings.isNullOrEmpty(importQuery) && Strings.isNullOrEmpty(tableName)) { | |||
There was a problem hiding this comment.
also add validation for importQueryType
| String importQuery = config.getImportQuery(); | ||
| if (Strings.isNullOrEmpty(importQuery)) { | ||
| String tableName = config.getTableName(); | ||
| importQuery = String.format("SELECT * FROM %s", tableName); |
There was a problem hiding this comment.
ideally we should only import columns present in the schema, why SELECT *?
There was a problem hiding this comment.
For tableName, I think SELECT * should be fine. There is an importQuery option, if the user wishes to specify the individual columns.
There was a problem hiding this comment.
Refactored the code. b7ca095 PTAL.
Comment on lines
103
to
104
| "For more details, see %s.", STAGE_PATH, e.getErrorCode(), e.getSQLState(), | ||
| DocumentUrlUtil.getSupportedDocumentUrl()); |
| return type; | ||
| } | ||
| } | ||
|
|
| * @return list of field descriptors | ||
| * @throws SQLException If an error occurs while retrieving metadata from the database | ||
| */ | ||
| public List<SnowflakeFieldDescriptor> describeTable(String schemaName, String tableName) throws SQLException { |
There was a problem hiding this comment.
please keep the method name to reflect what exactly is being done, something like getFieldDescriptors
| * @return list of field descriptors | ||
| * @throws SQLException If an error occurs while retrieving metadata from the database | ||
| */ | ||
| public List<SnowflakeFieldDescriptor> getFieldDescriptors(String schemaName, String tableName) throws SQLException { |
There was a problem hiding this comment.
can it still throw SQLException?
There was a problem hiding this comment.
No, removed it. 30ba2aa
| .map(fieldDescriptor -> Schema.Field.of(fieldDescriptor.getName(), getSchema(fieldDescriptor))) | ||
| .collect(Collectors.toList()); | ||
| return Schema.recordOf("data", fields); | ||
| } catch (SQLException e) { |
There was a problem hiding this comment.
from where is this thrown?
There was a problem hiding this comment.
This exception is not thrown. Redundant catch block. Removed it. 30ba2aa
itsankit-google
approved these changes
May 15, 2025
sgarg-CS
force-pushed
the
feature/PLUGIN-1883
branch
from
30ba2aa to
9d8bc2c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PLUGIN-1883
Key changes :-
When Import Query Type is
Native QueryWhen Import Query Type is
Named Table