You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/07/14 19:32:25 UTC
arrow git commit: ARROW-1200: C++: Switch DictionaryBuilder to signed
integers
Repository: arrow
Updated Branches:
refs/heads/master c7e099520 -> 8cad26e3a
ARROW-1200: C++: Switch DictionaryBuilder to signed integers
Change-Id: I26e06bf361e032072d7cc1478c673da29e403b04
Author: Uwe L. Korn <uw...@xhochy.com>
Closes #838 from xhochy/ARROW-1200 and squashes the following commits:
41b6afe7 [Uwe L. Korn] ARROW-1200: C++: Switch DictionaryBuilder to signed integers
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/8cad26e3
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/8cad26e3
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/8cad26e3
Branch: refs/heads/master
Commit: 8cad26e3a33752892767d63acea2186cd62d3c8e
Parents: c7e0995
Author: Uwe L. Korn <uw...@xhochy.com>
Authored: Fri Jul 14 15:32:20 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Fri Jul 14 15:32:20 2017 -0400
----------------------------------------------------------------------
cpp/src/arrow/array-test.cc | 20 ++++++++++----------
cpp/src/arrow/builder.h | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/8cad26e3/cpp/src/arrow/array-test.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/array-test.cc b/cpp/src/arrow/array-test.cc
index bfdb923..01bef03 100644
--- a/cpp/src/arrow/array-test.cc
+++ b/cpp/src/arrow/array-test.cc
@@ -1524,9 +1524,9 @@ TYPED_TEST(TestDictionaryBuilder, Basic) {
ASSERT_OK(dict_builder.Append(static_cast<typename TypeParam::c_type>(2)));
std::shared_ptr<Array> dict_array;
ASSERT_OK(dict_builder.Finish(&dict_array));
- auto dtype = std::make_shared<DictionaryType>(uint8(), dict_array);
+ auto dtype = std::make_shared<DictionaryType>(int8(), dict_array);
- UInt8Builder int_builder(default_memory_pool());
+ Int8Builder int_builder(default_memory_pool());
ASSERT_OK(int_builder.Append(0));
ASSERT_OK(int_builder.Append(1));
ASSERT_OK(int_builder.Append(0));
@@ -1557,9 +1557,9 @@ TYPED_TEST(TestDictionaryBuilder, ArrayConversion) {
ASSERT_OK(dict_builder.Append(static_cast<typename TypeParam::c_type>(2)));
std::shared_ptr<Array> dict_array;
ASSERT_OK(dict_builder.Finish(&dict_array));
- auto dtype = std::make_shared<DictionaryType>(uint8(), dict_array);
+ auto dtype = std::make_shared<DictionaryType>(int8(), dict_array);
- UInt8Builder int_builder(default_memory_pool());
+ Int8Builder int_builder(default_memory_pool());
ASSERT_OK(int_builder.Append(0));
ASSERT_OK(int_builder.Append(1));
ASSERT_OK(int_builder.Append(0));
@@ -1578,7 +1578,7 @@ TYPED_TEST(TestDictionaryBuilder, DoubleTableSize) {
DictionaryBuilder<TypeParam> builder(default_memory_pool());
// Build expected data
NumericBuilder<TypeParam> dict_builder(default_memory_pool());
- UInt16Builder int_builder(default_memory_pool());
+ Int16Builder int_builder(default_memory_pool());
// Fill with 1024 different values
for (int64_t i = 0; i < 1024; i++) {
@@ -1599,7 +1599,7 @@ TYPED_TEST(TestDictionaryBuilder, DoubleTableSize) {
// Finalize expected data
std::shared_ptr<Array> dict_array;
ASSERT_OK(dict_builder.Finish(&dict_array));
- auto dtype = std::make_shared<DictionaryType>(uint16(), dict_array);
+ auto dtype = std::make_shared<DictionaryType>(int16(), dict_array);
std::shared_ptr<Array> int_array;
ASSERT_OK(int_builder.Finish(&int_array));
@@ -1624,9 +1624,9 @@ TEST(TestStringDictionaryBuilder, Basic) {
ASSERT_OK(str_builder.Append("test2"));
std::shared_ptr<Array> str_array;
ASSERT_OK(str_builder.Finish(&str_array));
- auto dtype = std::make_shared<DictionaryType>(uint8(), str_array);
+ auto dtype = std::make_shared<DictionaryType>(int8(), str_array);
- UInt8Builder int_builder(default_memory_pool());
+ Int8Builder int_builder(default_memory_pool());
ASSERT_OK(int_builder.Append(0));
ASSERT_OK(int_builder.Append(1));
ASSERT_OK(int_builder.Append(0));
@@ -1642,7 +1642,7 @@ TEST(TestStringDictionaryBuilder, DoubleTableSize) {
StringDictionaryBuilder builder(default_memory_pool());
// Build expected data
StringBuilder str_builder(default_memory_pool());
- UInt16Builder int_builder(default_memory_pool());
+ Int16Builder int_builder(default_memory_pool());
// Fill with 1024 different values
for (int64_t i = 0; i < 1024; i++) {
@@ -1665,7 +1665,7 @@ TEST(TestStringDictionaryBuilder, DoubleTableSize) {
// Finalize expected data
std::shared_ptr<Array> str_array;
ASSERT_OK(str_builder.Finish(&str_array));
- auto dtype = std::make_shared<DictionaryType>(uint16(), str_array);
+ auto dtype = std::make_shared<DictionaryType>(int16(), str_array);
std::shared_ptr<Array> int_array;
ASSERT_OK(int_builder.Finish(&int_array));
http://git-wip-us.apache.org/repos/asf/arrow/blob/8cad26e3/cpp/src/arrow/builder.h
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/builder.h b/cpp/src/arrow/builder.h
index 12f3683..c0a075b 100644
--- a/cpp/src/arrow/builder.h
+++ b/cpp/src/arrow/builder.h
@@ -759,7 +759,7 @@ class ARROW_EXPORT DictionaryBuilder : public ArrayBuilder {
int mod_bitmask_;
typename TypeTraits<T>::BuilderType dict_builder_;
- AdaptiveUIntBuilder values_builder_;
+ AdaptiveIntBuilder values_builder_;
};
class ARROW_EXPORT BinaryDictionaryBuilder : public DictionaryBuilder<BinaryType> {