Skip to content

Commit 8bbc625

Browse files
julienledemjenkins
authored and
jenkins
committed
address conflict due to new loadFieldBuffers method
1 parent 8153cdf commit 8bbc625

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java

+12-5
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,14 @@
2626
import java.util.List;
2727
import java.util.Objects;
2828

29-
import com.google.common.base.Preconditions;
30-
import com.google.common.collect.ImmutableList;
31-
import com.google.common.collect.ObjectArrays;
32-
33-
import io.netty.buffer.ArrowBuf;
3429
import org.apache.arrow.memory.BufferAllocator;
3530
import org.apache.arrow.memory.OutOfMemoryException;
3631
import org.apache.arrow.vector.AddOrGetResult;
3732
import org.apache.arrow.vector.BaseDataValueVector;
3833
import org.apache.arrow.vector.BaseValueVector;
3934
import org.apache.arrow.vector.BitVector;
4035
import org.apache.arrow.vector.BufferBacked;
36+
import org.apache.arrow.vector.BuffersIterator;
4137
import org.apache.arrow.vector.FieldVector;
4238
import org.apache.arrow.vector.ValueVector;
4339
import org.apache.arrow.vector.ZeroVector;
@@ -53,6 +49,12 @@
5349
import org.apache.arrow.vector.util.SchemaChangeRuntimeException;
5450
import org.apache.arrow.vector.util.TransferPair;
5551

52+
import com.google.common.base.Preconditions;
53+
import com.google.common.collect.ImmutableList;
54+
import com.google.common.collect.ObjectArrays;
55+
56+
import io.netty.buffer.ArrowBuf;
57+
5658
public class FixedSizeListVector extends BaseValueVector implements FieldVector, PromotableVector {
5759

5860
private FieldVector vector;
@@ -120,6 +122,11 @@ public void loadFieldBuffers(ArrowFieldNode fieldNode, List<ArrowBuf> ownBuffers
120122
BaseDataValueVector.load(fieldNode, innerVectors, ownBuffers);
121123
}
122124

125+
public void loadFieldBuffers(BuffersIterator buffersIterator, ArrowBuf buf) {
126+
// TODO: to be fixed in https://github.com/apache/arrow/pull/508
127+
throw new UnsupportedOperationException();
128+
}
129+
123130
@Override
124131
public List<ArrowBuf> getFieldBuffers() {
125132
return BaseDataValueVector.unload(innerVectors);

0 commit comments

Comments
 (0)