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/11 05:26:29 UTC
[arrow] branch master updated: ARROW-5513: [Java] Refactor method
name for getstartOffset to use camel case
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 24fe0bc ARROW-5513: [Java] Refactor method name for getstartOffset to use camel case
24fe0bc is described below
commit 24fe0bce3c77506525b7c7f06d25485f26da31a7
Author: liyafan82 <fa...@foxmail.com>
AuthorDate: Mon Jun 10 22:25:47 2019 -0700
ARROW-5513: [Java] Refactor method name for getstartOffset to use camel case
The method getstartOffset in class org.apache.arrow.vector.BaseVariableWidthVector should be refactored to getStartOffset, to comply with the camel case.
Fortunately, this method is not public, so the changes are internal to Arrow.
Author: liyafan82 <fa...@foxmail.com>
Closes #4475 from liyafan82/fly_0605_start and squashes the following commits:
6c2c333fb <liyafan82> Fix javadoc
d0b57bef5 <liyafan82> Preserve the old method and make it deprecated
919bb3d1d <liyafan82> Refactor method name for getstartOffset to use camel case
---
.../arrow/vector/BaseVariableWidthVector.java | 25 ++++++++++++++++------
.../org/apache/arrow/vector/VarBinaryVector.java | 12 +++++------
.../org/apache/arrow/vector/VarCharVector.java | 12 +++++------
.../org/apache/arrow/vector/TestValueVector.java | 4 ++--
4 files changed, 32 insertions(+), 21 deletions(-)
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 05a43ad..730a074 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
@@ -342,7 +342,7 @@ public abstract class BaseVariableWidthVector extends BaseValueVector
offsetBuffer.writerIndex(0);
valueBuffer.writerIndex(0);
} else {
- final int lastDataOffset = getstartOffset(valueCount);
+ final int lastDataOffset = getStartOffset(valueCount);
validityBuffer.writerIndex(getValidityBufferSizeFromCount(valueCount));
offsetBuffer.writerIndex((valueCount + 1) * OFFSET_WIDTH);
valueBuffer.writerIndex(lastDataOffset);
@@ -928,7 +928,7 @@ public abstract class BaseVariableWidthVector extends BaseValueVector
assert index >= 0;
handleSafe(index, length);
fillHoles(index);
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + length);
lastSet = index;
}
@@ -944,7 +944,7 @@ public abstract class BaseVariableWidthVector extends BaseValueVector
if (isSet(index) == 0) {
return 0;
}
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
final int dataLength =
offsetBuffer.getInt((index + 1) * OFFSET_WIDTH) - startOffset;
return dataLength;
@@ -1032,7 +1032,7 @@ public abstract class BaseVariableWidthVector extends BaseValueVector
assert index >= 0;
fillHoles(index);
BitVectorHelper.setValidityBitToOne(validityBuffer, index);
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + length);
valueBuffer.setBytes(startOffset, value, start, length);
lastSet = index;
@@ -1053,7 +1053,7 @@ public abstract class BaseVariableWidthVector extends BaseValueVector
fillEmpties(index);
handleSafe(index, length);
BitVectorHelper.setValidityBitToOne(validityBuffer, index);
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + length);
valueBuffer.setBytes(startOffset, value, start, length);
lastSet = index;
@@ -1176,14 +1176,25 @@ public abstract class BaseVariableWidthVector extends BaseValueVector
/* end offset of current last element in the vector. this will
* be the start offset of new element we are trying to store.
*/
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
/* set new end offset */
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + length);
/* store the var length data in value buffer */
valueBuffer.setBytes(startOffset, value, start, length);
}
+ /**
+ * Gets the starting offset of a record, given its index.
+ * This method is deprecated. Please use {@link BaseVariableWidthVector#getStartOffset(int)} instead.
+ * @param index index of the record.
+ * @return the starting offset of the record.
+ */
+ @Deprecated
protected final int getstartOffset(int index) {
+ return getStartOffset(index);
+ }
+
+ protected final int getStartOffset(int index) {
return offsetBuffer.getInt(index * OFFSET_WIDTH);
}
@@ -1211,7 +1222,7 @@ public abstract class BaseVariableWidthVector extends BaseValueVector
while (index >= getValueCapacity()) {
reallocValidityAndOffsetBuffers();
}
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
while (valueBuffer.capacity() < (startOffset + dataLength)) {
reallocDataBuffer();
}
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java b/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java
index 60483c0..ce5f6ed 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java
@@ -100,7 +100,7 @@ public class VarBinaryVector extends BaseVariableWidthVector {
if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
throw new IllegalStateException("Value at index is null");
}
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
final int dataLength =
offsetBuffer.getInt((index + 1) * OFFSET_WIDTH) - startOffset;
final byte[] result = new byte[dataLength];
@@ -138,7 +138,7 @@ public class VarBinaryVector extends BaseVariableWidthVector {
return;
}
holder.isSet = 1;
- holder.start = getstartOffset(index);
+ holder.start = getStartOffset(index);
holder.end = offsetBuffer.getInt((index + 1) * OFFSET_WIDTH);
holder.buffer = valueBuffer;
}
@@ -205,7 +205,7 @@ public class VarBinaryVector extends BaseVariableWidthVector {
fillHoles(index);
BitVectorHelper.setValidityBitToOne(validityBuffer, index);
final int dataLength = holder.end - holder.start;
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + dataLength);
valueBuffer.setBytes(startOffset, holder.buffer, holder.start, dataLength);
lastSet = index;
@@ -225,7 +225,7 @@ public class VarBinaryVector extends BaseVariableWidthVector {
fillEmpties(index);
handleSafe(index, dataLength);
BitVectorHelper.setValidityBitToOne(validityBuffer, index);
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + dataLength);
valueBuffer.setBytes(startOffset, holder.buffer, holder.start, dataLength);
lastSet = index;
@@ -243,7 +243,7 @@ public class VarBinaryVector extends BaseVariableWidthVector {
fillHoles(index);
BitVectorHelper.setValidityBit(validityBuffer, index, holder.isSet);
final int dataLength = holder.end - holder.start;
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + dataLength);
valueBuffer.setBytes(startOffset, holder.buffer, holder.start, dataLength);
lastSet = index;
@@ -263,7 +263,7 @@ public class VarBinaryVector extends BaseVariableWidthVector {
fillEmpties(index);
handleSafe(index, dataLength);
BitVectorHelper.setValidityBit(validityBuffer, index, holder.isSet);
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + dataLength);
valueBuffer.setBytes(startOffset, holder.buffer, holder.start, dataLength);
lastSet = index;
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java b/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java
index b5cd253..317d588 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java
@@ -97,7 +97,7 @@ public class VarCharVector extends BaseVariableWidthVector {
if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
throw new IllegalStateException("Value at index is null");
}
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
final int dataLength =
offsetBuffer.getInt((index + 1) * OFFSET_WIDTH) - startOffset;
final byte[] result = new byte[dataLength];
@@ -137,7 +137,7 @@ public class VarCharVector extends BaseVariableWidthVector {
return;
}
holder.isSet = 1;
- holder.start = getstartOffset(index);
+ holder.start = getStartOffset(index);
holder.end = offsetBuffer.getInt((index + 1) * OFFSET_WIDTH);
holder.buffer = valueBuffer;
}
@@ -204,7 +204,7 @@ public class VarCharVector extends BaseVariableWidthVector {
fillHoles(index);
BitVectorHelper.setValidityBitToOne(validityBuffer, index);
final int dataLength = holder.end - holder.start;
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + dataLength);
valueBuffer.setBytes(startOffset, holder.buffer, holder.start, dataLength);
lastSet = index;
@@ -224,7 +224,7 @@ public class VarCharVector extends BaseVariableWidthVector {
fillEmpties(index);
handleSafe(index, dataLength);
BitVectorHelper.setValidityBitToOne(validityBuffer, index);
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + dataLength);
valueBuffer.setBytes(startOffset, holder.buffer, holder.start, dataLength);
lastSet = index;
@@ -242,7 +242,7 @@ public class VarCharVector extends BaseVariableWidthVector {
fillHoles(index);
BitVectorHelper.setValidityBit(validityBuffer, index, holder.isSet);
final int dataLength = holder.end - holder.start;
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + dataLength);
valueBuffer.setBytes(startOffset, holder.buffer, holder.start, dataLength);
lastSet = index;
@@ -262,7 +262,7 @@ public class VarCharVector extends BaseVariableWidthVector {
fillEmpties(index);
handleSafe(index, dataLength);
BitVectorHelper.setValidityBit(validityBuffer, index, holder.isSet);
- final int startOffset = getstartOffset(index);
+ final int startOffset = getStartOffset(index);
offsetBuffer.setInt((index + 1) * OFFSET_WIDTH, startOffset + dataLength);
valueBuffer.setBytes(startOffset, holder.buffer, holder.start, dataLength);
lastSet = index;
diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java
index 918a144..2361389 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java
@@ -1442,8 +1442,8 @@ public class TestValueVector {
toVector.setInitialCapacity(numValues);
toVector.allocateNew();
for (int i = 0; i < numValues; i++) {
- int start = fromVector.getstartOffset(i);
- int end = fromVector.getstartOffset(i + 1);
+ int start = fromVector.getStartOffset(i);
+ int end = fromVector.getStartOffset(i + 1);
toVector.setSafe(i, isSet, start, end, fromDataBuffer);
}