add extvol and extvolmanager support

fix unit tests change non_default to non_null
snowflakedb · Sep 23, 2024 · ceee1a2 · ceee1a2
1 parent 0919151
commit ceee1a2
Show file tree

Hide file tree

Showing 19 changed files with 740 additions and 159 deletions.
diff --git a/src/main/java/net/snowflake/ingest/connection/ServiceResponseHandler.java b/src/main/java/net/snowflake/ingest/connection/ServiceResponseHandler.java
@@ -43,7 +43,7 @@ public enum ApiName {
     STREAMING_CHANNEL_STATUS("POST"),
     STREAMING_REGISTER_BLOB("POST"),
     STREAMING_CLIENT_CONFIGURE("POST"),
-    STREAMING_CHANNEL_CONFIGURE("POST");
+    GENERATE_PRESIGNED_URLS("POST");
     private final String httpMethod;
 
     private ApiName(String httpMethod) {

diff --git a/src/main/java/net/snowflake/ingest/streaming/internal/ChannelConfigureRequest.java b/src/main/java/net/snowflake/ingest/streaming/internal/ChannelConfigureRequest.java
diff --git a/src/main/java/net/snowflake/ingest/streaming/internal/ChannelConfigureResponse.java b/src/main/java/net/snowflake/ingest/streaming/internal/ChannelConfigureResponse.java
diff --git a/src/main/java/net/snowflake/ingest/streaming/internal/ChunkMetadata.java b/src/main/java/net/snowflake/ingest/streaming/internal/ChunkMetadata.java
@@ -219,13 +219,13 @@ Long getLastInsertTimeInMs() {
   // Snowflake service had a bug that did not allow the client to add new json fields in some
   // contracts; thus these new fields have a NON_DEFAULT attribute.
   @JsonProperty("major_vers")
-  @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+  @JsonInclude(JsonInclude.Include.NON_NULL)
   Integer getMajorVersion() {
     return this.parquetMajorVersion;
   }
 
   @JsonProperty("minor_vers")
-  @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+  @JsonInclude(JsonInclude.Include.NON_NULL)
   Integer getMinorVersion() {
     return this.parquetMinorVersion;
   }

diff --git a/src/main/java/net/snowflake/ingest/streaming/internal/ColumnMetadata.java b/src/main/java/net/snowflake/ingest/streaming/internal/ColumnMetadata.java
@@ -160,7 +160,7 @@ public String toString() {
     map.put("byte_length", this.byteLength);
     map.put("length", this.length);
     map.put("nullable", this.nullable);
-    map.put("source_iceberg_datatype", this.sourceIcebergDataType);
+    map.put("source_iceberg_data_type", this.sourceIcebergDataType);
     return map.toString();
   }
 }