Skip to content

Commit

Permalink
ARROW-5639: [Java] Remove floating point computation from getOffsetBu…
Browse files Browse the repository at this point in the history
…fferValueCapacity

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 <[email protected]>

Closes #4602 from liyafan82/fly_0618_mult and squashes the following commits:

dd905f3 <liyafan82>  Remove more floating point computations
dee0fcf <liyafan82>  Remove floating point computation from BaseVariableWidthVector#getOffsetBufferValueCapacity
  • Loading branch information
liyafan82 authored and emkornfield committed Jun 20, 2019
1 parent a6b210d commit 333d9fd
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -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();
}
}
2 changes: 1 addition & 1 deletion java/vector/src/main/codegen/templates/UnionVector.java
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,6 @@ public void setType(int index, MinorType type) {
}

private int getTypeBufferValueCapacity() {
return (int) ((typeBuffer.capacity() * 1.0) / TYPE_WIDTH);
return typeBuffer.capacity() / TYPE_WIDTH;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public int getValueCapacity() {
}

private int getValueBufferValueCapacity() {
return (int) ((valueBuffer.capacity() * 1.0) / typeWidth);
return valueBuffer.capacity() / typeWidth;
}

private int getValidityBufferValueCapacity() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ private int getValidityBufferValueCapacity() {
}

private int getOffsetBufferValueCapacity() {
return (int) ((offsetBuffer.capacity() * 1.0) / OFFSET_WIDTH);
return offsetBuffer.capacity() / OFFSET_WIDTH;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public int getValueCapacity() {
}

protected int getOffsetBufferValueCapacity() {
return (int) ((offsetBuffer.capacity() * 1.0) / OFFSET_WIDTH);
return offsetBuffer.capacity() / OFFSET_WIDTH;
}

@Override
Expand Down

0 comments on commit 333d9fd

Please sign in to comment.