ARROW-6310: [C++] IPC json should use strings for 64 bit ints#5267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bkietz wants to merge 4 commits into from
Closed

ARROW-6310: [C++] IPC json should use strings for 64 bit ints #5267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5cd719
ipc json should use strings for 64 bit ints
bkietz Sep 3, 2019
121dee1
use std::to_string
bkietz Sep 5, 2019
8318e9e
rewrite integration/integration_test.py to generate int64 cols as str…
bkietz Sep 9, 2019
09b6a94
de-nest IntegerColumn
bkietz Sep 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 39 additions & 36 deletions cpp/src/arrow/ipc/json_internal.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/logging.h"
#include "arrow/util/parsing.h"
#include "arrow/util/string.h"
#include "arrow/visitor_inline.h"

Expand DownExpand Up@@ -398,36 +399,34 @@ class ArrayWriter {
}

template <typename T>
typename std::enable_if<IsSignedInt<T>::value, void>::type WriteDataValues(
const T& arr) {
static const char null_string[] = "0";
enable_if_integer_repr<typename T::TypeClass> WriteDataValues(const T& arr) {
using c_type = typename T::TypeClass::c_type;
const auto data = arr.raw_values();
for (int64_t i = 0; i < arr.length(); ++i) {
if (arr.IsValid(i)) {
writer_->Int64(data[i]);
} else {
writer_->RawNumber(null_string, sizeof(null_string));

if (sizeof(c_type) < sizeof(int64_t)) {
for (int64_t i = 0; i < arr.length(); ++i) {
if (arr.IsValid(i)) {
if (std::is_signed<c_type>::value) {
writer_->Int(static_cast<int32_t>(data[i]));
} else {
writer_->Uint(static_cast<uint32_t>(data[i]));
}
} else {
writer_->RawNumber("0", sizeof("0"));
}
}
return;
}
}

template <typename T>
typename std::enable_if<IsUnsignedInt<T>::value, void>::type WriteDataValues(
const T& arr) {
static const char null_string[] = "0";
const auto data = arr.raw_values();
// write strings instead of numbers since numbers can't represent all 64 bit integers
for (int64_t i = 0; i < arr.length(); ++i) {
if (arr.IsValid(i)) {
writer_->Uint64(data[i]);
} else {
writer_->RawNumber(null_string, sizeof(null_string));
}
auto str = std::to_string(data[i]);
writer_->String(str.c_str(), static_cast<rj::SizeType>(str.size()));
}
}

template <typename T>
typename std::enable_if<IsFloatingPoint<T>::value, void>::type WriteDataValues(
const T& arr) {
enable_if_floating_point<typename T::TypeClass> WriteDataValues(const T& arr) {
static const char null_string[] = "0.";
const auto data = arr.raw_values();
for (int64_t i = 0; i < arr.length(); ++i) {
Expand DownExpand Up@@ -1054,30 +1053,34 @@ static Status GetField(const rj::Value& obj, DictionaryMemo* dictionary_memo,
return Status::OK();
}

template <typename T>
inline typename std::enable_if<IsSignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
DCHECK(val.IsInt64());
return static_cast<typename T::c_type>(val.GetInt64());
}
template <typename T, typename CType = typename T::c_type>
enable_if_integer_repr<T, CType> UnboxValue(
const rj::Value& val,
typename std::enable_if<!std::is_same<T, HalfFloatType>::value>::type* = nullptr) {
if (sizeof(CType) < sizeof(int64_t)) {
if (IsSignedInt<T>::value) {
DCHECK(val.IsInt());
return static_cast<CType>(val.GetInt());
}
DCHECK(val.IsUint());
return static_cast<CType>(val.GetUint());
}

template <typename T>
inline typename std::enable_if<IsUnsignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
DCHECK(val.IsUint());
return static_cast<typename T::c_type>(val.GetUint64());
::arrow::internal::StringConverter<typename CTypeTraits<CType>::ArrowType> converter;
CType out;
auto success = converter(val.GetString(), val.GetStringLength(), &out);
DCHECK(success);
return out;
}

template <typename T>
inline typename std::enable_if<IsFloatingPoint<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
enable_if_floating_point<T, typename T::c_type> UnboxValue(const rj::Value& val) {
DCHECK(val.IsFloat());
return static_cast<typename T::c_type>(val.GetDouble());
}

template <typename T>
inline typename std::enable_if<std::is_base_of<BooleanType, T>::value, bool>::type
UnboxValue(const rj::Value& val) {
enable_if_boolean<T, bool> UnboxValue(const rj::Value& val) {
DCHECK(val.IsBool());
return val.GetBool();
}
Expand Down
19 changes: 19 additions & 0 deletions cpp/src/arrow/type_traits.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,11 @@ struct CTypeTraits<Optional, enable_if_optional_like<Optional>> {
// Useful type predicates
//

template <typename T>
struct as_void {
using type = void;
};

template <typename T>
using is_number_type = std::is_base_of<NumberType, T>;

Expand DownExpand Up@@ -441,6 +446,16 @@ struct is_8bit_int {
(std::is_same<UInt8Type, T>::value || std::is_same<Int8Type, T>::value);
};

template <typename T, typename CType = void>

@wesmwesmSep 10, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should put this in json_internal.cc unless we anticipate using it elsewhere

@bkietzbkietzSep 10, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think IsSignedInt etc should be removed in favor of this trait or one like it (though it should probably be renamed).

IsSignedInt takes either an array or a type as a type argument, which is surprisingly atypical for traits. Furthermore whereas is_signed_integer returns false for date and other types which are represented by but not identical to integers IsSignedInt returns true by checking only the c_type, which leads to static_assert(IsSignedInt<HalfFloatType>::value, ""). Finally the declaration of IsSignedInt is far from readable due to nested macro usage

@bkietzbkietzSep 10, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://issues.apache.org/jira/browse/ARROW-6515

struct is_integer_repr_type : std::false_type {};

template <>
struct is_integer_repr_type<HalfFloatType> : std::false_type {};

template <typename T>
struct is_integer_repr_type<T, typename as_void<typename T::c_type>::type>
: std::is_integral<typename T::c_type> {};

template <typename T>
struct is_any_string_type {
static constexpr bool value =
Expand All@@ -457,6 +472,10 @@ using enable_if_primitive_ctype =
template <typename T, typename R = void>
using enable_if_integer = typename std::enable_if<is_integer_type<T>::value, R>::type;

template <typename T, typename R = void>
using enable_if_integer_repr =
typename std::enable_if<is_integer_repr_type<T>::value, R>::type;

template <typename T>
using is_signed_integer =
std::integral_constant<bool, is_integer_type<T>::value &&
Expand Down
12 changes: 11 additions & 1 deletion integration/integration_test.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,16 @@ def _get_buffers(self):
]


class IntegerColumn(PrimitiveColumn):

def __init__(self, name, count, is_valid, values, bit_width):
super(IntegerColumn, self).__init__(name, count, is_valid, values)
self.bit_width = bit_width

def _encode_value(self, x):
return x if self.bit_width < 64 else str(x)


TEST_INT_MAX = 2 ** 31 - 1
TEST_INT_MIN = ~TEST_INT_MAX

Expand DownExpand Up@@ -225,7 +235,7 @@ def generate_range(self, size, lower, upper, name=None):

if name is None:
name = self.name
return PrimitiveColumn(name, size, is_valid, values)
return IntegerColumn(name, size, is_valid, values, self.bit_width)


class DateType(IntegerType):
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-6310: [C++] IPC json should use strings for 64 bit ints#5267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-6310: [C++] IPC json should use strings for 64 bit ints
#5267
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5cd719

ipc json should use strings for 64 bit ints


bkietz Sep 3, 2019
121dee1

use std::to_string


bkietz Sep 5, 2019
8318e9e

rewrite integration/integration_test.py to generate int64 cols as str…


bkietz Sep 9, 2019
09b6a94

de-nest IntegerColumn


bkietz Sep 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


75 changes: 39 additions & 36 deletions
cpp/src/arrow/ipc/json_internal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/logging.h"
#include "arrow/util/parsing.h"
#include "arrow/util/string.h"
#include "arrow/visitor_inline.h"

Expand DownExpand Up@@ -398,36 +399,34 @@ class ArrayWriter {
 }

 template <typename T>
 typename std::enable_if<IsSignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 enable_if_integer_repr<typename T::TypeClass> WriteDataValues(const T& arr) {
 using c_type = typename T::TypeClass::c_type;
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Int64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));

 if (sizeof(c_type) < sizeof(int64_t)) {
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 if (std::is_signed<c_type>::value) {
 writer_->Int(static_cast<int32_t>(data[i]));
 } else {
 writer_->Uint(static_cast<uint32_t>(data[i]));
 }
 } else {
 writer_->RawNumber("0", sizeof("0"));
 }
 }
 return;
 }
 }

 template <typename T>
 typename std::enable_if<IsUnsignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 const auto data = arr.raw_values();
 // write strings instead of numbers since numbers can't represent all 64 bit integers
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Uint64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));
 }
 auto str = std::to_string(data[i]);
 writer_->String(str.c_str(), static_cast<rj::SizeType>(str.size()));
 }
 }

 template <typename T>
 typename std::enable_if<IsFloatingPoint<T>::value, void>::type WriteDataValues(
 const T& arr) {
 enable_if_floating_point<typename T::TypeClass> WriteDataValues(const T& arr) {
 static const char null_string[] = "0.";
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
Expand DownExpand Up@@ -1054,30 +1053,34 @@ static Status GetField(const rj::Value& obj, DictionaryMemo* dictionary_memo,
 return Status::OK();
}

template <typename T>
inline typename std::enable_if<IsSignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsInt64());
 return static_cast<typename T::c_type>(val.GetInt64());
}
template <typename T, typename CType = typename T::c_type>
enable_if_integer_repr<T, CType> UnboxValue(
 const rj::Value& val,
 typename std::enable_if<!std::is_same<T, HalfFloatType>::value>::type* = nullptr) {
 if (sizeof(CType) < sizeof(int64_t)) {
 if (IsSignedInt<T>::value) {
 DCHECK(val.IsInt());
 return static_cast<CType>(val.GetInt());
 }
 DCHECK(val.IsUint());
 return static_cast<CType>(val.GetUint());
 }

template <typename T>
inline typename std::enable_if<IsUnsignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsUint());
 return static_cast<typename T::c_type>(val.GetUint64());
 ::arrow::internal::StringConverter<typename CTypeTraits<CType>::ArrowType> converter;
 CType out;
 auto success = converter(val.GetString(), val.GetStringLength(), &out);
 DCHECK(success);
 return out;
}

