Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D76DE200CC8 for ; Fri, 9 Jun 2017 00:00:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D632D160BC3; Thu, 8 Jun 2017 22:00:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 238D9160BE7 for ; Fri, 9 Jun 2017 00:00:03 +0200 (CEST) Received: (qmail 93579 invoked by uid 500); 8 Jun 2017 22:00:03 -0000 Mailing-List: contact commits-help@arrow.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@arrow.apache.org Delivered-To: mailing list commits@arrow.apache.org Received: (qmail 93548 invoked by uid 99); 8 Jun 2017 22:00:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2017 22:00:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48AD2E2F41; Thu, 8 Jun 2017 22:00:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: smp@apache.org To: commits@arrow.apache.org Date: Thu, 08 Jun 2017 22:00:06 -0000 Message-Id: In-Reply-To: <4228425aaba645c49a3215f7779f9af4@git.apache.org> References: <4228425aaba645c49a3215f7779f9af4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] arrow git commit: ARROW-1112: [JAVA] Set lastSet for VarLength and List vectors when loading archived-at: Thu, 08 Jun 2017 22:00:05 -0000 ARROW-1112: [JAVA] Set lastSet for VarLength and List vectors when loading Closes #748 Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/037d78dd Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/037d78dd Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/037d78dd Branch: refs/heads/master Commit: 037d78ddac31550e62a5c4463cc5611b0be71497 Parents: 68b2cc6 Author: Steven Phillips Authored: Tue Jun 6 15:19:42 2017 -0700 Committer: Steven Phillips Committed: Thu Jun 8 14:58:16 2017 -0700 ---------------------------------------------------------------------- java/vector/src/main/codegen/templates/NullableValueVectors.java | 1 + .../src/main/java/org/apache/arrow/vector/complex/ListVector.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/037d78dd/java/vector/src/main/codegen/templates/NullableValueVectors.java ---------------------------------------------------------------------- diff --git a/java/vector/src/main/codegen/templates/NullableValueVectors.java b/java/vector/src/main/codegen/templates/NullableValueVectors.java index 4aa0076..092097b 100644 --- a/java/vector/src/main/codegen/templates/NullableValueVectors.java +++ b/java/vector/src/main/codegen/templates/NullableValueVectors.java @@ -143,6 +143,7 @@ public final class ${className} extends BaseDataValueVector implements <#if type org.apache.arrow.vector.BaseDataValueVector.truncateBufferBasedOnSize(ownBuffers, 1, values.offsetVector.getBufferSizeFor( fieldNode.getLength() == 0? 0 : fieldNode.getLength() + 1)); + mutator.lastSet = fieldNode.getLength() - 1; <#else> // fixed width values truncate value vector to size (#1) org.apache.arrow.vector.BaseDataValueVector.truncateBufferBasedOnSize(ownBuffers, 1, values.getBufferSizeFor(fieldNode.getLength())); http://git-wip-us.apache.org/repos/asf/arrow/blob/037d78dd/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java ---------------------------------------------------------------------- diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java index b5a27b5..4ab624f 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java @@ -115,6 +115,7 @@ public class ListVector extends BaseRepeatedValueVector implements FieldVector, // variable width values: truncate offset vector buffer to size (#1) org.apache.arrow.vector.BaseDataValueVector.truncateBufferBasedOnSize(ownBuffers, 1, offsets.getBufferSizeFor(fieldNode.getLength() + 1)); BaseDataValueVector.load(fieldNode, getFieldInnerVectors(), ownBuffers); + lastSet = fieldNode.getLength(); } @Override