Repository: arrow Updated Branches: refs/heads/master 2d5142cd3 -> b4886da0f
ARROW-919: [GLib] Use "id" to get type enum value from GArrowDataType Author: Kouhei Sutou <[email protected]> Closes #619 from kou/glib-data-type-use-id and squashes the following commits: e20d445 [Kouhei Sutou] [GLib] Use "id" to get type enum value from GArrowDataType Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/b4886da0 Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/b4886da0 Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/b4886da0 Branch: refs/heads/master Commit: b4886da0f19484fe829fdb23a231a864070bf58c Parents: 2d5142c Author: Kouhei Sutou <[email protected]> Authored: Sun Apr 30 13:33:06 2017 -0400 Committer: Wes McKinney <[email protected]> Committed: Sun Apr 30 13:33:06 2017 -0400 ---------------------------------------------------------------------- c_glib/arrow-glib/data-type.cpp | 6 +++--- c_glib/arrow-glib/data-type.h | 2 +- c_glib/test/test-binary-data-type.rb | 2 +- c_glib/test/test-boolean-data-type.rb | 2 +- c_glib/test/test-double-data-type.rb | 2 +- c_glib/test/test-float-data-type.rb | 2 +- c_glib/test/test-int16-data-type.rb | 2 +- c_glib/test/test-int32-data-type.rb | 2 +- c_glib/test/test-int64-data-type.rb | 2 +- c_glib/test/test-int8-data-type.rb | 2 +- c_glib/test/test-list-data-type.rb | 2 +- c_glib/test/test-null-data-type.rb | 2 +- c_glib/test/test-string-data-type.rb | 2 +- c_glib/test/test-uint16-data-type.rb | 2 +- c_glib/test/test-uint32-data-type.rb | 2 +- c_glib/test/test-uint64-data-type.rb | 2 +- c_glib/test/test-uint8-data-type.rb | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/arrow-glib/data-type.cpp ---------------------------------------------------------------------- diff --git a/c_glib/arrow-glib/data-type.cpp b/c_glib/arrow-glib/data-type.cpp index 2fd261d..c3c7fdb 100644 --- a/c_glib/arrow-glib/data-type.cpp +++ b/c_glib/arrow-glib/data-type.cpp @@ -192,13 +192,13 @@ garrow_data_type_to_string(GArrowDataType *data_type) } /** - * garrow_data_type_type: + * garrow_data_type_get_id: * @data_type: A #GArrowDataType. * - * Returns: The type of the data type. + * Returns: The #GArrowType of the data type. */ GArrowType -garrow_data_type_type(GArrowDataType *data_type) +garrow_data_type_get_id(GArrowDataType *data_type) { const auto arrow_data_type = garrow_data_type_get_raw(data_type); return garrow_type_from_raw(arrow_data_type->id()); http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/arrow-glib/data-type.h ---------------------------------------------------------------------- diff --git a/c_glib/arrow-glib/data-type.h b/c_glib/arrow-glib/data-type.h index babf0ee..933fcfc 100644 --- a/c_glib/arrow-glib/data-type.h +++ b/c_glib/arrow-glib/data-type.h @@ -73,7 +73,7 @@ GType garrow_data_type_get_type (void) G_GNUC_CONST; gboolean garrow_data_type_equal (GArrowDataType *data_type, GArrowDataType *other_data_type); gchar *garrow_data_type_to_string (GArrowDataType *data_type); -GArrowType garrow_data_type_type (GArrowDataType *data_type); +GArrowType garrow_data_type_get_id (GArrowDataType *data_type); #define GARROW_TYPE_NULL_DATA_TYPE \ http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-binary-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-binary-data-type.rb b/c_glib/test/test-binary-data-type.rb index 3d4095c..5a1cb89 100644 --- a/c_glib/test/test-binary-data-type.rb +++ b/c_glib/test/test-binary-data-type.rb @@ -18,7 +18,7 @@ class TestBinaryDataType < Test::Unit::TestCase def test_type data_type = Arrow::BinaryDataType.new - assert_equal(Arrow::Type::BINARY, data_type.type) + assert_equal(Arrow::Type::BINARY, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-boolean-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-boolean-data-type.rb b/c_glib/test/test-boolean-data-type.rb index ac56671..39b8128 100644 --- a/c_glib/test/test-boolean-data-type.rb +++ b/c_glib/test/test-boolean-data-type.rb @@ -18,7 +18,7 @@ class TestBooleanDataType < Test::Unit::TestCase def test_type data_type = Arrow::BooleanDataType.new - assert_equal(Arrow::Type::BOOL, data_type.type) + assert_equal(Arrow::Type::BOOL, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-double-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-double-data-type.rb b/c_glib/test/test-double-data-type.rb index 18c870c..0edd64e 100644 --- a/c_glib/test/test-double-data-type.rb +++ b/c_glib/test/test-double-data-type.rb @@ -18,7 +18,7 @@ class TestDoubleDataType < Test::Unit::TestCase def test_type data_type = Arrow::DoubleDataType.new - assert_equal(Arrow::Type::DOUBLE, data_type.type) + assert_equal(Arrow::Type::DOUBLE, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-float-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-float-data-type.rb b/c_glib/test/test-float-data-type.rb index ab315fd..8384b52 100644 --- a/c_glib/test/test-float-data-type.rb +++ b/c_glib/test/test-float-data-type.rb @@ -18,7 +18,7 @@ class TestFloatDataType < Test::Unit::TestCase def test_type data_type = Arrow::FloatDataType.new - assert_equal(Arrow::Type::FLOAT, data_type.type) + assert_equal(Arrow::Type::FLOAT, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-int16-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-int16-data-type.rb b/c_glib/test/test-int16-data-type.rb index 273ec80..aad5f11 100644 --- a/c_glib/test/test-int16-data-type.rb +++ b/c_glib/test/test-int16-data-type.rb @@ -18,7 +18,7 @@ class TestInt16DataType < Test::Unit::TestCase def test_type data_type = Arrow::Int16DataType.new - assert_equal(Arrow::Type::INT16, data_type.type) + assert_equal(Arrow::Type::INT16, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-int32-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-int32-data-type.rb b/c_glib/test/test-int32-data-type.rb index f6b9b34..2d9d44d 100644 --- a/c_glib/test/test-int32-data-type.rb +++ b/c_glib/test/test-int32-data-type.rb @@ -18,7 +18,7 @@ class TestInt32DataType < Test::Unit::TestCase def test_type data_type = Arrow::Int32DataType.new - assert_equal(Arrow::Type::INT32, data_type.type) + assert_equal(Arrow::Type::INT32, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-int64-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-int64-data-type.rb b/c_glib/test/test-int64-data-type.rb index 032b24d..3c5263e 100644 --- a/c_glib/test/test-int64-data-type.rb +++ b/c_glib/test/test-int64-data-type.rb @@ -18,7 +18,7 @@ class TestInt64DataType < Test::Unit::TestCase def test_type data_type = Arrow::Int64DataType.new - assert_equal(Arrow::Type::INT64, data_type.type) + assert_equal(Arrow::Type::INT64, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-int8-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-int8-data-type.rb b/c_glib/test/test-int8-data-type.rb index d339456..40de1be 100644 --- a/c_glib/test/test-int8-data-type.rb +++ b/c_glib/test/test-int8-data-type.rb @@ -18,7 +18,7 @@ class TestInt8DataType < Test::Unit::TestCase def test_type data_type = Arrow::Int8DataType.new - assert_equal(Arrow::Type::INT8, data_type.type) + assert_equal(Arrow::Type::INT8, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-list-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-list-data-type.rb b/c_glib/test/test-list-data-type.rb index 6fde203..aa6a8fa 100644 --- a/c_glib/test/test-list-data-type.rb +++ b/c_glib/test/test-list-data-type.rb @@ -19,7 +19,7 @@ class TestListDataType < Test::Unit::TestCase def test_type field = Arrow::Field.new("enabled", Arrow::BooleanDataType.new) data_type = Arrow::ListDataType.new(field) - assert_equal(Arrow::Type::LIST, data_type.type) + assert_equal(Arrow::Type::LIST, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-null-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-null-data-type.rb b/c_glib/test/test-null-data-type.rb index 95e5483..fd76667 100644 --- a/c_glib/test/test-null-data-type.rb +++ b/c_glib/test/test-null-data-type.rb @@ -18,7 +18,7 @@ class TestNullDataType < Test::Unit::TestCase def test_type data_type = Arrow::NullDataType.new - assert_equal(Arrow::Type::NA, data_type.type) + assert_equal(Arrow::Type::NA, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-string-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-string-data-type.rb b/c_glib/test/test-string-data-type.rb index daba7fd..550bf13 100644 --- a/c_glib/test/test-string-data-type.rb +++ b/c_glib/test/test-string-data-type.rb @@ -18,7 +18,7 @@ class TestStringDataType < Test::Unit::TestCase def test_type data_type = Arrow::StringDataType.new - assert_equal(Arrow::Type::STRING, data_type.type) + assert_equal(Arrow::Type::STRING, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-uint16-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-uint16-data-type.rb b/c_glib/test/test-uint16-data-type.rb index f5a6cc0..56f6cf4 100644 --- a/c_glib/test/test-uint16-data-type.rb +++ b/c_glib/test/test-uint16-data-type.rb @@ -18,7 +18,7 @@ class TestUInt16DataType < Test::Unit::TestCase def test_type data_type = Arrow::UInt16DataType.new - assert_equal(Arrow::Type::UINT16, data_type.type) + assert_equal(Arrow::Type::UINT16, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-uint32-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-uint32-data-type.rb b/c_glib/test/test-uint32-data-type.rb index 7a50257..7ad3f56 100644 --- a/c_glib/test/test-uint32-data-type.rb +++ b/c_glib/test/test-uint32-data-type.rb @@ -18,7 +18,7 @@ class TestUInt32DataType < Test::Unit::TestCase def test_type data_type = Arrow::UInt32DataType.new - assert_equal(Arrow::Type::UINT32, data_type.type) + assert_equal(Arrow::Type::UINT32, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-uint64-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-uint64-data-type.rb b/c_glib/test/test-uint64-data-type.rb index 403fc9a..f5bf3c9 100644 --- a/c_glib/test/test-uint64-data-type.rb +++ b/c_glib/test/test-uint64-data-type.rb @@ -18,7 +18,7 @@ class TestUInt64DataType < Test::Unit::TestCase def test_type data_type = Arrow::UInt64DataType.new - assert_equal(Arrow::Type::UINT64, data_type.type) + assert_equal(Arrow::Type::UINT64, data_type.id) end def test_to_s http://git-wip-us.apache.org/repos/asf/arrow/blob/b4886da0/c_glib/test/test-uint8-data-type.rb ---------------------------------------------------------------------- diff --git a/c_glib/test/test-uint8-data-type.rb b/c_glib/test/test-uint8-data-type.rb index eb91da2..d4bf797 100644 --- a/c_glib/test/test-uint8-data-type.rb +++ b/c_glib/test/test-uint8-data-type.rb @@ -18,7 +18,7 @@ class TestUInt8DataType < Test::Unit::TestCase def test_type data_type = Arrow::UInt8DataType.new - assert_equal(Arrow::Type::UINT8, data_type.type) + assert_equal(Arrow::Type::UINT8, data_type.id) end def test_to_s