template <typename T>
inline typename std::enable_if<IsFloatingPoint<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
enable_if_floating_point<T, typename T::c_type> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsFloat());
 return static_cast<typename T::c_type>(val.GetDouble());
}

template <typename T>
inline typename std::enable_if<std::is_base_of<BooleanType, T>::value, bool>::type
UnboxValue(const rj::Value& val) {
enable_if_boolean<T, bool> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsBool());
 return val.GetBool();
}
Expand Down

19 changes: 19 additions & 0 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,11 @@ struct CTypeTraits<Optional, enable_if_optional_like<Optional>> {
// Useful type predicates
//

template <typename T>
struct as_void {
 using type = void;
};

template <typename T>
using is_number_type = std::is_base_of<NumberType, T>;

Expand DownExpand Up@@ -441,6 +446,16 @@ struct is_8bit_int {
 (std::is_same<UInt8Type, T>::value || std::is_same<Int8Type, T>::value);
};

template <typename T, typename CType = void>
@wesmwesmSep 10, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should put this in json_internal.cc unless we anticipate using it elsewhere
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think IsSignedInt etc should be removed in favor of this trait or one like it (though it should probably be renamed).
IsSignedInt takes either an array or a type as a type argument, which is surprisingly atypical for traits. Furthermore whereas is_signed_integer returns false for date and other types which are represented by but not identical to integers IsSignedInt returns true by checking only the c_type, which leads to static_assert(IsSignedInt<HalfFloatType>::value, ""). Finally the declaration of IsSignedInt is far from readable due to nested macro usage
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://issues.apache.org/jira/browse/ARROW-6515
struct is_integer_repr_type : std::false_type {};

template <>
struct is_integer_repr_type<HalfFloatType> : std::false_type {};

template <typename T>
struct is_integer_repr_type<T, typename as_void<typename T::c_type>::type>
 : std::is_integral<typename T::c_type> {};

template <typename T>
struct is_any_string_type {
 static constexpr bool value =
Expand All@@ -457,6 +472,10 @@ using enable_if_primitive_ctype =
template <typename T, typename R = void>
using enable_if_integer = typename std::enable_if<is_integer_type<T>::value, R>::type;

template <typename T, typename R = void>
using enable_if_integer_repr =
 typename std::enable_if<is_integer_repr_type<T>::value, R>::type;

template <typename T>
using is_signed_integer =
 std::integral_constant<bool, is_integer_type<T>::value &&
Expand Down

12 changes: 11 additions & 1 deletion
integration/integration_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,16 @@ def _get_buffers(self):
 ]


class IntegerColumn(PrimitiveColumn):

 def __init__(self, name, count, is_valid, values, bit_width):
 super(IntegerColumn, self).__init__(name, count, is_valid, values)
 self.bit_width = bit_width

 def _encode_value(self, x):
 return x if self.bit_width < 64 else str(x)


TEST_INT_MAX = 2 ** 31 - 1
TEST_INT_MIN = ~TEST_INT_MAX

Expand DownExpand Up@@ -225,7 +235,7 @@ def generate_range(self, size, lower, upper, name=None):

 if name is None:
 name = self.name
 return PrimitiveColumn(name, size, is_valid, values)
 return IntegerColumn(name, size, is_valid, values, self.bit_width)


class DateType(IntegerType):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-6310: [C++] IPC json should use strings for 64 bit ints#5267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-6310: [C++] IPC json should use strings for 64 bit ints
#5267
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5cd719

ipc json should use strings for 64 bit ints


bkietz Sep 3, 2019
121dee1

use std::to_string


bkietz Sep 5, 2019
8318e9e

rewrite integration/integration_test.py to generate int64 cols as str…


bkietz Sep 9, 2019
09b6a94

de-nest IntegerColumn


bkietz Sep 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


75 changes: 39 additions & 36 deletions
cpp/src/arrow/ipc/json_internal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/logging.h"
#include "arrow/util/parsing.h"
#include "arrow/util/string.h"
#include "arrow/visitor_inline.h"

Expand DownExpand Up@@ -398,36 +399,34 @@ class ArrayWriter {
 }

 template <typename T>
 typename std::enable_if<IsSignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 enable_if_integer_repr<typename T::TypeClass> WriteDataValues(const T& arr) {
 using c_type = typename T::TypeClass::c_type;
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Int64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));

 if (sizeof(c_type) < sizeof(int64_t)) {
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 if (std::is_signed<c_type>::value) {
 writer_->Int(static_cast<int32_t>(data[i]));
 } else {
 writer_->Uint(static_cast<uint32_t>(data[i]));
 }
 } else {
 writer_->RawNumber("0", sizeof("0"));
 }
 }
 return;
 }
 }

 template <typename T>
 typename std::enable_if<IsUnsignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 const auto data = arr.raw_values();
 // write strings instead of numbers since numbers can't represent all 64 bit integers
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Uint64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));
 }
 auto str = std::to_string(data[i]);
 writer_->String(str.c_str(), static_cast<rj::SizeType>(str.size()));
 }
 }

 template <typename T>
 typename std::enable_if<IsFloatingPoint<T>::value, void>::type WriteDataValues(
 const T& arr) {
 enable_if_floating_point<typename T::TypeClass> WriteDataValues(const T& arr) {
 static const char null_string[] = "0.";
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
Expand DownExpand Up@@ -1054,30 +1053,34 @@ static Status GetField(const rj::Value& obj, DictionaryMemo* dictionary_memo,
 return Status::OK();
}

template <typename T>
inline typename std::enable_if<IsSignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsInt64());
 return static_cast<typename T::c_type>(val.GetInt64());
}
template <typename T, typename CType = typename T::c_type>
enable_if_integer_repr<T, CType> UnboxValue(
 const rj::Value& val,
 typename std::enable_if<!std::is_same<T, HalfFloatType>::value>::type* = nullptr) {
 if (sizeof(CType) < sizeof(int64_t)) {
 if (IsSignedInt<T>::value) {
 DCHECK(val.IsInt());
 return static_cast<CType>(val.GetInt());
 }
 DCHECK(val.IsUint());
 return static_cast<CType>(val.GetUint());
 }

template <typename T>
inline typename std::enable_if<IsUnsignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsUint());
 return static_cast<typename T::c_type>(val.GetUint64());
 ::arrow::internal::StringConverter<typename CTypeTraits<CType>::ArrowType> converter;
 CType out;
 auto success = converter(val.GetString(), val.GetStringLength(), &out);
 DCHECK(success);
 return out;
}

