Merge remote-tracking branch 'ritikRepo/feature/errorhandling-snowflake' into feature/error_handling_snowflake

Trianz-Akshay · Trianz-Akshay · commit 958475c3393c · 2024-10-15T18:09:48.000+05:30
diff --git a/athena-snowflake/src/main/java/com/amazonaws/athena/connectors/snowflake/SnowflakeMetadataHandler.java b/athena-snowflake/src/main/java/com/amazonaws/athena/connectors/snowflake/SnowflakeMetadataHandler.java
@@ -64,6 +64,7 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import net.snowflake.client.jdbc.SnowflakeSQLException;
 import org.apache.arrow.vector.complex.reader.FieldReader;
 import org.apache.arrow.vector.types.Types;
 import org.apache.arrow.vector.types.pojo.ArrowType;
@@ -458,6 +459,9 @@ public Schema getSchema(Connection jdbcConnection, TableName tableName, Schema p
             }
             partitionSchema.getFields().forEach(schemaBuilder::addField);
         }
+        catch (SnowflakeSQLException ex) {
+            throw new AthenaConnectorException(ex.getMessage(), new ErrorDetails().withErrorCode(FederationSourceErrorCode.AccessDeniedException.toString()));
+        }
         LOGGER.debug(schemaBuilder.toString());
         return schemaBuilder.build();
     }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@`
`64`	`64`	`import com.google.common.base.Strings;`
`65`	`65`	`import com.google.common.collect.ImmutableMap;`
`66`	`66`	`import com.google.common.collect.ImmutableSet;`
	`67`	`+import net.snowflake.client.jdbc.SnowflakeSQLException;`
`67`	`68`	`import org.apache.arrow.vector.complex.reader.FieldReader;`
`68`	`69`	`import org.apache.arrow.vector.types.Types;`
`69`	`70`	`import org.apache.arrow.vector.types.pojo.ArrowType;`
`@@ -458,6 +459,9 @@ public Schema getSchema(Connection jdbcConnection, TableName tableName, Schema p`
`458`	`459`	`}`
`459`	`460`	`partitionSchema.getFields().forEach(schemaBuilder::addField);`
`460`	`461`	`}`
	`462`	`+ catch (SnowflakeSQLException ex) {`
	`463`	`+ throw new AthenaConnectorException(ex.getMessage(), new ErrorDetails().withErrorCode(FederationSourceErrorCode.AccessDeniedException.toString()));`
	`464`	`+ }`
`461`	`465`	`LOGGER.debug(schemaBuilder.toString());`
`462`	`466`	`return schemaBuilder.build();`
`463`	`467`	`}`