arrow git commit: ARROW-1101: Implement write(TypeHolder) methods in UnionListWriter
Repository: arrow
Updated Branches:
refs/heads/master e3f235f52 -> 81c4bd695
ARROW-1101: Implement write(TypeHolder) methods in UnionListWriter
Author: vkorukanti
Closes #740 from vkorukanti/ARROW-1101 and squashes the following commits:
e2d097d [vkorukanti] ARROW-1101: Implement write(TypeHolder) methods in
UnionListWriter
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/81c4bd69
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/81c4bd69
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/81c4bd69
Branch: refs/heads/master
Commit: 81c4bd695f8156cc9cdf280eae3368c42c953aa6
Parents: e3f235f
Author: vkorukanti
Authored: Wed Jun 7 17:01:30 2017 -0700
Committer: Julien Le Dem
Committed: Wed Jun 7 17:01:30 2017 -0700
--
java/vector/src/main/codegen/templates/UnionListWriter.java | 5 +
.../arrow/vector/complex/writer/TestComplexWriter.java | 9 -
2 files changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/arrow/blob/81c4bd69/java/vector/src/main/codegen/templates/UnionListWriter.java
--
diff --git a/java/vector/src/main/codegen/templates/UnionListWriter.java
b/java/vector/src/main/codegen/templates/UnionListWriter.java
index d6e2f9f..9fe41d0 100644
--- a/java/vector/src/main/codegen/templates/UnionListWriter.java
+++ b/java/vector/src/main/codegen/templates/UnionListWriter.java
@@ -166,6 +166,11 @@ public class UnionListWriter extends AbstractFieldWriter {
writer.setPosition(writer.idx()+1);
}
+ public void write(${name}Holder holder) {
+writer.write${name}(<#list fields as field>holder.${field.name}<#if
field_has_next>, );
+writer.setPosition(writer.idx()+1);
+ }
+
http://git-wip-us.apache.org/repos/asf/arrow/blob/81c4bd69/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java
--
diff --git
a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java
b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java
index ede8d65..5a9c80d 100644
---
a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java
+++
b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java
@@ -42,6 +42,7 @@ import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.complex.writer.BaseWriter.ComplexWriter;
import org.apache.arrow.vector.complex.writer.BaseWriter.ListWriter;
import org.apache.arrow.vector.complex.writer.BaseWriter.MapWriter;
+import org.apache.arrow.vector.holders.IntHolder;
import org.apache.arrow.vector.holders.NullableTimeStampNanoTZHolder;
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.ArrowType.ArrowTypeID;
@@ -216,7 +217,13 @@ public class TestComplexWriter {
for (int i = 0; i < COUNT; i++) {
listWriter.startList();
for (int j = 0; j < i % 7; j++) {
-listWriter.writeInt(j);
+if (j%2 == 0) {
+ listWriter.writeInt(j);
+} else {
+ IntHolder holder = new IntHolder();
+ holder.value = j;
+ listWriter.write(holder);
+}
}
listWriter.endList();
}
arrow git commit: ARROW-1048: Use existing LD_LIBRARY_PATH in source release script to accommodate non-system toolchain libs
Repository: arrow
Updated Branches:
refs/heads/master 261422b70 -> e3f235f52
ARROW-1048: Use existing LD_LIBRARY_PATH in source release script to
accommodate non-system toolchain libs
Tripped on this again when cutting the 0.4.1 rc0. cc @kou
Author: Wes McKinney
Closes #738 from wesm/ARROW-1048 and squashes the following commits:
f335c09 [Wes McKinney] Use existing LD_LIBRARY_PATH in source release script to
accommodate non-system toolchain libraries
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/e3f235f5
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/e3f235f5
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/e3f235f5
Branch: refs/heads/master
Commit: e3f235f5277fefccf6eb2aa68746141776dc4eee
Parents: 261422b
Author: Wes McKinney
Authored: Wed Jun 7 22:31:39 2017 +0900
Committer: Kouhei Sutou
Committed: Wed Jun 7 22:31:39 2017 +0900
--
dev/release/02-source.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/arrow/blob/e3f235f5/dev/release/02-source.sh
--
diff --git a/dev/release/02-source.sh b/dev/release/02-source.sh
index d3d94af..508141e 100755
--- a/dev/release/02-source.sh
+++ b/dev/release/02-source.sh
@@ -74,7 +74,7 @@ cd ${extract_dir}/c_glib
./configure \
PKG_CONFIG_PATH=$cpp_install_dir/lib/pkgconfig \
--enable-gtk-doc
-LD_LIBRARY_PATH=$cpp_install_dir/lib make -j8
+LD_LIBRARY_PATH=$cpp_install_dir/lib:$LD_LIBRARY_PATH make -j8
make dist
tar xzf *.tar.gz
rm *.tar.gz
@@ -114,4 +114,3 @@ echo "Success! The release candidate is available here:"
echo " https://dist.apache.org/repos/dist/dev/arrow/${tagrc}";
echo ""
echo "Commit SHA1: ${release_hash}"
-
arrow git commit: ARROW-1095: Add Arrow logo PNG to website img folder
Repository: arrow Updated Branches: refs/heads/master 2a12482b2 -> 261422b70 ARROW-1095: Add Arrow logo PNG to website img folder Author: Wes McKinney Closes #739 from wesm/ARROW-1095 and squashes the following commits: 4a89d2d [Wes McKinney] Add Arrow logo PNG Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/261422b7 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/261422b7 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/261422b7 Branch: refs/heads/master Commit: 261422b70a24c00f88e5ea51a4dfdc658ea4dacb Parents: 2a12482 Author: Wes McKinney Authored: Wed Jun 7 21:26:20 2017 +0900 Committer: Kouhei Sutou Committed: Wed Jun 7 21:26:20 2017 +0900 -- site/img/arrow.png | Bin 0 -> 21475 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/arrow/blob/261422b7/site/img/arrow.png -- diff --git a/site/img/arrow.png b/site/img/arrow.png new file mode 100644 index 000..20b00bd Binary files /dev/null and b/site/img/arrow.png differ