template <typename T>
inline typename std::enable_if<IsFloatingPoint<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
enable_if_floating_point<T, typename T::c_type> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsFloat());
 return static_cast<typename T::c_type>(val.GetDouble());
}

template <typename T>
inline typename std::enable_if<std::is_base_of<BooleanType, T>::value, bool>::type
UnboxValue(const rj::Value& val) {
enable_if_boolean<T, bool> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsBool());
 return val.GetBool();
}
Expand Down

19 changes: 19 additions & 0 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,11 @@ struct CTypeTraits<Optional, enable_if_optional_like<Optional>> {
// Useful type predicates
//

template <typename T>
struct as_void {
 using type = void;
};

template <typename T>
using is_number_type = std::is_base_of<NumberType, T>;

Expand DownExpand Up@@ -441,6 +446,16 @@ struct is_8bit_int {
 (std::is_same<UInt8Type, T>::value || std::is_same<Int8Type, T>::value);
};

template <typename T, typename CType = void>
@wesmwesmSep 10, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should put this in json_internal.cc unless we anticipate using it elsewhere
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think IsSignedInt etc should be removed in favor of this trait or one like it (though it should probably be renamed).
IsSignedInt takes either an array or a type as a type argument, which is surprisingly atypical for traits. Furthermore whereas is_signed_integer returns false for date and other types which are represented by but not identical to integers IsSignedInt returns true by checking only the c_type, which leads to static_assert(IsSignedInt<HalfFloatType>::value, ""). Finally the declaration of IsSignedInt is far from readable due to nested macro usage
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://issues.apache.org/jira/browse/ARROW-6515
struct is_integer_repr_type : std::false_type {};

template <>
struct is_integer_repr_type<HalfFloatType> : std::false_type {};

template <typename T>
struct is_integer_repr_type<T, typename as_void<typename T::c_type>::type>
 : std::is_integral<typename T::c_type> {};

template <typename T>
struct is_any_string_type {
 static constexpr bool value =
Expand All@@ -457,6 +472,10 @@ using enable_if_primitive_ctype =
template <typename T, typename R = void>
using enable_if_integer = typename std::enable_if<is_integer_type<T>::value, R>::type;

template <typename T, typename R = void>
using enable_if_integer_repr =
 typename std::enable_if<is_integer_repr_type<T>::value, R>::type;

template <typename T>
using is_signed_integer =
 std::integral_constant<bool, is_integer_type<T>::value &&
Expand Down

12 changes: 11 additions & 1 deletion
integration/integration_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,16 @@ def _get_buffers(self):
 ]


class IntegerColumn(PrimitiveColumn):

 def __init__(self, name, count, is_valid, values, bit_width):
 super(IntegerColumn, self).__init__(name, count, is_valid, values)
 self.bit_width = bit_width

 def _encode_value(self, x):
 return x if self.bit_width < 64 else str(x)


TEST_INT_MAX = 2 ** 31 - 1
TEST_INT_MIN = ~TEST_INT_MAX

Expand DownExpand Up@@ -225,7 +235,7 @@ def generate_range(self, size, lower, upper, name=None):

 if name is None:
 name = self.name
 return PrimitiveColumn(name, size, is_valid, values)
 return IntegerColumn(name, size, is_valid, values, self.bit_width)


class DateType(IntegerType):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-6310: [C++] IPC json should use strings for 64 bit ints#5267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-6310: [C++] IPC json should use strings for 64 bit ints
#5267
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5cd719

ipc json should use strings for 64 bit ints


bkietz Sep 3, 2019
121dee1

use std::to_string


bkietz Sep 5, 2019
8318e9e

rewrite integration/integration_test.py to generate int64 cols as str…


bkietz Sep 9, 2019
09b6a94

de-nest IntegerColumn


bkietz Sep 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


75 changes: 39 additions & 36 deletions
cpp/src/arrow/ipc/json_internal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/logging.h"
#include "arrow/util/parsing.h"
#include "arrow/util/string.h"
#include "arrow/visitor_inline.h"

Expand DownExpand Up@@ -398,36 +399,34 @@ class ArrayWriter {
 }

 template <typename T>
 typename std::enable_if<IsSignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 enable_if_integer_repr<typename T::TypeClass> WriteDataValues(const T& arr) {
 using c_type = typename T::TypeClass::c_type;
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Int64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));

 if (sizeof(c_type) < sizeof(int64_t)) {
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 if (std::is_signed<c_type>::value) {
 writer_->Int(static_cast<int32_t>(data[i]));
 } else {
 writer_->Uint(static_cast<uint32_t>(data[i]));
 }
 } else {
 writer_->RawNumber("0", sizeof("0"));
 }
 }
 return;
 }
 }

 template <typename T>
 typename std::enable_if<IsUnsignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 const auto data = arr.raw_values();
 // write strings instead of numbers since numbers can't represent all 64 bit integers
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Uint64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));
 }
 auto str = std::to_string(data[i]);
 writer_->String(str.c_str(), static_cast<rj::SizeType>(str.size()));
 }
 }

 template <typename T>
 typename std::enable_if<IsFloatingPoint<T>::value, void>::type WriteDataValues(
 const T& arr) {
 enable_if_floating_point<typename T::TypeClass> WriteDataValues(const T& arr) {
 static const char null_string[] = "0.";
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
Expand DownExpand Up@@ -1054,30 +1053,34 @@ static Status GetField(const rj::Value& obj, DictionaryMemo* dictionary_memo,
 return Status::OK();
}

template <typename T>
inline typename std::enable_if<IsSignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsInt64());
 return static_cast<typename T::c_type>(val.GetInt64());
}
template <typename T, typename CType = typename T::c_type>
enable_if_integer_repr<T, CType> UnboxValue(
 const rj::Value& val,
 typename std::enable_if<!std::is_same<T, HalfFloatType>::value>::type* = nullptr) {
 if (sizeof(CType) < sizeof(int64_t)) {
 if (IsSignedInt<T>::value) {
 DCHECK(val.IsInt());
 return static_cast<CType>(val.GetInt());
 }
 DCHECK(val.IsUint());
 return static_cast<CType>(val.GetUint());
 }

template <typename T>
inline typename std::enable_if<IsUnsignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsUint());
 return static_cast<typename T::c_type>(val.GetUint64());
 ::arrow::internal::StringConverter<typename CTypeTraits<CType>::ArrowType> converter;
 CType out;
 auto success = converter(val.GetString(), val.GetStringLength(), &out);
 DCHECK(success);
 return out;
}

