Skip to content

Commit

Permalink
address conflict due to new loadFieldBuffers method
Browse files Browse the repository at this point in the history
  • Loading branch information
julienledem authored and jenkins committed Apr 21, 2017
1 parent 8153cdf commit 8bbc625
Showing 1 changed file with 12 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,14 @@
import java.util.List;
import java.util.Objects;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ObjectArrays;

import io.netty.buffer.ArrowBuf;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.OutOfMemoryException;
import org.apache.arrow.vector.AddOrGetResult;
import org.apache.arrow.vector.BaseDataValueVector;
import org.apache.arrow.vector.BaseValueVector;
import org.apache.arrow.vector.BitVector;
import org.apache.arrow.vector.BufferBacked;
import org.apache.arrow.vector.BuffersIterator;
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.ZeroVector;
Expand All @@ -53,6 +49,12 @@
import org.apache.arrow.vector.util.SchemaChangeRuntimeException;
import org.apache.arrow.vector.util.TransferPair;

import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ObjectArrays;

import io.netty.buffer.ArrowBuf;

public class FixedSizeListVector extends BaseValueVector implements FieldVector, PromotableVector {

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

public void loadFieldBuffers(BuffersIterator buffersIterator, ArrowBuf buf) {
// TODO: to be fixed in https://github.com/apache/arrow/pull/508
throw new UnsupportedOperationException();
}

@Override
public List<ArrowBuf> getFieldBuffers() {
return BaseDataValueVector.unload(innerVectors);
Expand Down

0 comments on commit 8bbc625

Please sign in to comment.