post merge

snowflakedb · Jul 11, 2024 · 6eb0fff · 6eb0fff
1 parent e3f9d65
commit 6eb0fff
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/src/main/java/net/snowflake/ingest/streaming/internal/ChannelsStatusRequest.java b/src/main/java/net/snowflake/ingest/streaming/internal/ChannelsStatusRequest.java
@@ -92,8 +92,7 @@ List<ChannelStatusRequestDTO> getChannels() {
   @Override
   public String getStringForLogging() {
     return String.format(
-        "ChannelsStatusRequest(requestId=%s, role=%s, channels=[%s])",
-        requestId,
+        "ChannelsStatusRequest(role=%s, channels=[%s])",
         role,
         channels.stream()
             .map(

diff --git a/src/test/java/net/snowflake/ingest/streaming/internal/BlobBuilderTest.java b/src/test/java/net/snowflake/ingest/streaming/internal/BlobBuilderTest.java
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 Snowflake Computing Inc. All rights reserved.
+ */
+
 package net.snowflake.ingest.streaming.internal;
 
 import java.io.ByteArrayOutputStream;
@@ -23,18 +27,21 @@ public void testSerializationErrors() throws Exception {
     BlobBuilder.constructBlobAndMetadata(
         "a.bdec",
         Collections.singletonList(createChannelDataPerTable(1, false)),
-        Constants.BdecVersion.THREE);
+        Constants.BdecVersion.THREE,
+        true);
     BlobBuilder.constructBlobAndMetadata(
         "a.bdec",
         Collections.singletonList(createChannelDataPerTable(1, true)),
-        Constants.BdecVersion.THREE);
+        Constants.BdecVersion.THREE,
+        true);
 
     // Construction fails if metadata contains 0 rows and data 1 row
     try {
       BlobBuilder.constructBlobAndMetadata(
           "a.bdec",
           Collections.singletonList(createChannelDataPerTable(0, false)),
-          Constants.BdecVersion.THREE);
+          Constants.BdecVersion.THREE,
+          true);
       Assert.fail("Should not pass enableParquetInternalBuffering=false");
     } catch (SFException e) {
       Assert.assertEquals(ErrorCode.INTERNAL_ERROR.getMessageCode(), e.getVendorCode());
@@ -52,7 +59,8 @@ public void testSerializationErrors() throws Exception {
       BlobBuilder.constructBlobAndMetadata(
           "a.bdec",
           Collections.singletonList(createChannelDataPerTable(0, true)),
-          Constants.BdecVersion.THREE);
+          Constants.BdecVersion.THREE,
+          true);
       Assert.fail("Should not pass enableParquetInternalBuffering=true");
     } catch (SFException e) {
       Assert.assertEquals(ErrorCode.INTERNAL_ERROR.getMessageCode(), e.getVendorCode());

diff --git a/src/test/java/net/snowflake/ingest/streaming/internal/InsertRowsBenchmarkTest.java b/src/test/java/net/snowflake/ingest/streaming/internal/InsertRowsBenchmarkTest.java
@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2024 Snowflake Computing Inc. All rights reserved.
+ */
+
 package net.snowflake.ingest.streaming.internal;
 
 import static java.time.ZoneOffset.UTC;
@@ -36,7 +40,7 @@ public class InsertRowsBenchmarkTest {
 
   @Setup(Level.Trial)
   public void setUpBeforeAll() {
-    client = new SnowflakeStreamingIngestClientInternal<ParquetChunkData>("client_PARQUET");
+    client = new SnowflakeStreamingIngestClientInternal<ParquetChunkData>("client_PARQUET", false);
     channel =
         new SnowflakeStreamingIngestChannelInternal<>(
             "channel",