template <typename T>
inline typename std::enable_if<IsFloatingPoint<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
enable_if_floating_point<T, typename T::c_type> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsFloat());
 return static_cast<typename T::c_type>(val.GetDouble());
}

template <typename T>
inline typename std::enable_if<std::is_base_of<BooleanType, T>::value, bool>::type
UnboxValue(const rj::Value& val) {
enable_if_boolean<T, bool> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsBool());
 return val.GetBool();
}
Expand Down

19 changes: 19 additions & 0 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,11 @@ struct CTypeTraits<Optional, enable_if_optional_like<Optional>> {
// Useful type predicates
//

template <typename T>
struct as_void {
 using type = void;
};

template <typename T>
using is_number_type = std::is_base_of<NumberType, T>;

Expand DownExpand Up@@ -441,6 +446,16 @@ struct is_8bit_int {
 (std::is_same<UInt8Type, T>::value || std::is_same<Int8Type, T>::value);
};

template <typename T, typename CType = void>
@wesmwesmSep 10, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should put this in json_internal.cc unless we anticipate using it elsewhere
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think IsSignedInt etc should be removed in favor of this trait or one like it (though it should probably be renamed).
IsSignedInt takes either an array or a type as a type argument, which is surprisingly atypical for traits. Furthermore whereas is_signed_integer returns false for date and other types which are represented by but not identical to integers IsSignedInt returns true by checking only the c_type, which leads to static_assert(IsSignedInt<HalfFloatType>::value, ""). Finally the declaration of IsSignedInt is far from readable due to nested macro usage
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://issues.apache.org/jira/browse/ARROW-6515
struct is_integer_repr_type : std::false_type {};

template <>
struct is_integer_repr_type<HalfFloatType> : std::false_type {};

template <typename T>
struct is_integer_repr_type<T, typename as_void<typename T::c_type>::type>
 : std::is_integral<typename T::c_type> {};

template <typename T>
struct is_any_string_type {
 static constexpr bool value =
Expand All@@ -457,6 +472,10 @@ using enable_if_primitive_ctype =
template <typename T, typename R = void>
using enable_if_integer = typename std::enable_if<is_integer_type<T>::value, R>::type;

template <typename T, typename R = void>
using enable_if_integer_repr =
 typename std::enable_if<is_integer_repr_type<T>::value, R>::type;

template <typename T>
using is_signed_integer =
 std::integral_constant<bool, is_integer_type<T>::value &&
Expand Down

12 changes: 11 additions & 1 deletion
integration/integration_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,16 @@ def _get_buffers(self):
 ]


class IntegerColumn(PrimitiveColumn):

 def __init__(self, name, count, is_valid, values, bit_width):
 super(IntegerColumn, self).__init__(name, count, is_valid, values)
 self.bit_width = bit_width

 def _encode_value(self, x):
 return x if self.bit_width < 64 else str(x)


TEST_INT_MAX = 2 ** 31 - 1
TEST_INT_MIN = ~TEST_INT_MAX

Expand DownExpand Up@@ -225,7 +235,7 @@ def generate_range(self, size, lower, upper, name=None):

 if name is None:
 name = self.name
 return PrimitiveColumn(name, size, is_valid, values)
 return IntegerColumn(name, size, is_valid, values, self.bit_width)


class DateType(IntegerType):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-6310: [C++] IPC json should use strings for 64 bit ints#5267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-6310: [C++] IPC json should use strings for 64 bit ints
#5267
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5cd719

ipc json should use strings for 64 bit ints


bkietz Sep 3, 2019
121dee1

use std::to_string


bkietz Sep 5, 2019
8318e9e

rewrite integration/integration_test.py to generate int64 cols as str…


bkietz Sep 9, 2019
09b6a94

de-nest IntegerColumn


bkietz Sep 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


75 changes: 39 additions & 36 deletions
cpp/src/arrow/ipc/json_internal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/logging.h"
#include "arrow/util/parsing.h"
#include "arrow/util/string.h"
#include "arrow/visitor_inline.h"

Expand DownExpand Up@@ -398,36 +399,34 @@ class ArrayWriter {
 }

 template <typename T>
 typename std::enable_if<IsSignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 enable_if_integer_repr<typename T::TypeClass> WriteDataValues(const T& arr) {
 using c_type = typename T::TypeClass::c_type;
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Int64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));

 if (sizeof(c_type) < sizeof(int64_t)) {
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 if (std::is_signed<c_type>::value) {
 writer_->Int(static_cast<int32_t>(data[i]));
 } else {
 writer_->Uint(static_cast<uint32_t>(data[i]));
 }
 } else {
 writer_->RawNumber("0", sizeof("0"));
 }
 }
 return;
 }
 }

 template <typename T>
 typename std::enable_if<IsUnsignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 const auto data = arr.raw_values();
 // write strings instead of numbers since numbers can't represent all 64 bit integers
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Uint64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));
 }
 auto str = std::to_string(data[i]);
 writer_->String(str.c_str(), static_cast<rj::SizeType>(str.size()));
 }
 }

 template <typename T>
 typename std::enable_if<IsFloatingPoint<T>::value, void>::type WriteDataValues(
 const T& arr) {
 enable_if_floating_point<typename T::TypeClass> WriteDataValues(const T& arr) {
 static const char null_string[] = "0.";
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
Expand DownExpand Up@@ -1054,30 +1053,34 @@ static Status GetField(const rj::Value& obj, DictionaryMemo* dictionary_memo,
 return Status::OK();
}

template <typename T>
inline typename std::enable_if<IsSignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsInt64());
 return static_cast<typename T::c_type>(val.GetInt64());
}
template <typename T, typename CType = typename T::c_type>
enable_if_integer_repr<T, CType> UnboxValue(
 const rj::Value& val,
 typename std::enable_if<!std::is_same<T, HalfFloatType>::value>::type* = nullptr) {
 if (sizeof(CType) < sizeof(int64_t)) {
 if (IsSignedInt<T>::value) {
 DCHECK(val.IsInt());
 return static_cast<CType>(val.GetInt());
 }
 DCHECK(val.IsUint());
 return static_cast<CType>(val.GetUint());
 }

template <typename T>
inline typename std::enable_if<IsUnsignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsUint());
 return static_cast<typename T::c_type>(val.GetUint64());
 ::arrow::internal::StringConverter<typename CTypeTraits<CType>::ArrowType> converter;
 CType out;
 auto success = converter(val.GetString(), val.GetStringLength(), &out);
 DCHECK(success);
 return out;
}

