ARROW-1062: [GLib] Follow API changes in examples

kou · wesm · commit d2cc199cc480 · 2017-05-31T13:45:48.000-04:00
Author: Kouhei Sutou <kou@clear-code.com> Closes #709 from kou/glib-fix-examples and squashes the following commits: ed5c465 [Kouhei Sutou] [GLib] Follow API changes in examples
diff --git a/.travis.yml b/.travis.yml
@@ -17,6 +17,7 @@ addons:
     - gtk-doc-tools
     - autoconf-archive
     - libgirepository1.0-dev
+    - gir1.2-gudev-1.0
 services:
   - docker
 
diff --git a/c_glib/arrow-glib/table.h b/c_glib/arrow-glib/table.h
@@ -86,6 +86,4 @@ GArrowTable    *garrow_table_remove_column (GArrowTable *table,
                                             guint i,
                                             GError **error);
 
-gchar          *garrow_table_to_string     (GArrowTable *table);
-
 G_END_DECLS
diff --git a/c_glib/example/go/read-batch.go b/c_glib/example/go/read-batch.go
@@ -82,7 +82,7 @@ func main() {
 	if err != nil {
 		log.Fatalf("Failed to open path: <%s>: %v", path, err)
 	}
-	reader, err := arrow.NewFileReader(input)
+	reader, err := arrow.NewRecordBatchFileReader(input)
 	if err != nil {
 		log.Fatalf("Failed to parse data: %v", err)
 	}
diff --git a/c_glib/example/go/read-stream.go b/c_glib/example/go/read-stream.go
@@ -82,7 +82,7 @@ func main() {
 	if err != nil {
 		log.Fatalf("Failed to open path: <%s>: %v", path, err)
 	}
-	reader, err := arrow.NewStreamReader(input)
+	reader, err := arrow.NewRecordBatchStreamReader(input)
 	if err != nil {
 		log.Fatalf("Failed to parse data: %v", err)
 	}
diff --git a/c_glib/example/go/write-batch.go b/c_glib/example/go/write-batch.go
@@ -130,7 +130,7 @@ func main() {
 	if err != nil {
 		log.Fatalf("Failed to open path: <%s>: %v", output_path, err)
 	}
-	writer, err := arrow.NewFileWriter(output, schema)
+	writer, err := arrow.NewRecordBatchFileWriter(output, schema)
 	if err != nil {
 		log.Fatalf("Failed to create writer: %v", err)
 	}
diff --git a/c_glib/example/go/write-stream.go b/c_glib/example/go/write-stream.go
@@ -130,7 +130,7 @@ func main() {
 	if err != nil {
 		log.Fatalf("Failed to open path: <%s>: %v", output_path, err)
 	}
-	writer, err := arrow.NewStreamWriter(output, schema)
+	writer, err := arrow.NewRecordBatchStreamWriter(output, schema)
 	if err != nil {
 		log.Fatalf("Failed to create writer: %v", err)
 	}
diff --git a/c_glib/example/lua/read-batch.lua b/c_glib/example/lua/read-batch.lua
@@ -21,7 +21,7 @@ local Arrow = lgi.Arrow
 local input_path = arg[1] or "/tmp/batch.arrow";
 
 local input = Arrow.MemoryMappedInputStream.new(input_path)
-local reader = Arrow.FileReader.new(input)
+local reader = Arrow.RecordBatchFileReader.new(input)
 
 for i = 0, reader:get_n_record_batches() - 1 do
    local record_batch = reader:get_record_batch(i)
diff --git a/c_glib/example/lua/read-stream.lua b/c_glib/example/lua/read-stream.lua
@@ -21,7 +21,7 @@ local Arrow = lgi.Arrow
 local input_path = arg[1] or "/tmp/stream.arrow";
 
 local input = Arrow.MemoryMappedInputStream.new(input_path)
-local reader = Arrow.StreamReader.new(input)
+local reader = Arrow.RecordBatchStreamReader.new(input)
 
 local i = 0
 while true do
diff --git a/c_glib/example/lua/stream-to-torch-tensor.lua b/c_glib/example/lua/stream-to-torch-tensor.lua
@@ -77,7 +77,7 @@ end
 local input_path = arg[1] or "/tmp/stream.arrow";
 
 local input = Arrow.MemoryMappedInputStream.new(input_path)
-local reader = Arrow.StreamReader.open(input)
+local reader = Arrow.RecordBatchStreamReader.new(input)
 
 local i = 0
 while true do
diff --git a/c_glib/example/lua/write-batch.lua b/c_glib/example/lua/write-batch.lua
@@ -35,7 +35,7 @@ local fields = {
 local schema = Arrow.Schema.new(fields)
 
 local output = Arrow.FileOutputStream.new(output_path, false)
-local writer = Arrow.FileWriter.new(output, schema)
+local writer = Arrow.RecordBatchFileWriter.new(output, schema)
 
 function build_array(builder, values)
    for _, value in pairs(values) do
diff --git a/c_glib/example/lua/write-stream.lua b/c_glib/example/lua/write-stream.lua
@@ -35,7 +35,7 @@ local fields = {
 local schema = Arrow.Schema.new(fields)
 
 local output = Arrow.FileOutputStream.new(output_path, false)
-local writer = Arrow.StreamWriter.new(output, schema)
+local writer = Arrow.RecordBatchStreamWriter.new(output, schema)
 
 function build_array(builder, values)
    for _, value in pairs(values) do
diff --git a/ci/travis_before_script_c_glib.sh b/ci/travis_before_script_c_glib.sh
@@ -18,14 +18,32 @@ set -ex
 source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh
 
 if [ $TRAVIS_OS_NAME == "osx" ]; then
-    brew install gtk-doc autoconf-archive gobject-introspection
+  brew install gtk-doc autoconf-archive gobject-introspection
 fi
 
 gem install gobject-introspection
 
-pushd $ARROW_C_GLIB_DIR
+git clone \
+  --quiet \
+  --depth 1 \
+  --recursive \
+  https://github.com/torch/distro.git ~/torch
+pushd ~/torch
+./install-deps > /dev/null
+echo "yes" | ./install.sh > /dev/null
+. ~/torch/install/bin/torch-activate
+popd
+luarocks install lgi
+
+go get github.com/linuxdeepin/go-gir-generator || :
+pushd $GOPATH/src/github.com/linuxdeepin/go-gir-generator
+make build copyfile
+mkdir -p $GOPATH/bin/
+cp -a out/gir-generator $GOPATH/bin/
+cp -a out/src/gir/ $GOPATH/src/
+popd
 
-: ${ARROW_C_GLIB_INSTALL=$TRAVIS_BUILD_DIR/c-glib-install}
+pushd $ARROW_C_GLIB_DIR
 
 ./autogen.sh
 
diff --git a/ci/travis_env_common.sh b/ci/travis_env_common.sh
@@ -30,3 +30,4 @@ export ARROW_INTEGRATION_DIR=$TRAVIS_BUILD_DIR/integration
 
 export ARROW_CPP_INSTALL=$TRAVIS_BUILD_DIR/cpp-install
 export ARROW_CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/cpp-build
+export ARROW_C_GLIB_INSTALL=$TRAVIS_BUILD_DIR/c-glib-install
diff --git a/ci/travis_script_c_glib.sh b/ci/travis_script_c_glib.sh
@@ -14,11 +14,34 @@
 
 set -e
 
-ARROW_C_GLIB_DIR=$TRAVIS_BUILD_DIR/c_glib
+source $TRAVIS_BUILD_DIR/ci/travis_env_common.sh
 
 pushd $ARROW_C_GLIB_DIR
 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ARROW_CPP_INSTALL/lib
 NO_MAKE=yes test/run-test.sh
 
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ARROW_C_GLIB_INSTALL/lib
+export GI_TYPELIB_PATH=$ARROW_C_GLIB_INSTALL/lib/girepository-1.0
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ARROW_CPP_INSTALL/lib/pkgconfig
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ARROW_C_GLIB_INSTALL/lib/pkgconfig
+
+pushd example/lua
+. ~/torch/install/bin/torch-activate
+luajit write-batch.lua
+luajit read-batch.lua
+luajit write-stream.lua
+luajit read-stream.lua
+luajit stream-to-torch-tensor.lua
+popd
+
+pushd example/go
+make generate
+make
+./write-batch
+./read-batch
+./write-stream
+./read-stream
+popd
+
 popd

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func main() {`
`82`	`82`	`if err != nil {`
`83`	`83`	`log.Fatalf("Failed to open path: <%s>: %v", path, err)`
`84`	`84`	`}`
`85`		`- reader, err := arrow.NewFileReader(input)`
	`85`	`+ reader, err := arrow.NewRecordBatchFileReader(input)`
`86`	`86`	`if err != nil {`
`87`	`87`	`log.Fatalf("Failed to parse data: %v", err)`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func main() {`
`130`	`130`	`if err != nil {`
`131`	`131`	`log.Fatalf("Failed to open path: <%s>: %v", output_path, err)`
`132`	`132`	`}`
`133`		`- writer, err := arrow.NewFileWriter(output, schema)`
	`133`	`+ writer, err := arrow.NewRecordBatchFileWriter(output, schema)`
`134`	`134`	`if err != nil {`
`135`	`135`	`log.Fatalf("Failed to create writer: %v", err)`
`136`	`136`	`}`