You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by em...@apache.org on 2019/06/20 06:44:00 UTC
[arrow] branch master updated: ARROW-5639: [Java] Remove floating
point computation from getOffsetBufferValueCapacity
This is an automated email from the ASF dual-hosted git repository.
emkornfield pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 333d9fd ARROW-5639: [Java] Remove floating point computation from getOffsetBufferValueCapacity
333d9fd is described below
commit 333d9fdfd5e9e763f104c3184bdf4e8b326ecf4e
Author: liyafan82 <fa...@foxmail.com>
AuthorDate: Wed Jun 19 23:43:28 2019 -0700
ARROW-5639: [Java] Remove floating point computation from getOffsetBufferValueCapacity
Some getOffsetBufferValueCapacity methods use floating point computation to calculate the capacity, which is not necessary.
(int) ((offsetBuffer.capacity() * 1.0) / OFFSET_WIDTH);
It is interesting to note that JIT cannot optimize away the floating point computations:
So this has performance penalty:
Before:
VariableWidthVectorBenchmarks.getValueCapacity avgt 5 6.570 ± 0.004 ns/op
After:
VariableWidthVectorBenchmarks.getValueCapacity avgt 5 5.787 ± 0.575 ns/op
Author: liyafan82 <fa...@foxmail.com>
Closes #4602 from liyafan82/fly_0618_mult and squashes the following commits:
dd905f3d6 <liyafan82> Remove more floating point computations
dee0fcf4e <liyafan82> Remove floating point computation from BaseVariableWidthVector#getOffsetBufferValueCapacity
---
.../vector/VariableWidthVectorBenchmarks.java | 93 ++++++++++++++++++++++
.../src/main/codegen/templates/UnionVector.java | 2 +-
.../apache/arrow/vector/BaseFixedWidthVector.java | 2 +-
.../arrow/vector/BaseVariableWidthVector.java | 2 +-
.../vector/complex/BaseRepeatedValueVector.java | 2 +-
5 files changed, 97 insertions(+), 4 deletions(-)
diff --git a/java/performance/src/test/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java b/java/performance/src/test/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java
new file mode 100644
index 0000000..1a78019
--- /dev/null
+++ b/java/performance/src/test/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java
@@ -0,0 +1,93 @@
+/*
+ * 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.arrow.vector;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.RootAllocator;
+import org.junit.Test;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+import org.openjdk.jmh.runner.Runner;
+import org.openjdk.jmh.runner.RunnerException;
+import org.openjdk.jmh.runner.options.Options;
+import org.openjdk.jmh.runner.options.OptionsBuilder;
+
+/**
+ * Benchmarks for {@link BaseVariableWidthVector}.
+ */
+@State(Scope.Benchmark)
+public class VariableWidthVectorBenchmarks {
+
+ private static final int VECTOR_CAPACITY = 16 * 1024;
+
+ private static final int VECTOR_LENGTH = 1024;
+
+ private static final int ALLOCATOR_CAPACITY = 1024 * 1024;
+
+ private BufferAllocator allocator;
+
+ private VarCharVector vector;
+
+ /**
+ * Setup benchmarks.
+ */
+ @Setup
+ public void prepare() {
+ allocator = new RootAllocator(ALLOCATOR_CAPACITY);
+ vector = new VarCharVector("vector", allocator);
+ vector.allocateNew(VECTOR_CAPACITY, VECTOR_LENGTH);
+ }
+
+ /**
+ * Tear down benchmarks.
+ */
+ @TearDown
+ public void tearDown() {
+ vector.close();
+ allocator.close();
+ }
+
+ /**
+ * Test {@link BaseVariableWidthVector#getValueCapacity()}.
+ * @return useless. To avoid DCE by JIT.
+ */
+ @Benchmark
+ @BenchmarkMode(Mode.AverageTime)
+ @OutputTimeUnit(TimeUnit.NANOSECONDS)
+ public int getValueCapacity() {
+ return vector.getValueCapacity();
+ }
+
+ @Test
+ public void evaluate() throws RunnerException {
+ Options opt = new OptionsBuilder()
+ .include(VariableWidthVectorBenchmarks.class.getSimpleName())
+ .forks(1)
+ .build();
+
+ new Runner(opt).run();
+ }
+}
diff --git a/java/vector/src/main/codegen/templates/UnionVector.java b/java/vector/src/main/codegen/templates/UnionVector.java
index 1fabb6e..26f4673 100644
--- a/java/vector/src/main/codegen/templates/UnionVector.java
+++ b/java/vector/src/main/codegen/templates/UnionVector.java
@@ -615,6 +615,6 @@ public class UnionVector implements FieldVector {
}
private int getTypeBufferValueCapacity() {
- return (int) ((typeBuffer.capacity() * 1.0) / TYPE_WIDTH);
+ return typeBuffer.capacity() / TYPE_WIDTH;
}
}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java
index 4b828c6..3660096 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java
@@ -171,7 +171,7 @@ public abstract class BaseFixedWidthVector extends BaseValueVector
}
private int getValueBufferValueCapacity() {
- return (int) ((valueBuffer.capacity() * 1.0) / typeWidth);
+ return valueBuffer.capacity() / typeWidth;
}
private int getValidityBufferValueCapacity() {
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java
index 730a074..b5667df 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java
@@ -211,7 +211,7 @@ public abstract class BaseVariableWidthVector extends BaseValueVector
}
private int getOffsetBufferValueCapacity() {
- return (int) ((offsetBuffer.capacity() * 1.0) / OFFSET_WIDTH);
+ return offsetBuffer.capacity() / OFFSET_WIDTH;
}
/**
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java
index 3153598..a370cb8 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java
@@ -195,7 +195,7 @@ public abstract class BaseRepeatedValueVector extends BaseValueVector implements
}
protected int getOffsetBufferValueCapacity() {
- return (int) ((offsetBuffer.capacity() * 1.0) / OFFSET_WIDTH);
+ return offsetBuffer.capacity() / OFFSET_WIDTH;
}
@Override