template <typename T>
inline typename std::enable_if<IsFloatingPoint<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
enable_if_floating_point<T, typename T::c_type> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsFloat());
 return static_cast<typename T::c_type>(val.GetDouble());
}

template <typename T>
inline typename std::enable_if<std::is_base_of<BooleanType, T>::value, bool>::type
UnboxValue(const rj::Value& val) {
enable_if_boolean<T, bool> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsBool());
 return val.GetBool();
}
Expand Down

19 changes: 19 additions & 0 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,11 @@ struct CTypeTraits<Optional, enable_if_optional_like<Optional>> {
// Useful type predicates
//

template <typename T>
struct as_void {
 using type = void;
};

template <typename T>
using is_number_type = std::is_base_of<NumberType, T>;

Expand DownExpand Up@@ -441,6 +446,16 @@ struct is_8bit_int {
 (std::is_same<UInt8Type, T>::value || std::is_same<Int8Type, T>::value);
};

template <typename T, typename CType = void>
@wesmwesmSep 10, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should put this in json_internal.cc unless we anticipate using it elsewhere
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think IsSignedInt etc should be removed in favor of this trait or one like it (though it should probably be renamed).
IsSignedInt takes either an array or a type as a type argument, which is surprisingly atypical for traits. Furthermore whereas is_signed_integer returns false for date and other types which are represented by but not identical to integers IsSignedInt returns true by checking only the c_type, which leads to static_assert(IsSignedInt<HalfFloatType>::value, ""). Finally the declaration of IsSignedInt is far from readable due to nested macro usage
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://issues.apache.org/jira/browse/ARROW-6515
struct is_integer_repr_type : std::false_type {};

template <>
struct is_integer_repr_type<HalfFloatType> : std::false_type {};

template <typename T>
struct is_integer_repr_type<T, typename as_void<typename T::c_type>::type>
 : std::is_integral<typename T::c_type> {};

template <typename T>
struct is_any_string_type {
 static constexpr bool value =
Expand All@@ -457,6 +472,10 @@ using enable_if_primitive_ctype =
template <typename T, typename R = void>
using enable_if_integer = typename std::enable_if<is_integer_type<T>::value, R>::type;

template <typename T, typename R = void>
using enable_if_integer_repr =
 typename std::enable_if<is_integer_repr_type<T>::value, R>::type;

template <typename T>
using is_signed_integer =
 std::integral_constant<bool, is_integer_type<T>::value &&
Expand Down

12 changes: 11 additions & 1 deletion
integration/integration_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,16 @@ def _get_buffers(self):
 ]


class IntegerColumn(PrimitiveColumn):

 def __init__(self, name, count, is_valid, values, bit_width):
 super(IntegerColumn, self).__init__(name, count, is_valid, values)
 self.bit_width = bit_width

 def _encode_value(self, x):
 return x if self.bit_width < 64 else str(x)


TEST_INT_MAX = 2 ** 31 - 1
TEST_INT_MIN = ~TEST_INT_MAX

Expand DownExpand Up@@ -225,7 +235,7 @@ def generate_range(self, size, lower, upper, name=None):

 if name is None:
 name = self.name
 return PrimitiveColumn(name, size, is_valid, values)
 return IntegerColumn(name, size, is_valid, values, self.bit_width)


class DateType(IntegerType):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-6310: [C++] IPC json should use strings for 64 bit ints#5267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-6310: [C++] IPC json should use strings for 64 bit ints
#5267
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5cd719

ipc json should use strings for 64 bit ints


bkietz Sep 3, 2019
121dee1

use std::to_string


bkietz Sep 5, 2019
8318e9e

rewrite integration/integration_test.py to generate int64 cols as str…


bkietz Sep 9, 2019
09b6a94

de-nest IntegerColumn


bkietz Sep 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


75 changes: 39 additions & 36 deletions
cpp/src/arrow/ipc/json_internal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/logging.h"
#include "arrow/util/parsing.h"
#include "arrow/util/string.h"
#include "arrow/visitor_inline.h"

Expand DownExpand Up@@ -398,36 +399,34 @@ class ArrayWriter {
 }

 template <typename T>
 typename std::enable_if<IsSignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 enable_if_integer_repr<typename T::TypeClass> WriteDataValues(const T& arr) {
 using c_type = typename T::TypeClass::c_type;
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Int64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));

 if (sizeof(c_type) < sizeof(int64_t)) {
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 if (std::is_signed<c_type>::value) {
 writer_->Int(static_cast<int32_t>(data[i]));
 } else {
 writer_->Uint(static_cast<uint32_t>(data[i]));
 }
 } else {
 writer_->RawNumber("0", sizeof("0"));
 }
 }
 return;
 }
 }

 template <typename T>
 typename std::enable_if<IsUnsignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 const auto data = arr.raw_values();
 // write strings instead of numbers since numbers can't represent all 64 bit integers
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Uint64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));
 }
 auto str = std::to_string(data[i]);
 writer_->String(str.c_str(), static_cast<rj::SizeType>(str.size()));
 }
 }

 template <typename T>
 typename std::enable_if<IsFloatingPoint<T>::value, void>::type WriteDataValues(
 const T& arr) {
 enable_if_floating_point<typename T::TypeClass> WriteDataValues(const T& arr) {
 static const char null_string[] = "0.";
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
Expand DownExpand Up@@ -1054,30 +1053,34 @@ static Status GetField(const rj::Value& obj, DictionaryMemo* dictionary_memo,
 return Status::OK();
}

template <typename T>
inline typename std::enable_if<IsSignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsInt64());
 return static_cast<typename T::c_type>(val.GetInt64());
}
template <typename T, typename CType = typename T::c_type>
enable_if_integer_repr<T, CType> UnboxValue(
 const rj::Value& val,
 typename std::enable_if<!std::is_same<T, HalfFloatType>::value>::type* = nullptr) {
 if (sizeof(CType) < sizeof(int64_t)) {
 if (IsSignedInt<T>::value) {
 DCHECK(val.IsInt());
 return static_cast<CType>(val.GetInt());
 }
 DCHECK(val.IsUint());
 return static_cast<CType>(val.GetUint());
 }

template <typename T>
inline typename std::enable_if<IsUnsignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsUint());
 return static_cast<typename T::c_type>(val.GetUint64());
 ::arrow::internal::StringConverter<typename CTypeTraits<CType>::ArrowType> converter;
 CType out;
 auto success = converter(val.GetString(), val.GetStringLength(), &out);
 DCHECK(success);
 return out;
}

