[druid] branch master updated: Fix misuse of Integer.SIZE in FileWriteOutBytes.writeInt (#9723)

[as...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

asdf2014 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git


The following commit(s) were added to refs/heads/master by this push:
     new b9ad250  Fix misuse of Integer.SIZE in FileWriteOutBytes.writeInt (#9723)
b9ad250 is described below

commit b9ad250c009d7b689dcabf90c855e0d1955c5e3e
Author: Jenson <wh...@gmail.com>
AuthorDate: Sun Apr 19 18:16:53 2020 +0800

    Fix misuse of Integer.SIZE in FileWriteOutBytes.writeInt (#9723)
    
    * change Integer.SIZE to Integer.BYTES in FileWriteOutBytes#writeInt
    
    * Add ASF header
    
    Co-authored-by: jenson <ju...@paypal.com>
---
 .../druid/segment/writeout/FileWriteOutBytes.java  |  2 +-
 .../segment/writeout/FileWriteOutBytesTest.java    | 63 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/processing/src/main/java/org/apache/druid/segment/writeout/FileWriteOutBytes.java b/processing/src/main/java/org/apache/druid/segment/writeout/FileWriteOutBytes.java
index 14fb0f3..9ab579d 100644
--- a/processing/src/main/java/org/apache/druid/segment/writeout/FileWriteOutBytes.java
+++ b/processing/src/main/java/org/apache/druid/segment/writeout/FileWriteOutBytes.java
@@ -71,7 +71,7 @@ final class FileWriteOutBytes extends WriteOutBytes
   @Override
   public void writeInt(int v) throws IOException
   {
-    flushIfNeeded(Integer.SIZE);
+    flushIfNeeded(Integer.BYTES);
     buffer.putInt(v);
   }
 
diff --git a/processing/src/test/java/org/apache/druid/segment/writeout/FileWriteOutBytesTest.java b/processing/src/test/java/org/apache/druid/segment/writeout/FileWriteOutBytesTest.java
new file mode 100644
index 0000000..cfaa418
--- /dev/null
+++ b/processing/src/test/java/org/apache/druid/segment/writeout/FileWriteOutBytesTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.segment.writeout;
+
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+
+public class FileWriteOutBytesTest
+{
+  private FileWriteOutBytes fileWriteOutBytes;
+  private FileChannel mockFileChannel;
+
+  @Before
+  public void setUp()
+  {
+    this.mockFileChannel = EasyMock.mock(FileChannel.class);
+    this.fileWriteOutBytes = new FileWriteOutBytes(EasyMock.mock(File.class), mockFileChannel);
+  }
+
+  @Test
+  public void testWrite4KBInts() throws IOException
+  {
+    // Write 4KB of ints and expect the write operation of the file channel will be triggered only once.
+    EasyMock.expect(this.mockFileChannel.write(EasyMock.anyObject(ByteBuffer.class)))
+            .andAnswer(() -> {
+              ByteBuffer buffer = (ByteBuffer) EasyMock.getCurrentArguments()[0];
+              int remaining = buffer.remaining();
+              buffer.position(remaining);
+              return remaining;
+            }).times(1);
+    EasyMock.replay(this.mockFileChannel);
+    final int writeBytes = 4096;
+    final int numOfInt = writeBytes / Integer.BYTES;
+    for (int i = 0; i < numOfInt; i++) {
+      this.fileWriteOutBytes.writeInt(i);
+    }
+    this.fileWriteOutBytes.flush();
+    EasyMock.verify(this.mockFileChannel);
+  }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org