address review comment

kiszk · kiszk · commit 1d75cf3119db · 2018-04-06T08:34:26.000+01:00
diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UTF8StringBuilder.java b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UTF8StringBuilder.java
@@ -41,24 +41,20 @@ public UTF8StringBuilder() {
 
   // Grows the buffer by at least `neededSize`
   private void grow(int neededSize) {
-    if (neededSize > ARRAY_MAX - totalSize()) {
+    if (neededSize > ARRAY_MAX - length) {
       throw new UnsupportedOperationException(
         "Cannot grow internal buffer by size " + neededSize + " because the size after growing " +
           "exceeds size limitation " + ARRAY_MAX);
     }
-    final int length = totalSize() + neededSize;
-    if (buffer.size() < length) {
-      int newLength = length < ARRAY_MAX / 2 ? length * 2 : ARRAY_MAX;
+    final int requestedSize = length + neededSize;
+    if (buffer.size() < requestedSize) {
+      int newLength = requestedSize < ARRAY_MAX / 2 ? requestedSize * 2 : ARRAY_MAX;
       final ByteArrayMemoryBlock tmp = new ByteArrayMemoryBlock(newLength);
-      MemoryBlock.copyMemory(buffer, tmp, totalSize());
+      MemoryBlock.copyMemory(buffer, tmp, length);
       buffer = tmp;
     }
   }
 
-  private int totalSize() {
-    return length;
-  }
-
   public void append(UTF8String value) {
     grow(value.numBytes());
     value.writeToMemory(buffer.getByteArray(), length + Platform.BYTE_ARRAY_OFFSET);
@@ -70,6 +66,6 @@ public void append(String value) {
   }
 
   public UTF8String build() {
-    return UTF8String.fromBytes(buffer.getByteArray(), 0, totalSize());
+    return UTF8String.fromBytes(buffer.getByteArray(), 0, length);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,24 +41,20 @@ public UTF8StringBuilder() {`
`41`	`41`
`42`	`42`	// Grows the buffer by at least `neededSize`
`43`	`43`	`private void grow(int neededSize) {`
`44`		`- if (neededSize > ARRAY_MAX - totalSize()) {`
	`44`	`+ if (neededSize > ARRAY_MAX - length) {`
`45`	`45`	`throw new UnsupportedOperationException(`
`46`	`46`	`"Cannot grow internal buffer by size " + neededSize + " because the size after growing " +`
`47`	`47`	`"exceeds size limitation " + ARRAY_MAX);`
`48`	`48`	`}`
`49`		`- final int length = totalSize() + neededSize;`
`50`		`- if (buffer.size() < length) {`
`51`		`- int newLength = length < ARRAY_MAX / 2 ? length * 2 : ARRAY_MAX;`
	`49`	`+ final int requestedSize = length + neededSize;`
	`50`	`+ if (buffer.size() < requestedSize) {`
	`51`	`+ int newLength = requestedSize < ARRAY_MAX / 2 ? requestedSize * 2 : ARRAY_MAX;`
`52`	`52`	`final ByteArrayMemoryBlock tmp = new ByteArrayMemoryBlock(newLength);`
`53`		`- MemoryBlock.copyMemory(buffer, tmp, totalSize());`
	`53`	`+ MemoryBlock.copyMemory(buffer, tmp, length);`
`54`	`54`	`buffer = tmp;`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- private int totalSize() {`
`59`		`- return length;`
`60`		`- }`
`61`		`-`
`62`	`58`	`public void append(UTF8String value) {`
`63`	`59`	`grow(value.numBytes());`
`64`	`60`	`value.writeToMemory(buffer.getByteArray(), length + Platform.BYTE_ARRAY_OFFSET);`
`@@ -70,6 +66,6 @@ public void append(String value) {`
`70`	`66`	`}`
`71`	`67`
`72`	`68`	`public UTF8String build() {`
`73`		`- return UTF8String.fromBytes(buffer.getByteArray(), 0, totalSize());`
	`69`	`+ return UTF8String.fromBytes(buffer.getByteArray(), 0, length);`
`74`	`70`	`}`
`75`	`71`	`}`