template <typename T>
inline typename std::enable_if<IsFloatingPoint<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
enable_if_floating_point<T, typename T::c_type> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsFloat());
 return static_cast<typename T::c_type>(val.GetDouble());
}

template <typename T>
inline typename std::enable_if<std::is_base_of<BooleanType, T>::value, bool>::type
UnboxValue(const rj::Value& val) {
enable_if_boolean<T, bool> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsBool());
 return val.GetBool();
}
Expand Down

19 changes: 19 additions & 0 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,11 @@ struct CTypeTraits<Optional, enable_if_optional_like<Optional>> {
// Useful type predicates
//

template <typename T>
struct as_void {
 using type = void;
};

template <typename T>
using is_number_type = std::is_base_of<NumberType, T>;

Expand DownExpand Up@@ -441,6 +446,16 @@ struct is_8bit_int {
 (std::is_same<UInt8Type, T>::value || std::is_same<Int8Type, T>::value);
};

template <typename T, typename CType = void>
@wesmwesmSep 10, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should put this in json_internal.cc unless we anticipate using it elsewhere
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think IsSignedInt etc should be removed in favor of this trait or one like it (though it should probably be renamed).
IsSignedInt takes either an array or a type as a type argument, which is surprisingly atypical for traits. Furthermore whereas is_signed_integer returns false for date and other types which are represented by but not identical to integers IsSignedInt returns true by checking only the c_type, which leads to static_assert(IsSignedInt<HalfFloatType>::value, ""). Finally the declaration of IsSignedInt is far from readable due to nested macro usage
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://issues.apache.org/jira/browse/ARROW-6515
struct is_integer_repr_type : std::false_type {};

template <>
struct is_integer_repr_type<HalfFloatType> : std::false_type {};

template <typename T>
struct is_integer_repr_type<T, typename as_void<typename T::c_type>::type>
 : std::is_integral<typename T::c_type> {};

template <typename T>
struct is_any_string_type {
 static constexpr bool value =
Expand All@@ -457,6 +472,10 @@ using enable_if_primitive_ctype =
template <typename T, typename R = void>
using enable_if_integer = typename std::enable_if<is_integer_type<T>::value, R>::type;

template <typename T, typename R = void>
using enable_if_integer_repr =
 typename std::enable_if<is_integer_repr_type<T>::value, R>::type;

template <typename T>
using is_signed_integer =
 std::integral_constant<bool, is_integer_type<T>::value &&
Expand Down

12 changes: 11 additions & 1 deletion
integration/integration_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,16 @@ def _get_buffers(self):
 ]


class IntegerColumn(PrimitiveColumn):

 def __init__(self, name, count, is_valid, values, bit_width):
 super(IntegerColumn, self).__init__(name, count, is_valid, values)
 self.bit_width = bit_width

 def _encode_value(self, x):
 return x if self.bit_width < 64 else str(x)


TEST_INT_MAX = 2 ** 31 - 1
TEST_INT_MIN = ~TEST_INT_MAX

Expand DownExpand Up@@ -225,7 +235,7 @@ def generate_range(self, size, lower, upper, name=None):

 if name is None:
 name = self.name
 return PrimitiveColumn(name, size, is_valid, values)
 return IntegerColumn(name, size, is_valid, values, self.bit_width)


class DateType(IntegerType):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-6310: [C++] IPC json should use strings for 64 bit ints#5267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-6310: [C++] IPC json should use strings for 64 bit ints
#5267
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5cd719

ipc json should use strings for 64 bit ints


bkietz Sep 3, 2019
121dee1

use std::to_string


bkietz Sep 5, 2019
8318e9e

rewrite integration/integration_test.py to generate int64 cols as str…


bkietz Sep 9, 2019
09b6a94

de-nest IntegerColumn


bkietz Sep 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


75 changes: 39 additions & 36 deletions
cpp/src/arrow/ipc/json_internal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/logging.h"
#include "arrow/util/parsing.h"
#include "arrow/util/string.h"
#include "arrow/visitor_inline.h"

Expand DownExpand Up@@ -398,36 +399,34 @@ class ArrayWriter {
 }

 template <typename T>
 typename std::enable_if<IsSignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 enable_if_integer_repr<typename T::TypeClass> WriteDataValues(const T& arr) {
 using c_type = typename T::TypeClass::c_type;
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Int64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));

 if (sizeof(c_type) < sizeof(int64_t)) {
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 if (std::is_signed<c_type>::value) {
 writer_->Int(static_cast<int32_t>(data[i]));
 } else {
 writer_->Uint(static_cast<uint32_t>(data[i]));
 }
 } else {
 writer_->RawNumber("0", sizeof("0"));
 }
 }
 return;
 }
 }

 template <typename T>
 typename std::enable_if<IsUnsignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 const auto data = arr.raw_values();
 // write strings instead of numbers since numbers can't represent all 64 bit integers
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Uint64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));
 }
 auto str = std::to_string(data[i]);
 writer_->String(str.c_str(), static_cast<rj::SizeType>(str.size()));
 }
 }

 template <typename T>
 typename std::enable_if<IsFloatingPoint<T>::value, void>::type WriteDataValues(
 const T& arr) {
 enable_if_floating_point<typename T::TypeClass> WriteDataValues(const T& arr) {
 static const char null_string[] = "0.";
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
Expand DownExpand Up@@ -1054,30 +1053,34 @@ static Status GetField(const rj::Value& obj, DictionaryMemo* dictionary_memo,
 return Status::OK();
}

template <typename T>
inline typename std::enable_if<IsSignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsInt64());
 return static_cast<typename T::c_type>(val.GetInt64());
}
template <typename T, typename CType = typename T::c_type>
enable_if_integer_repr<T, CType> UnboxValue(
 const rj::Value& val,
 typename std::enable_if<!std::is_same<T, HalfFloatType>::value>::type* = nullptr) {
 if (sizeof(CType) < sizeof(int64_t)) {
 if (IsSignedInt<T>::value) {
 DCHECK(val.IsInt());
 return static_cast<CType>(val.GetInt());
 }
 DCHECK(val.IsUint());
 return static_cast<CType>(val.GetUint());
 }

template <typename T>
inline typename std::enable_if<IsUnsignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsUint());
 return static_cast<typename T::c_type>(val.GetUint64());
 ::arrow::internal::StringConverter<typename CTypeTraits<CType>::ArrowType> converter;
 CType out;
 auto success = converter(val.GetString(), val.GetStringLength(), &out);
 DCHECK(success);
 return out;
}

template <typename T>
inline typename std::enable_if<IsFloatingPoint<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
enable_if_floating_point<T, typename T::c_type> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsFloat());
 return static_cast<typename T::c_type>(val.GetDouble());
}

template <typename T>
inline typename std::enable_if<std::is_base_of<BooleanType, T>::value, bool>::type
UnboxValue(const rj::Value& val) {
enable_if_boolean<T, bool> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsBool());
 return val.GetBool();
}
Expand Down

19 changes: 19 additions & 0 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,11 @@ struct CTypeTraits<Optional, enable_if_optional_like<Optional>> {
// Useful type predicates
//

template <typename T>
struct as_void {
 using type = void;
};

template <typename T>
using is_number_type = std::is_base_of<NumberType, T>;

Expand DownExpand Up@@ -441,6 +446,16 @@ struct is_8bit_int {
 (std::is_same<UInt8Type, T>::value || std::is_same<Int8Type, T>::value);
};

template <typename T, typename CType = void>
@wesmwesmSep 10, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should put this in json_internal.cc unless we anticipate using it elsewhere
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think IsSignedInt etc should be removed in favor of this trait or one like it (though it should probably be renamed).
IsSignedInt takes either an array or a type as a type argument, which is surprisingly atypical for traits. Furthermore whereas is_signed_integer returns false for date and other types which are represented by but not identical to integers IsSignedInt returns true by checking only the c_type, which leads to static_assert(IsSignedInt<HalfFloatType>::value, ""). Finally the declaration of IsSignedInt is far from readable due to nested macro usage
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://issues.apache.org/jira/browse/ARROW-6515
struct is_integer_repr_type : std::false_type {};

template <>
struct is_integer_repr_type<HalfFloatType> : std::false_type {};

template <typename T>
struct is_integer_repr_type<T, typename as_void<typename T::c_type>::type>
 : std::is_integral<typename T::c_type> {};

template <typename T>
struct is_any_string_type {
 static constexpr bool value =
Expand All@@ -457,6 +472,10 @@ using enable_if_primitive_ctype =
template <typename T, typename R = void>
using enable_if_integer = typename std::enable_if<is_integer_type<T>::value, R>::type;

template <typename T, typename R = void>
using enable_if_integer_repr =
 typename std::enable_if<is_integer_repr_type<T>::value, R>::type;

template <typename T>
using is_signed_integer =
 std::integral_constant<bool, is_integer_type<T>::value &&
Expand Down

12 changes: 11 additions & 1 deletion
integration/integration_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,16 @@ def _get_buffers(self):
 ]


class IntegerColumn(PrimitiveColumn):

 def __init__(self, name, count, is_valid, values, bit_width):
 super(IntegerColumn, self).__init__(name, count, is_valid, values)
 self.bit_width = bit_width

 def _encode_value(self, x):
 return x if self.bit_width < 64 else str(x)


TEST_INT_MAX = 2 ** 31 - 1
TEST_INT_MIN = ~TEST_INT_MAX

Expand DownExpand Up@@ -225,7 +235,7 @@ def generate_range(self, size, lower, upper, name=None):

 if name is None:
 name = self.name
 return PrimitiveColumn(name, size, is_valid, values)
 return IntegerColumn(name, size, is_valid, values, self.bit_width)


class DateType(IntegerType):
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-6310: [C++] IPC json should use strings for 64 bit ints#5267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-6310: [C++] IPC json should use strings for 64 bit ints
#5267
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5cd719

ipc json should use strings for 64 bit ints


bkietz Sep 3, 2019
121dee1

use std::to_string


bkietz Sep 5, 2019
8318e9e

rewrite integration/integration_test.py to generate int64 cols as str…


bkietz Sep 9, 2019
09b6a94

de-nest IntegerColumn


bkietz Sep 10, 2019

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


75 changes: 39 additions & 36 deletions
cpp/src/arrow/ipc/json_internal.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
#include "arrow/util/logging.h"
#include "arrow/util/parsing.h"
#include "arrow/util/string.h"
#include "arrow/visitor_inline.h"

Expand DownExpand Up@@ -398,36 +399,34 @@ class ArrayWriter {
 }

 template <typename T>
 typename std::enable_if<IsSignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 enable_if_integer_repr<typename T::TypeClass> WriteDataValues(const T& arr) {
 using c_type = typename T::TypeClass::c_type;
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Int64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));

 if (sizeof(c_type) < sizeof(int64_t)) {
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 if (std::is_signed<c_type>::value) {
 writer_->Int(static_cast<int32_t>(data[i]));
 } else {
 writer_->Uint(static_cast<uint32_t>(data[i]));
 }
 } else {
 writer_->RawNumber("0", sizeof("0"));
 }
 }
 return;
 }
 }

 template <typename T>
 typename std::enable_if<IsUnsignedInt<T>::value, void>::type WriteDataValues(
 const T& arr) {
 static const char null_string[] = "0";
 const auto data = arr.raw_values();
 // write strings instead of numbers since numbers can't represent all 64 bit integers
 for (int64_t i = 0; i < arr.length(); ++i) {
 if (arr.IsValid(i)) {
 writer_->Uint64(data[i]);
 } else {
 writer_->RawNumber(null_string, sizeof(null_string));
 }
 auto str = std::to_string(data[i]);
 writer_->String(str.c_str(), static_cast<rj::SizeType>(str.size()));
 }
 }

 template <typename T>
 typename std::enable_if<IsFloatingPoint<T>::value, void>::type WriteDataValues(
 const T& arr) {
 enable_if_floating_point<typename T::TypeClass> WriteDataValues(const T& arr) {
 static const char null_string[] = "0.";
 const auto data = arr.raw_values();
 for (int64_t i = 0; i < arr.length(); ++i) {
Expand DownExpand Up@@ -1054,30 +1053,34 @@ static Status GetField(const rj::Value& obj, DictionaryMemo* dictionary_memo,
 return Status::OK();
}

template <typename T>
inline typename std::enable_if<IsSignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsInt64());
 return static_cast<typename T::c_type>(val.GetInt64());
}
template <typename T, typename CType = typename T::c_type>
enable_if_integer_repr<T, CType> UnboxValue(
 const rj::Value& val,
 typename std::enable_if<!std::is_same<T, HalfFloatType>::value>::type* = nullptr) {
 if (sizeof(CType) < sizeof(int64_t)) {
 if (IsSignedInt<T>::value) {
 DCHECK(val.IsInt());
 return static_cast<CType>(val.GetInt());
 }
 DCHECK(val.IsUint());
 return static_cast<CType>(val.GetUint());
 }

template <typename T>
inline typename std::enable_if<IsUnsignedInt<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
 DCHECK(val.IsUint());
 return static_cast<typename T::c_type>(val.GetUint64());
 ::arrow::internal::StringConverter<typename CTypeTraits<CType>::ArrowType> converter;
 CType out;
 auto success = converter(val.GetString(), val.GetStringLength(), &out);
 DCHECK(success);
 return out;
}

template <typename T>
inline typename std::enable_if<IsFloatingPoint<T>::value, typename T::c_type>::type
UnboxValue(const rj::Value& val) {
enable_if_floating_point<T, typename T::c_type> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsFloat());
 return static_cast<typename T::c_type>(val.GetDouble());
}

template <typename T>
inline typename std::enable_if<std::is_base_of<BooleanType, T>::value, bool>::type
UnboxValue(const rj::Value& val) {
enable_if_boolean<T, bool> UnboxValue(const rj::Value& val) {
 DCHECK(val.IsBool());
 return val.GetBool();
}
Expand Down

19 changes: 19 additions & 0 deletions
cpp/src/arrow/type_traits.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,11 @@ struct CTypeTraits<Optional, enable_if_optional_like<Optional>> {
// Useful type predicates
//

template <typename T>
struct as_void {
 using type = void;
};

template <typename T>
using is_number_type = std::is_base_of<NumberType, T>;

Expand DownExpand Up@@ -441,6 +446,16 @@ struct is_8bit_int {
 (std::is_same<UInt8Type, T>::value || std::is_same<Int8Type, T>::value);
};

template <typename T, typename CType = void>
@wesmwesmSep 10, 2019

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should put this in json_internal.cc unless we anticipate using it elsewhere
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do think IsSignedInt etc should be removed in favor of this trait or one like it (though it should probably be renamed).
IsSignedInt takes either an array or a type as a type argument, which is surprisingly atypical for traits. Furthermore whereas is_signed_integer returns false for date and other types which are represented by but not identical to integers IsSignedInt returns true by checking only the c_type, which leads to static_assert(IsSignedInt<HalfFloatType>::value, ""). Finally the declaration of IsSignedInt is far from readable due to nested macro usage
@bkietzbkietzSep 10, 2019

Copy link


Copy Markdown

MemberAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://issues.apache.org/jira/browse/ARROW-6515
struct is_integer_repr_type : std::false_type {};

template <>
struct is_integer_repr_type<HalfFloatType> : std::false_type {};

template <typename T>
struct is_integer_repr_type<T, typename as_void<typename T::c_type>::type>
 : std::is_integral<typename T::c_type> {};

template <typename T>
struct is_any_string_type {
 static constexpr bool value =
Expand All@@ -457,6 +472,10 @@ using enable_if_primitive_ctype =
template <typename T, typename R = void>
using enable_if_integer = typename std::enable_if<is_integer_type<T>::value, R>::type;

template <typename T, typename R = void>
using enable_if_integer_repr =
 typename std::enable_if<is_integer_repr_type<T>::value, R>::type;

template <typename T>
using is_signed_integer =
 std::integral_constant<bool, is_integer_type<T>::value &&
Expand Down

12 changes: 11 additions & 1 deletion
integration/integration_test.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -179,6 +179,16 @@ def _get_buffers(self):
 ]


class IntegerColumn(PrimitiveColumn):

 def __init__(self, name, count, is_valid, values, bit_width):
 super(IntegerColumn, self).__init__(name, count, is_valid, values)
 self.bit_width = bit_width

 def _encode_value(self, x):
 return x if self.bit_width < 64 else str(x)


TEST_INT_MAX = 2 ** 31 - 1
TEST_INT_MIN = ~TEST_INT_MAX

Expand DownExpand Up@@ -225,7 +235,7 @@ def generate_range(self, size, lower, upper, name=None):

 if name is None:
 name = self.name
 return PrimitiveColumn(name, size, is_valid, values)
 return IntegerColumn(name, size, is_valid, values, self.bit_width)


class DateType(IntegerType):
Expand Down