ARROW-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144#4413

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
romainfrancois wants to merge 3 commits into from
Closed

ARROW-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144 #4413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa0440f
update R to changes from ARROW-3144 #4316
romainfrancois May 29, 2019
2556c16
document()
romainfrancois May 31, 2019
b0de1a8
R should pass now
romainfrancois May 31, 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
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,6 @@ before_install:
- if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -s; fi

matrix:
allow_failures:
- language: r
fast_finish: true
include:
- name: "Lint, Release tests"
Expand Down
12 changes: 6 additions & 6 deletions r/R/RcppExports.R
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions r/R/dictionary.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,25 +34,25 @@

active = list(
index_type = function() `arrow::DataType`$dispatch(DictionaryType__index_type(self)),
dictionary = function() shared_ptr(`arrow::Array`, DictionaryType__dictionary(self)),
value_type = function() `arrow::DataType`$dispatch(DictionaryType__value_type(self)),
name = function() DictionaryType__name(self),
ordered = function() DictionaryType__ordered(self)
)
)

#' dictionary type factory
#'
#' @param type indices type, e.g. [int32()]
#' @param values values array, typically an arrow array of strings
#' @param ordered Is this an ordered dictionary
#' @param index_type index type, e.g. [int32()]
#' @param value_type value type, probably [utf8()]
#' @param ordered Is this an ordered dictionary ?
#'
#' @return a [arrow::DictionaryType][arrow__DictionaryType]
#'
#' @export
dictionary <- function(type, values, ordered = FALSE) {
dictionary <- function(index_type, value_type, ordered = FALSE) {
assert_that(
inherits(type, "arrow::DataType"),
inherits(values, "arrow::Array")
inherits(index_type, "arrow::DataType"),
inherits(index_type, "arrow::DataType")
)
shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(type, values, ordered))
shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(index_type, value_type, ordered))
}
8 changes: 4 additions & 4 deletions r/man/dictionary.Rd
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions r/src/RcppExports.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 11 additions & 24 deletions r/src/array_from_vector.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,8 +141,11 @@ std::shared_ptr<Array> MakeFactorArrayImpl(Rcpp::IntegerVector_ factor,
ArrayData::Make(std::make_shared<Type>(), n, std::move(buffers), null_count, 0);
auto array_indices = MakeArray(array_indices_data);

SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
auto dict = MakeStringArray(levels);

std::shared_ptr<Array> out;
STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, &out));
STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, dict, &out));
return out;
}

Expand DownExpand Up@@ -741,22 +744,20 @@ Status GetConverter(const std::shared_ptr<DataType>& type,
}

template <typename Type>
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(Rcpp::IntegerVector_ factor) {
auto dict_values = MakeStringArray(Rf_getAttrib(factor, R_LevelsSymbol));
auto dict_type =
dictionary(std::make_shared<Type>(), dict_values, Rf_inherits(factor, "ordered"));
return dict_type;
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(bool ordered) {
return dictionary(std::make_shared<Type>(), arrow::utf8(), ordered);
}

std::shared_ptr<arrow::DataType> GetFactorType(SEXP factor) {
SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
bool is_ordered = Rf_inherits(factor, "ordered");
int n = Rf_length(levels);
if (n < 128) {
return GetFactorTypeImpl<arrow::Int8Type>(factor);
return GetFactorTypeImpl<arrow::Int8Type>(is_ordered);
} else if (n < 32768) {
return GetFactorTypeImpl<arrow::Int16Type>(factor);
return GetFactorTypeImpl<arrow::Int16Type>(is_ordered);
} else {
return GetFactorTypeImpl<arrow::Int32Type>(factor);
return GetFactorTypeImpl<arrow::Int32Type>(is_ordered);
}
}

Expand DownExpand Up@@ -909,21 +910,7 @@ bool CheckCompatibleFactor(SEXP obj, const std::shared_ptr<arrow::DataType>& typ

arrow::DictionaryType* dict_type =
arrow::checked_cast<arrow::DictionaryType*>(type.get());
auto dictionary = dict_type->dictionary();
if (dictionary->type() != utf8()) return false;

// then compare levels
auto typed_dict = checked_cast<arrow::StringArray*>(dictionary.get());
SEXP levels = Rf_getAttrib(obj, R_LevelsSymbol);

R_xlen_t n = XLENGTH(levels);
if (n != typed_dict->length()) return false;

for (R_xlen_t i = 0; i < n; i++) {
if (typed_dict->GetString(i) != CHAR(STRING_ELT(levels, i))) return false;
}

return true;
return dict_type->value_type() == utf8();
}

std::shared_ptr<arrow::Array> Array__from_vector(
Expand Down
16 changes: 8 additions & 8 deletions r/src/datatype.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ arrow::TimeUnit::type TimestampType__unit(

// [[Rcpp::export]]
std::shared_ptr<arrow::DataType> DictionaryType__initialize(
const std::shared_ptr<arrow::DataType>& type,
const std::shared_ptr<arrow::Array>& array, bool ordered) {
return arrow::dictionary(type, array, ordered);
const std::shared_ptr<arrow::DataType>& index_type,
const std::shared_ptr<arrow::DataType>& value_type, bool ordered) {
return arrow::dictionary(index_type, value_type, ordered);
}

// [[Rcpp::export]]
Expand All@@ -262,14 +262,14 @@ std::shared_ptr<arrow::DataType> DictionaryType__index_type(
}

// [[Rcpp::export]]
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
return type->name();
std::shared_ptr<arrow::DataType> DictionaryType__value_type(
const std::shared_ptr<arrow::DictionaryType>& type) {
return type->value_type();
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Array> DictionaryType__dictionary(
const std::shared_ptr<arrow::DictionaryType>& type) {
return type->dictionary();
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
return type->name();
}

// [[Rcpp::export]]
Expand Down
9 changes: 7 additions & 2 deletions r/src/message.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,15 +56,20 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__Message__Schema(
const std::unique_ptr<arrow::ipc::Message>& message,
const std::shared_ptr<arrow::Schema>& schema) {
std::shared_ptr<arrow::RecordBatch> batch;
STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &batch));

// TODO: perhaps this should come from the R side
arrow::ipc::DictionaryMemo memo;
STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &memo, &batch));
return batch;
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Schema> ipc___ReadSchema_InputStream(
const std::shared_ptr<arrow::io::InputStream>& stream) {
std::shared_ptr<arrow::Schema> schema;
STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &schema));
// TODO: promote to function argument
arrow::ipc::DictionaryMemo memo;
STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &memo, &schema));
return schema;
}

Expand Down
4 changes: 3 additions & 1 deletion r/src/recordbatch.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,6 +140,8 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__InputStream__Schema(
const std::shared_ptr<arrow::io::InputStream>& stream,
const std::shared_ptr<arrow::Schema>& schema) {
std::shared_ptr<arrow::RecordBatch> batch;
STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, stream.get(), &batch));
// TODO: promote to function arg
arrow::ipc::DictionaryMemo memo;
STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, &memo, stream.get(), &batch));
return batch;
}
4 changes: 2 additions & 2 deletions r/tests/testthat/test-DataType.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -314,13 +314,13 @@ test_that("struct type works as expected", {
})

test_that("DictionaryType works as expected (ARROW-3355)", {
d <- dictionary(int32(), array(c("foo", "bar", "baz")))
d <- dictionary(int32(), utf8())
expect_equal(d, d)
expect_true(d == d)
expect_false(d == int32())
expect_equal(d$id, Type$DICTIONARY)
expect_equal(d$bit_width, 32L)
expect_equal(d$ToString(), "dictionary<values=string, indices=int32, ordered=0>")
expect_equal(d$index_type, int32())
expect_equal(d$dictionary, array(c("foo", "bar", "baz")))
expect_equal(d$value_type, utf8())
})
, '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-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144#4413

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

romainfrancois
wants to merge
3
commits into

from

 Closed


ARROW-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144
#4413
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fa0440f

update R to changes from ARROW-3144 #4316


romainfrancois May 29, 2019
2556c16

document()


romainfrancois May 31, 2019
b0de1a8

R should pass now


romainfrancois May 31, 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


2 changes: 0 additions & 2 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,6 @@ before_install:
 - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -s; fi

matrix:
 allow_failures:
 - language: r
 fast_finish: true
 include:
 - name: "Lint, Release tests"
Expand Down

12 changes: 6 additions & 6 deletions
r/R/RcppExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 8 additions & 8 deletions
r/R/dictionary.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,25 +34,25 @@

 active = list(
 index_type = function() `arrow::DataType`$dispatch(DictionaryType__index_type(self)),
dictionary = function() shared_ptr(`arrow::Array`, DictionaryType__dictionary(self)),
value_type = function() `arrow::DataType`$dispatch(DictionaryType__value_type(self)),
 name = function() DictionaryType__name(self),
 ordered = function() DictionaryType__ordered(self)
 )
)

#' dictionary type factory
#'
#' @param type indices type, e.g. [int32()]
#' @param values values array, typically an arrow array of strings
#' @param ordered Is this an ordered dictionary
#' @param index_type index type, e.g. [int32()]
#' @param value_type value type, probably [utf8()]
#' @param ordered Is this an ordered dictionary ?
#'
#' @return a [arrow::DictionaryType][arrow__DictionaryType]
#'
#' @export
dictionary <- function(type, values, ordered = FALSE) {
dictionary <- function(index_type, value_type, ordered = FALSE) {
 assert_that(
 inherits(type, "arrow::DataType"),
 inherits(values, "arrow::Array")
 inherits(index_type, "arrow::DataType"),
 inherits(index_type, "arrow::DataType")
 )
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(type, values, ordered))
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(index_type, value_type, ordered))
}

8 changes: 4 additions & 4 deletions
r/man/dictionary.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
r/src/RcppExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


35 changes: 11 additions & 24 deletions
r/src/array_from_vector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,8 +141,11 @@ std::shared_ptr<Array> MakeFactorArrayImpl(Rcpp::IntegerVector_ factor,
 ArrayData::Make(std::make_shared<Type>(), n, std::move(buffers), null_count, 0);
 auto array_indices = MakeArray(array_indices_data);

 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 auto dict = MakeStringArray(levels);

 std::shared_ptr<Array> out;
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, &out));
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, dict, &out));
 return out;
}

Expand DownExpand Up@@ -741,22 +744,20 @@ Status GetConverter(const std::shared_ptr<DataType>& type,
}

template <typename Type>
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(Rcpp::IntegerVector_ factor) {
 auto dict_values = MakeStringArray(Rf_getAttrib(factor, R_LevelsSymbol));
 auto dict_type =
 dictionary(std::make_shared<Type>(), dict_values, Rf_inherits(factor, "ordered"));
 return dict_type;
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(bool ordered) {
 return dictionary(std::make_shared<Type>(), arrow::utf8(), ordered);
}

std::shared_ptr<arrow::DataType> GetFactorType(SEXP factor) {
 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 bool is_ordered = Rf_inherits(factor, "ordered");
 int n = Rf_length(levels);
 if (n < 128) {
 return GetFactorTypeImpl<arrow::Int8Type>(factor);
 return GetFactorTypeImpl<arrow::Int8Type>(is_ordered);
 } else if (n < 32768) {
 return GetFactorTypeImpl<arrow::Int16Type>(factor);
 return GetFactorTypeImpl<arrow::Int16Type>(is_ordered);
 } else {
 return GetFactorTypeImpl<arrow::Int32Type>(factor);
 return GetFactorTypeImpl<arrow::Int32Type>(is_ordered);
 }
}

Expand DownExpand Up@@ -909,21 +910,7 @@ bool CheckCompatibleFactor(SEXP obj, const std::shared_ptr<arrow::DataType>& typ

 arrow::DictionaryType* dict_type =
 arrow::checked_cast<arrow::DictionaryType*>(type.get());
 auto dictionary = dict_type->dictionary();
 if (dictionary->type() != utf8()) return false;

 // then compare levels
 auto typed_dict = checked_cast<arrow::StringArray*>(dictionary.get());
 SEXP levels = Rf_getAttrib(obj, R_LevelsSymbol);

 R_xlen_t n = XLENGTH(levels);
 if (n != typed_dict->length()) return false;

 for (R_xlen_t i = 0; i < n; i++) {
 if (typed_dict->GetString(i) != CHAR(STRING_ELT(levels, i))) return false;
 }

 return true;
 return dict_type->value_type() == utf8();
}

std::shared_ptr<arrow::Array> Array__from_vector(
Expand Down

16 changes: 8 additions & 8 deletions
r/src/datatype.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ arrow::TimeUnit::type TimestampType__unit(

// [[Rcpp::export]]
std::shared_ptr<arrow::DataType> DictionaryType__initialize(
 const std::shared_ptr<arrow::DataType>& type,
 const std::shared_ptr<arrow::Array>& array, bool ordered) {
 return arrow::dictionary(type, array, ordered);
 const std::shared_ptr<arrow::DataType>& index_type,
 const std::shared_ptr<arrow::DataType>& value_type, bool ordered) {
 return arrow::dictionary(index_type, value_type, ordered);
}

// [[Rcpp::export]]
Expand All@@ -262,14 +262,14 @@ std::shared_ptr<arrow::DataType> DictionaryType__index_type(
}

// [[Rcpp::export]]
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
std::shared_ptr<arrow::DataType> DictionaryType__value_type(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->value_type();
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Array> DictionaryType__dictionary(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->dictionary();
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
}

// [[Rcpp::export]]
Expand Down

9 changes: 7 additions & 2 deletions
r/src/message.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,15 +56,20 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__Message__Schema(
 const std::unique_ptr<arrow::ipc::Message>& message,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &batch));

 // TODO: perhaps this should come from the R side
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &memo, &batch));
 return batch;
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Schema> ipc___ReadSchema_InputStream(
 const std::shared_ptr<arrow::io::InputStream>& stream) {
 std::shared_ptr<arrow::Schema> schema;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &schema));
 // TODO: promote to function argument
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &memo, &schema));
 return schema;
}

Expand Down

4 changes: 3 additions & 1 deletion
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,6 +140,8 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__InputStream__Schema(
 const std::shared_ptr<arrow::io::InputStream>& stream,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, stream.get(), &batch));
 // TODO: promote to function arg
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, &memo, stream.get(), &batch));
 return batch;
}

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-DataType.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,13 +314,13 @@ test_that("struct type works as expected", {
})

test_that("DictionaryType works as expected (ARROW-3355)", {
 d <- dictionary(int32(), array(c("foo", "bar", "baz")))
 d <- dictionary(int32(), utf8())
 expect_equal(d, d)
 expect_true(d == d)
 expect_false(d == int32())
 expect_equal(d$id, Type$DICTIONARY)
 expect_equal(d$bit_width, 32L)
 expect_equal(d$ToString(), "dictionary<values=string, indices=int32, ordered=0>")
 expect_equal(d$index_type, int32())
 expect_equal(d$dictionary, array(c("foo", "bar", "baz")))
 expect_equal(d$value_type, utf8())
})

, '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-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144#4413

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

romainfrancois
wants to merge
3
commits into

from

 Closed


ARROW-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144
#4413
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fa0440f

update R to changes from ARROW-3144 #4316


romainfrancois May 29, 2019
2556c16

document()


romainfrancois May 31, 2019
b0de1a8

R should pass now


romainfrancois May 31, 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


2 changes: 0 additions & 2 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,6 @@ before_install:
 - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -s; fi

matrix:
 allow_failures:
 - language: r
 fast_finish: true
 include:
 - name: "Lint, Release tests"
Expand Down

12 changes: 6 additions & 6 deletions
r/R/RcppExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 8 additions & 8 deletions
r/R/dictionary.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,25 +34,25 @@

 active = list(
 index_type = function() `arrow::DataType`$dispatch(DictionaryType__index_type(self)),
dictionary = function() shared_ptr(`arrow::Array`, DictionaryType__dictionary(self)),
value_type = function() `arrow::DataType`$dispatch(DictionaryType__value_type(self)),
 name = function() DictionaryType__name(self),
 ordered = function() DictionaryType__ordered(self)
 )
)

#' dictionary type factory
#'
#' @param type indices type, e.g. [int32()]
#' @param values values array, typically an arrow array of strings
#' @param ordered Is this an ordered dictionary
#' @param index_type index type, e.g. [int32()]
#' @param value_type value type, probably [utf8()]
#' @param ordered Is this an ordered dictionary ?
#'
#' @return a [arrow::DictionaryType][arrow__DictionaryType]
#'
#' @export
dictionary <- function(type, values, ordered = FALSE) {
dictionary <- function(index_type, value_type, ordered = FALSE) {
 assert_that(
 inherits(type, "arrow::DataType"),
 inherits(values, "arrow::Array")
 inherits(index_type, "arrow::DataType"),
 inherits(index_type, "arrow::DataType")
 )
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(type, values, ordered))
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(index_type, value_type, ordered))
}

8 changes: 4 additions & 4 deletions
r/man/dictionary.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
r/src/RcppExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


35 changes: 11 additions & 24 deletions
r/src/array_from_vector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,8 +141,11 @@ std::shared_ptr<Array> MakeFactorArrayImpl(Rcpp::IntegerVector_ factor,
 ArrayData::Make(std::make_shared<Type>(), n, std::move(buffers), null_count, 0);
 auto array_indices = MakeArray(array_indices_data);

 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 auto dict = MakeStringArray(levels);

 std::shared_ptr<Array> out;
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, &out));
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, dict, &out));
 return out;
}

Expand DownExpand Up@@ -741,22 +744,20 @@ Status GetConverter(const std::shared_ptr<DataType>& type,
}

template <typename Type>
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(Rcpp::IntegerVector_ factor) {
 auto dict_values = MakeStringArray(Rf_getAttrib(factor, R_LevelsSymbol));
 auto dict_type =
 dictionary(std::make_shared<Type>(), dict_values, Rf_inherits(factor, "ordered"));
 return dict_type;
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(bool ordered) {
 return dictionary(std::make_shared<Type>(), arrow::utf8(), ordered);
}

std::shared_ptr<arrow::DataType> GetFactorType(SEXP factor) {
 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 bool is_ordered = Rf_inherits(factor, "ordered");
 int n = Rf_length(levels);
 if (n < 128) {
 return GetFactorTypeImpl<arrow::Int8Type>(factor);
 return GetFactorTypeImpl<arrow::Int8Type>(is_ordered);
 } else if (n < 32768) {
 return GetFactorTypeImpl<arrow::Int16Type>(factor);
 return GetFactorTypeImpl<arrow::Int16Type>(is_ordered);
 } else {
 return GetFactorTypeImpl<arrow::Int32Type>(factor);
 return GetFactorTypeImpl<arrow::Int32Type>(is_ordered);
 }
}

Expand DownExpand Up@@ -909,21 +910,7 @@ bool CheckCompatibleFactor(SEXP obj, const std::shared_ptr<arrow::DataType>& typ

 arrow::DictionaryType* dict_type =
 arrow::checked_cast<arrow::DictionaryType*>(type.get());
 auto dictionary = dict_type->dictionary();
 if (dictionary->type() != utf8()) return false;

 // then compare levels
 auto typed_dict = checked_cast<arrow::StringArray*>(dictionary.get());
 SEXP levels = Rf_getAttrib(obj, R_LevelsSymbol);

 R_xlen_t n = XLENGTH(levels);
 if (n != typed_dict->length()) return false;

 for (R_xlen_t i = 0; i < n; i++) {
 if (typed_dict->GetString(i) != CHAR(STRING_ELT(levels, i))) return false;
 }

 return true;
 return dict_type->value_type() == utf8();
}

std::shared_ptr<arrow::Array> Array__from_vector(
Expand Down

16 changes: 8 additions & 8 deletions
r/src/datatype.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ arrow::TimeUnit::type TimestampType__unit(

// [[Rcpp::export]]
std::shared_ptr<arrow::DataType> DictionaryType__initialize(
 const std::shared_ptr<arrow::DataType>& type,
 const std::shared_ptr<arrow::Array>& array, bool ordered) {
 return arrow::dictionary(type, array, ordered);
 const std::shared_ptr<arrow::DataType>& index_type,
 const std::shared_ptr<arrow::DataType>& value_type, bool ordered) {
 return arrow::dictionary(index_type, value_type, ordered);
}

// [[Rcpp::export]]
Expand All@@ -262,14 +262,14 @@ std::shared_ptr<arrow::DataType> DictionaryType__index_type(
}

// [[Rcpp::export]]
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
std::shared_ptr<arrow::DataType> DictionaryType__value_type(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->value_type();
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Array> DictionaryType__dictionary(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->dictionary();
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
}

// [[Rcpp::export]]
Expand Down

9 changes: 7 additions & 2 deletions
r/src/message.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,15 +56,20 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__Message__Schema(
 const std::unique_ptr<arrow::ipc::Message>& message,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &batch));

 // TODO: perhaps this should come from the R side
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &memo, &batch));
 return batch;
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Schema> ipc___ReadSchema_InputStream(
 const std::shared_ptr<arrow::io::InputStream>& stream) {
 std::shared_ptr<arrow::Schema> schema;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &schema));
 // TODO: promote to function argument
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &memo, &schema));
 return schema;
}

Expand Down

4 changes: 3 additions & 1 deletion
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,6 +140,8 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__InputStream__Schema(
 const std::shared_ptr<arrow::io::InputStream>& stream,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, stream.get(), &batch));
 // TODO: promote to function arg
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, &memo, stream.get(), &batch));
 return batch;
}

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-DataType.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,13 +314,13 @@ test_that("struct type works as expected", {
})

test_that("DictionaryType works as expected (ARROW-3355)", {
 d <- dictionary(int32(), array(c("foo", "bar", "baz")))
 d <- dictionary(int32(), utf8())
 expect_equal(d, d)
 expect_true(d == d)
 expect_false(d == int32())
 expect_equal(d$id, Type$DICTIONARY)
 expect_equal(d$bit_width, 32L)
 expect_equal(d$ToString(), "dictionary<values=string, indices=int32, ordered=0>")
 expect_equal(d$index_type, int32())
 expect_equal(d$dictionary, array(c("foo", "bar", "baz")))
 expect_equal(d$value_type, utf8())
})

, '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-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144#4413

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

romainfrancois
wants to merge
3
commits into

from

 Closed


ARROW-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144
#4413
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fa0440f

update R to changes from ARROW-3144 #4316


romainfrancois May 29, 2019
2556c16

document()


romainfrancois May 31, 2019
b0de1a8

R should pass now


romainfrancois May 31, 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


2 changes: 0 additions & 2 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,6 @@ before_install:
 - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -s; fi

matrix:
 allow_failures:
 - language: r
 fast_finish: true
 include:
 - name: "Lint, Release tests"
Expand Down

12 changes: 6 additions & 6 deletions
r/R/RcppExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 8 additions & 8 deletions
r/R/dictionary.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,25 +34,25 @@

 active = list(
 index_type = function() `arrow::DataType`$dispatch(DictionaryType__index_type(self)),
dictionary = function() shared_ptr(`arrow::Array`, DictionaryType__dictionary(self)),
value_type = function() `arrow::DataType`$dispatch(DictionaryType__value_type(self)),
 name = function() DictionaryType__name(self),
 ordered = function() DictionaryType__ordered(self)
 )
)

#' dictionary type factory
#'
#' @param type indices type, e.g. [int32()]
#' @param values values array, typically an arrow array of strings
#' @param ordered Is this an ordered dictionary
#' @param index_type index type, e.g. [int32()]
#' @param value_type value type, probably [utf8()]
#' @param ordered Is this an ordered dictionary ?
#'
#' @return a [arrow::DictionaryType][arrow__DictionaryType]
#'
#' @export
dictionary <- function(type, values, ordered = FALSE) {
dictionary <- function(index_type, value_type, ordered = FALSE) {
 assert_that(
 inherits(type, "arrow::DataType"),
 inherits(values, "arrow::Array")
 inherits(index_type, "arrow::DataType"),
 inherits(index_type, "arrow::DataType")
 )
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(type, values, ordered))
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(index_type, value_type, ordered))
}

8 changes: 4 additions & 4 deletions
r/man/dictionary.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
r/src/RcppExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


35 changes: 11 additions & 24 deletions
r/src/array_from_vector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,8 +141,11 @@ std::shared_ptr<Array> MakeFactorArrayImpl(Rcpp::IntegerVector_ factor,
 ArrayData::Make(std::make_shared<Type>(), n, std::move(buffers), null_count, 0);
 auto array_indices = MakeArray(array_indices_data);

 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 auto dict = MakeStringArray(levels);

 std::shared_ptr<Array> out;
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, &out));
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, dict, &out));
 return out;
}

Expand DownExpand Up@@ -741,22 +744,20 @@ Status GetConverter(const std::shared_ptr<DataType>& type,
}

template <typename Type>
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(Rcpp::IntegerVector_ factor) {
 auto dict_values = MakeStringArray(Rf_getAttrib(factor, R_LevelsSymbol));
 auto dict_type =
 dictionary(std::make_shared<Type>(), dict_values, Rf_inherits(factor, "ordered"));
 return dict_type;
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(bool ordered) {
 return dictionary(std::make_shared<Type>(), arrow::utf8(), ordered);
}

std::shared_ptr<arrow::DataType> GetFactorType(SEXP factor) {
 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 bool is_ordered = Rf_inherits(factor, "ordered");
 int n = Rf_length(levels);
 if (n < 128) {
 return GetFactorTypeImpl<arrow::Int8Type>(factor);
 return GetFactorTypeImpl<arrow::Int8Type>(is_ordered);
 } else if (n < 32768) {
 return GetFactorTypeImpl<arrow::Int16Type>(factor);
 return GetFactorTypeImpl<arrow::Int16Type>(is_ordered);
 } else {
 return GetFactorTypeImpl<arrow::Int32Type>(factor);
 return GetFactorTypeImpl<arrow::Int32Type>(is_ordered);
 }
}

Expand DownExpand Up@@ -909,21 +910,7 @@ bool CheckCompatibleFactor(SEXP obj, const std::shared_ptr<arrow::DataType>& typ

 arrow::DictionaryType* dict_type =
 arrow::checked_cast<arrow::DictionaryType*>(type.get());
 auto dictionary = dict_type->dictionary();
 if (dictionary->type() != utf8()) return false;

 // then compare levels
 auto typed_dict = checked_cast<arrow::StringArray*>(dictionary.get());
 SEXP levels = Rf_getAttrib(obj, R_LevelsSymbol);

 R_xlen_t n = XLENGTH(levels);
 if (n != typed_dict->length()) return false;

 for (R_xlen_t i = 0; i < n; i++) {
 if (typed_dict->GetString(i) != CHAR(STRING_ELT(levels, i))) return false;
 }

 return true;
 return dict_type->value_type() == utf8();
}

std::shared_ptr<arrow::Array> Array__from_vector(
Expand Down

16 changes: 8 additions & 8 deletions
r/src/datatype.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ arrow::TimeUnit::type TimestampType__unit(

// [[Rcpp::export]]
std::shared_ptr<arrow::DataType> DictionaryType__initialize(
 const std::shared_ptr<arrow::DataType>& type,
 const std::shared_ptr<arrow::Array>& array, bool ordered) {
 return arrow::dictionary(type, array, ordered);
 const std::shared_ptr<arrow::DataType>& index_type,
 const std::shared_ptr<arrow::DataType>& value_type, bool ordered) {
 return arrow::dictionary(index_type, value_type, ordered);
}

// [[Rcpp::export]]
Expand All@@ -262,14 +262,14 @@ std::shared_ptr<arrow::DataType> DictionaryType__index_type(
}

// [[Rcpp::export]]
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
std::shared_ptr<arrow::DataType> DictionaryType__value_type(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->value_type();
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Array> DictionaryType__dictionary(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->dictionary();
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
}

// [[Rcpp::export]]
Expand Down

9 changes: 7 additions & 2 deletions
r/src/message.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,15 +56,20 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__Message__Schema(
 const std::unique_ptr<arrow::ipc::Message>& message,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &batch));

 // TODO: perhaps this should come from the R side
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &memo, &batch));
 return batch;
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Schema> ipc___ReadSchema_InputStream(
 const std::shared_ptr<arrow::io::InputStream>& stream) {
 std::shared_ptr<arrow::Schema> schema;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &schema));
 // TODO: promote to function argument
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &memo, &schema));
 return schema;
}

Expand Down

4 changes: 3 additions & 1 deletion
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,6 +140,8 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__InputStream__Schema(
 const std::shared_ptr<arrow::io::InputStream>& stream,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, stream.get(), &batch));
 // TODO: promote to function arg
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, &memo, stream.get(), &batch));
 return batch;
}

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-DataType.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,13 +314,13 @@ test_that("struct type works as expected", {
})

test_that("DictionaryType works as expected (ARROW-3355)", {
 d <- dictionary(int32(), array(c("foo", "bar", "baz")))
 d <- dictionary(int32(), utf8())
 expect_equal(d, d)
 expect_true(d == d)
 expect_false(d == int32())
 expect_equal(d$id, Type$DICTIONARY)
 expect_equal(d$bit_width, 32L)
 expect_equal(d$ToString(), "dictionary<values=string, indices=int32, ordered=0>")
 expect_equal(d$index_type, int32())
 expect_equal(d$dictionary, array(c("foo", "bar", "baz")))
 expect_equal(d$value_type, utf8())
})

, '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-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144#4413

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

romainfrancois
wants to merge
3
commits into

from

 Closed


ARROW-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144
#4413
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fa0440f

update R to changes from ARROW-3144 #4316


romainfrancois May 29, 2019
2556c16

document()


romainfrancois May 31, 2019
b0de1a8

R should pass now


romainfrancois May 31, 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


2 changes: 0 additions & 2 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,6 @@ before_install:
 - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -s; fi

matrix:
 allow_failures:
 - language: r
 fast_finish: true
 include:
 - name: "Lint, Release tests"
Expand Down

12 changes: 6 additions & 6 deletions
r/R/RcppExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 8 additions & 8 deletions
r/R/dictionary.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,25 +34,25 @@

 active = list(
 index_type = function() `arrow::DataType`$dispatch(DictionaryType__index_type(self)),
dictionary = function() shared_ptr(`arrow::Array`, DictionaryType__dictionary(self)),
value_type = function() `arrow::DataType`$dispatch(DictionaryType__value_type(self)),
 name = function() DictionaryType__name(self),
 ordered = function() DictionaryType__ordered(self)
 )
)

#' dictionary type factory
#'
#' @param type indices type, e.g. [int32()]
#' @param values values array, typically an arrow array of strings
#' @param ordered Is this an ordered dictionary
#' @param index_type index type, e.g. [int32()]
#' @param value_type value type, probably [utf8()]
#' @param ordered Is this an ordered dictionary ?
#'
#' @return a [arrow::DictionaryType][arrow__DictionaryType]
#'
#' @export
dictionary <- function(type, values, ordered = FALSE) {
dictionary <- function(index_type, value_type, ordered = FALSE) {
 assert_that(
 inherits(type, "arrow::DataType"),
 inherits(values, "arrow::Array")
 inherits(index_type, "arrow::DataType"),
 inherits(index_type, "arrow::DataType")
 )
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(type, values, ordered))
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(index_type, value_type, ordered))
}

8 changes: 4 additions & 4 deletions
r/man/dictionary.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
r/src/RcppExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


35 changes: 11 additions & 24 deletions
r/src/array_from_vector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,8 +141,11 @@ std::shared_ptr<Array> MakeFactorArrayImpl(Rcpp::IntegerVector_ factor,
 ArrayData::Make(std::make_shared<Type>(), n, std::move(buffers), null_count, 0);
 auto array_indices = MakeArray(array_indices_data);

 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 auto dict = MakeStringArray(levels);

 std::shared_ptr<Array> out;
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, &out));
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, dict, &out));
 return out;
}

Expand DownExpand Up@@ -741,22 +744,20 @@ Status GetConverter(const std::shared_ptr<DataType>& type,
}

template <typename Type>
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(Rcpp::IntegerVector_ factor) {
 auto dict_values = MakeStringArray(Rf_getAttrib(factor, R_LevelsSymbol));
 auto dict_type =
 dictionary(std::make_shared<Type>(), dict_values, Rf_inherits(factor, "ordered"));
 return dict_type;
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(bool ordered) {
 return dictionary(std::make_shared<Type>(), arrow::utf8(), ordered);
}

std::shared_ptr<arrow::DataType> GetFactorType(SEXP factor) {
 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 bool is_ordered = Rf_inherits(factor, "ordered");
 int n = Rf_length(levels);
 if (n < 128) {
 return GetFactorTypeImpl<arrow::Int8Type>(factor);
 return GetFactorTypeImpl<arrow::Int8Type>(is_ordered);
 } else if (n < 32768) {
 return GetFactorTypeImpl<arrow::Int16Type>(factor);
 return GetFactorTypeImpl<arrow::Int16Type>(is_ordered);
 } else {
 return GetFactorTypeImpl<arrow::Int32Type>(factor);
 return GetFactorTypeImpl<arrow::Int32Type>(is_ordered);
 }
}

Expand DownExpand Up@@ -909,21 +910,7 @@ bool CheckCompatibleFactor(SEXP obj, const std::shared_ptr<arrow::DataType>& typ

 arrow::DictionaryType* dict_type =
 arrow::checked_cast<arrow::DictionaryType*>(type.get());
 auto dictionary = dict_type->dictionary();
 if (dictionary->type() != utf8()) return false;

 // then compare levels
 auto typed_dict = checked_cast<arrow::StringArray*>(dictionary.get());
 SEXP levels = Rf_getAttrib(obj, R_LevelsSymbol);

 R_xlen_t n = XLENGTH(levels);
 if (n != typed_dict->length()) return false;

 for (R_xlen_t i = 0; i < n; i++) {
 if (typed_dict->GetString(i) != CHAR(STRING_ELT(levels, i))) return false;
 }

 return true;
 return dict_type->value_type() == utf8();
}

std::shared_ptr<arrow::Array> Array__from_vector(
Expand Down

16 changes: 8 additions & 8 deletions
r/src/datatype.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ arrow::TimeUnit::type TimestampType__unit(

// [[Rcpp::export]]
std::shared_ptr<arrow::DataType> DictionaryType__initialize(
 const std::shared_ptr<arrow::DataType>& type,
 const std::shared_ptr<arrow::Array>& array, bool ordered) {
 return arrow::dictionary(type, array, ordered);
 const std::shared_ptr<arrow::DataType>& index_type,
 const std::shared_ptr<arrow::DataType>& value_type, bool ordered) {
 return arrow::dictionary(index_type, value_type, ordered);
}

// [[Rcpp::export]]
Expand All@@ -262,14 +262,14 @@ std::shared_ptr<arrow::DataType> DictionaryType__index_type(
}

// [[Rcpp::export]]
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
std::shared_ptr<arrow::DataType> DictionaryType__value_type(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->value_type();
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Array> DictionaryType__dictionary(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->dictionary();
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
}

// [[Rcpp::export]]
Expand Down

9 changes: 7 additions & 2 deletions
r/src/message.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,15 +56,20 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__Message__Schema(
 const std::unique_ptr<arrow::ipc::Message>& message,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &batch));

 // TODO: perhaps this should come from the R side
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &memo, &batch));
 return batch;
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Schema> ipc___ReadSchema_InputStream(
 const std::shared_ptr<arrow::io::InputStream>& stream) {
 std::shared_ptr<arrow::Schema> schema;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &schema));
 // TODO: promote to function argument
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &memo, &schema));
 return schema;
}

Expand Down

4 changes: 3 additions & 1 deletion
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,6 +140,8 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__InputStream__Schema(
 const std::shared_ptr<arrow::io::InputStream>& stream,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, stream.get(), &batch));
 // TODO: promote to function arg
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, &memo, stream.get(), &batch));
 return batch;
}

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-DataType.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,13 +314,13 @@ test_that("struct type works as expected", {
})

test_that("DictionaryType works as expected (ARROW-3355)", {
 d <- dictionary(int32(), array(c("foo", "bar", "baz")))
 d <- dictionary(int32(), utf8())
 expect_equal(d, d)
 expect_true(d == d)
 expect_false(d == int32())
 expect_equal(d$id, Type$DICTIONARY)
 expect_equal(d$bit_width, 32L)
 expect_equal(d$ToString(), "dictionary<values=string, indices=int32, ordered=0>")
 expect_equal(d$index_type, int32())
 expect_equal(d$dictionary, array(c("foo", "bar", "baz")))
 expect_equal(d$value_type, utf8())
})

, '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-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144#4413

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

romainfrancois
wants to merge
3
commits into

from

 Closed


ARROW-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144
#4413
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fa0440f

update R to changes from ARROW-3144 #4316


romainfrancois May 29, 2019
2556c16

document()


romainfrancois May 31, 2019
b0de1a8

R should pass now


romainfrancois May 31, 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


2 changes: 0 additions & 2 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,6 @@ before_install:
 - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -s; fi

matrix:
 allow_failures:
 - language: r
 fast_finish: true
 include:
 - name: "Lint, Release tests"
Expand Down

12 changes: 6 additions & 6 deletions
r/R/RcppExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 8 additions & 8 deletions
r/R/dictionary.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,25 +34,25 @@

 active = list(
 index_type = function() `arrow::DataType`$dispatch(DictionaryType__index_type(self)),
dictionary = function() shared_ptr(`arrow::Array`, DictionaryType__dictionary(self)),
value_type = function() `arrow::DataType`$dispatch(DictionaryType__value_type(self)),
 name = function() DictionaryType__name(self),
 ordered = function() DictionaryType__ordered(self)
 )
)

#' dictionary type factory
#'
#' @param type indices type, e.g. [int32()]
#' @param values values array, typically an arrow array of strings
#' @param ordered Is this an ordered dictionary
#' @param index_type index type, e.g. [int32()]
#' @param value_type value type, probably [utf8()]
#' @param ordered Is this an ordered dictionary ?
#'
#' @return a [arrow::DictionaryType][arrow__DictionaryType]
#'
#' @export
dictionary <- function(type, values, ordered = FALSE) {
dictionary <- function(index_type, value_type, ordered = FALSE) {
 assert_that(
 inherits(type, "arrow::DataType"),
 inherits(values, "arrow::Array")
 inherits(index_type, "arrow::DataType"),
 inherits(index_type, "arrow::DataType")
 )
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(type, values, ordered))
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(index_type, value_type, ordered))
}

8 changes: 4 additions & 4 deletions
r/man/dictionary.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
r/src/RcppExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


35 changes: 11 additions & 24 deletions
r/src/array_from_vector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,8 +141,11 @@ std::shared_ptr<Array> MakeFactorArrayImpl(Rcpp::IntegerVector_ factor,
 ArrayData::Make(std::make_shared<Type>(), n, std::move(buffers), null_count, 0);
 auto array_indices = MakeArray(array_indices_data);

 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 auto dict = MakeStringArray(levels);

 std::shared_ptr<Array> out;
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, &out));
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, dict, &out));
 return out;
}

Expand DownExpand Up@@ -741,22 +744,20 @@ Status GetConverter(const std::shared_ptr<DataType>& type,
}

template <typename Type>
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(Rcpp::IntegerVector_ factor) {
 auto dict_values = MakeStringArray(Rf_getAttrib(factor, R_LevelsSymbol));
 auto dict_type =
 dictionary(std::make_shared<Type>(), dict_values, Rf_inherits(factor, "ordered"));
 return dict_type;
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(bool ordered) {
 return dictionary(std::make_shared<Type>(), arrow::utf8(), ordered);
}

std::shared_ptr<arrow::DataType> GetFactorType(SEXP factor) {
 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 bool is_ordered = Rf_inherits(factor, "ordered");
 int n = Rf_length(levels);
 if (n < 128) {
 return GetFactorTypeImpl<arrow::Int8Type>(factor);
 return GetFactorTypeImpl<arrow::Int8Type>(is_ordered);
 } else if (n < 32768) {
 return GetFactorTypeImpl<arrow::Int16Type>(factor);
 return GetFactorTypeImpl<arrow::Int16Type>(is_ordered);
 } else {
 return GetFactorTypeImpl<arrow::Int32Type>(factor);
 return GetFactorTypeImpl<arrow::Int32Type>(is_ordered);
 }
}

Expand DownExpand Up@@ -909,21 +910,7 @@ bool CheckCompatibleFactor(SEXP obj, const std::shared_ptr<arrow::DataType>& typ

 arrow::DictionaryType* dict_type =
 arrow::checked_cast<arrow::DictionaryType*>(type.get());
 auto dictionary = dict_type->dictionary();
 if (dictionary->type() != utf8()) return false;

 // then compare levels
 auto typed_dict = checked_cast<arrow::StringArray*>(dictionary.get());
 SEXP levels = Rf_getAttrib(obj, R_LevelsSymbol);

 R_xlen_t n = XLENGTH(levels);
 if (n != typed_dict->length()) return false;

 for (R_xlen_t i = 0; i < n; i++) {
 if (typed_dict->GetString(i) != CHAR(STRING_ELT(levels, i))) return false;
 }

 return true;
 return dict_type->value_type() == utf8();
}

std::shared_ptr<arrow::Array> Array__from_vector(
Expand Down

16 changes: 8 additions & 8 deletions
r/src/datatype.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ arrow::TimeUnit::type TimestampType__unit(

// [[Rcpp::export]]
std::shared_ptr<arrow::DataType> DictionaryType__initialize(
 const std::shared_ptr<arrow::DataType>& type,
 const std::shared_ptr<arrow::Array>& array, bool ordered) {
 return arrow::dictionary(type, array, ordered);
 const std::shared_ptr<arrow::DataType>& index_type,
 const std::shared_ptr<arrow::DataType>& value_type, bool ordered) {
 return arrow::dictionary(index_type, value_type, ordered);
}

// [[Rcpp::export]]
Expand All@@ -262,14 +262,14 @@ std::shared_ptr<arrow::DataType> DictionaryType__index_type(
}

// [[Rcpp::export]]
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
std::shared_ptr<arrow::DataType> DictionaryType__value_type(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->value_type();
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Array> DictionaryType__dictionary(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->dictionary();
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
}

// [[Rcpp::export]]
Expand Down

9 changes: 7 additions & 2 deletions
r/src/message.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,15 +56,20 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__Message__Schema(
 const std::unique_ptr<arrow::ipc::Message>& message,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &batch));

 // TODO: perhaps this should come from the R side
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &memo, &batch));
 return batch;
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Schema> ipc___ReadSchema_InputStream(
 const std::shared_ptr<arrow::io::InputStream>& stream) {
 std::shared_ptr<arrow::Schema> schema;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &schema));
 // TODO: promote to function argument
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &memo, &schema));
 return schema;
}

Expand Down

4 changes: 3 additions & 1 deletion
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,6 +140,8 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__InputStream__Schema(
 const std::shared_ptr<arrow::io::InputStream>& stream,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, stream.get(), &batch));
 // TODO: promote to function arg
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, &memo, stream.get(), &batch));
 return batch;
}

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-DataType.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,13 +314,13 @@ test_that("struct type works as expected", {
})

test_that("DictionaryType works as expected (ARROW-3355)", {
 d <- dictionary(int32(), array(c("foo", "bar", "baz")))
 d <- dictionary(int32(), utf8())
 expect_equal(d, d)
 expect_true(d == d)
 expect_false(d == int32())
 expect_equal(d$id, Type$DICTIONARY)
 expect_equal(d$bit_width, 32L)
 expect_equal(d$ToString(), "dictionary<values=string, indices=int32, ordered=0>")
 expect_equal(d$index_type, int32())
 expect_equal(d$dictionary, array(c("foo", "bar", "baz")))
 expect_equal(d$value_type, utf8())
})

, '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-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144#4413

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

romainfrancois
wants to merge
3
commits into

from

 Closed


ARROW-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144
#4413
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fa0440f

update R to changes from ARROW-3144 #4316


romainfrancois May 29, 2019
2556c16

document()


romainfrancois May 31, 2019
b0de1a8

R should pass now


romainfrancois May 31, 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


2 changes: 0 additions & 2 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,6 @@ before_install:
 - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -s; fi

matrix:
 allow_failures:
 - language: r
 fast_finish: true
 include:
 - name: "Lint, Release tests"
Expand Down

12 changes: 6 additions & 6 deletions
r/R/RcppExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 8 additions & 8 deletions
r/R/dictionary.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,25 +34,25 @@

 active = list(
 index_type = function() `arrow::DataType`$dispatch(DictionaryType__index_type(self)),
dictionary = function() shared_ptr(`arrow::Array`, DictionaryType__dictionary(self)),
value_type = function() `arrow::DataType`$dispatch(DictionaryType__value_type(self)),
 name = function() DictionaryType__name(self),
 ordered = function() DictionaryType__ordered(self)
 )
)

#' dictionary type factory
#'
#' @param type indices type, e.g. [int32()]
#' @param values values array, typically an arrow array of strings
#' @param ordered Is this an ordered dictionary
#' @param index_type index type, e.g. [int32()]
#' @param value_type value type, probably [utf8()]
#' @param ordered Is this an ordered dictionary ?
#'
#' @return a [arrow::DictionaryType][arrow__DictionaryType]
#'
#' @export
dictionary <- function(type, values, ordered = FALSE) {
dictionary <- function(index_type, value_type, ordered = FALSE) {
 assert_that(
 inherits(type, "arrow::DataType"),
 inherits(values, "arrow::Array")
 inherits(index_type, "arrow::DataType"),
 inherits(index_type, "arrow::DataType")
 )
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(type, values, ordered))
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(index_type, value_type, ordered))
}

8 changes: 4 additions & 4 deletions
r/man/dictionary.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
r/src/RcppExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


35 changes: 11 additions & 24 deletions
r/src/array_from_vector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,8 +141,11 @@ std::shared_ptr<Array> MakeFactorArrayImpl(Rcpp::IntegerVector_ factor,
 ArrayData::Make(std::make_shared<Type>(), n, std::move(buffers), null_count, 0);
 auto array_indices = MakeArray(array_indices_data);

 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 auto dict = MakeStringArray(levels);

 std::shared_ptr<Array> out;
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, &out));
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, dict, &out));
 return out;
}

Expand DownExpand Up@@ -741,22 +744,20 @@ Status GetConverter(const std::shared_ptr<DataType>& type,
}

template <typename Type>
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(Rcpp::IntegerVector_ factor) {
 auto dict_values = MakeStringArray(Rf_getAttrib(factor, R_LevelsSymbol));
 auto dict_type =
 dictionary(std::make_shared<Type>(), dict_values, Rf_inherits(factor, "ordered"));
 return dict_type;
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(bool ordered) {
 return dictionary(std::make_shared<Type>(), arrow::utf8(), ordered);
}

std::shared_ptr<arrow::DataType> GetFactorType(SEXP factor) {
 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 bool is_ordered = Rf_inherits(factor, "ordered");
 int n = Rf_length(levels);
 if (n < 128) {
 return GetFactorTypeImpl<arrow::Int8Type>(factor);
 return GetFactorTypeImpl<arrow::Int8Type>(is_ordered);
 } else if (n < 32768) {
 return GetFactorTypeImpl<arrow::Int16Type>(factor);
 return GetFactorTypeImpl<arrow::Int16Type>(is_ordered);
 } else {
 return GetFactorTypeImpl<arrow::Int32Type>(factor);
 return GetFactorTypeImpl<arrow::Int32Type>(is_ordered);
 }
}

Expand DownExpand Up@@ -909,21 +910,7 @@ bool CheckCompatibleFactor(SEXP obj, const std::shared_ptr<arrow::DataType>& typ

 arrow::DictionaryType* dict_type =
 arrow::checked_cast<arrow::DictionaryType*>(type.get());
 auto dictionary = dict_type->dictionary();
 if (dictionary->type() != utf8()) return false;

 // then compare levels
 auto typed_dict = checked_cast<arrow::StringArray*>(dictionary.get());
 SEXP levels = Rf_getAttrib(obj, R_LevelsSymbol);

 R_xlen_t n = XLENGTH(levels);
 if (n != typed_dict->length()) return false;

 for (R_xlen_t i = 0; i < n; i++) {
 if (typed_dict->GetString(i) != CHAR(STRING_ELT(levels, i))) return false;
 }

 return true;
 return dict_type->value_type() == utf8();
}

std::shared_ptr<arrow::Array> Array__from_vector(
Expand Down

16 changes: 8 additions & 8 deletions
r/src/datatype.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ arrow::TimeUnit::type TimestampType__unit(

// [[Rcpp::export]]
std::shared_ptr<arrow::DataType> DictionaryType__initialize(
 const std::shared_ptr<arrow::DataType>& type,
 const std::shared_ptr<arrow::Array>& array, bool ordered) {
 return arrow::dictionary(type, array, ordered);
 const std::shared_ptr<arrow::DataType>& index_type,
 const std::shared_ptr<arrow::DataType>& value_type, bool ordered) {
 return arrow::dictionary(index_type, value_type, ordered);
}

// [[Rcpp::export]]
Expand All@@ -262,14 +262,14 @@ std::shared_ptr<arrow::DataType> DictionaryType__index_type(
}

// [[Rcpp::export]]
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
std::shared_ptr<arrow::DataType> DictionaryType__value_type(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->value_type();
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Array> DictionaryType__dictionary(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->dictionary();
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
}

// [[Rcpp::export]]
Expand Down

9 changes: 7 additions & 2 deletions
r/src/message.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,15 +56,20 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__Message__Schema(
 const std::unique_ptr<arrow::ipc::Message>& message,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &batch));

 // TODO: perhaps this should come from the R side
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &memo, &batch));
 return batch;
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Schema> ipc___ReadSchema_InputStream(
 const std::shared_ptr<arrow::io::InputStream>& stream) {
 std::shared_ptr<arrow::Schema> schema;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &schema));
 // TODO: promote to function argument
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &memo, &schema));
 return schema;
}

Expand Down

4 changes: 3 additions & 1 deletion
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,6 +140,8 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__InputStream__Schema(
 const std::shared_ptr<arrow::io::InputStream>& stream,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, stream.get(), &batch));
 // TODO: promote to function arg
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, &memo, stream.get(), &batch));
 return batch;
}

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-DataType.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,13 +314,13 @@ test_that("struct type works as expected", {
})

test_that("DictionaryType works as expected (ARROW-3355)", {
 d <- dictionary(int32(), array(c("foo", "bar", "baz")))
 d <- dictionary(int32(), utf8())
 expect_equal(d, d)
 expect_true(d == d)
 expect_false(d == int32())
 expect_equal(d$id, Type$DICTIONARY)
 expect_equal(d$bit_width, 32L)
 expect_equal(d$ToString(), "dictionary<values=string, indices=int32, ordered=0>")
 expect_equal(d$index_type, int32())
 expect_equal(d$dictionary, array(c("foo", "bar", "baz")))
 expect_equal(d$value_type, utf8())
})

, '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-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144#4413

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

romainfrancois
wants to merge
3
commits into

from

 Closed


ARROW-5361: [R] Follow DictionaryType/DictionaryArray changes from ARROW-3144
#4413
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
fa0440f

update R to changes from ARROW-3144 #4316


romainfrancois May 29, 2019
2556c16

document()


romainfrancois May 31, 2019
b0de1a8

R should pass now


romainfrancois May 31, 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


2 changes: 0 additions & 2 deletions
.travis.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,8 +47,6 @@ before_install:
 - if [ $TRAVIS_OS_NAME == "linux" ]; then ccache -s; fi

matrix:
 allow_failures:
 - language: r
 fast_finish: true
 include:
 - name: "Lint, Release tests"
Expand Down

12 changes: 6 additions & 6 deletions
r/R/RcppExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 8 additions & 8 deletions
r/R/dictionary.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,25 +34,25 @@

 active = list(
 index_type = function() `arrow::DataType`$dispatch(DictionaryType__index_type(self)),
dictionary = function() shared_ptr(`arrow::Array`, DictionaryType__dictionary(self)),
value_type = function() `arrow::DataType`$dispatch(DictionaryType__value_type(self)),
 name = function() DictionaryType__name(self),
 ordered = function() DictionaryType__ordered(self)
 )
)

#' dictionary type factory
#'
#' @param type indices type, e.g. [int32()]
#' @param values values array, typically an arrow array of strings
#' @param ordered Is this an ordered dictionary
#' @param index_type index type, e.g. [int32()]
#' @param value_type value type, probably [utf8()]
#' @param ordered Is this an ordered dictionary ?
#'
#' @return a [arrow::DictionaryType][arrow__DictionaryType]
#'
#' @export
dictionary <- function(type, values, ordered = FALSE) {
dictionary <- function(index_type, value_type, ordered = FALSE) {
 assert_that(
 inherits(type, "arrow::DataType"),
 inherits(values, "arrow::Array")
 inherits(index_type, "arrow::DataType"),
 inherits(index_type, "arrow::DataType")
 )
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(type, values, ordered))
 shared_ptr(`arrow::DictionaryType`, DictionaryType__initialize(index_type, value_type, ordered))
}

8 changes: 4 additions & 4 deletions
r/man/dictionary.Rd

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


28 changes: 14 additions & 14 deletions
r/src/RcppExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


35 changes: 11 additions & 24 deletions
r/src/array_from_vector.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,8 +141,11 @@ std::shared_ptr<Array> MakeFactorArrayImpl(Rcpp::IntegerVector_ factor,
 ArrayData::Make(std::make_shared<Type>(), n, std::move(buffers), null_count, 0);
 auto array_indices = MakeArray(array_indices_data);

 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 auto dict = MakeStringArray(levels);

 std::shared_ptr<Array> out;
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, &out));
 STOP_IF_NOT_OK(DictionaryArray::FromArrays(type, array_indices, dict, &out));
 return out;
}

Expand DownExpand Up@@ -741,22 +744,20 @@ Status GetConverter(const std::shared_ptr<DataType>& type,
}

template <typename Type>
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(Rcpp::IntegerVector_ factor) {
 auto dict_values = MakeStringArray(Rf_getAttrib(factor, R_LevelsSymbol));
 auto dict_type =
 dictionary(std::make_shared<Type>(), dict_values, Rf_inherits(factor, "ordered"));
 return dict_type;
std::shared_ptr<arrow::DataType> GetFactorTypeImpl(bool ordered) {
 return dictionary(std::make_shared<Type>(), arrow::utf8(), ordered);
}

std::shared_ptr<arrow::DataType> GetFactorType(SEXP factor) {
 SEXP levels = Rf_getAttrib(factor, R_LevelsSymbol);
 bool is_ordered = Rf_inherits(factor, "ordered");
 int n = Rf_length(levels);
 if (n < 128) {
 return GetFactorTypeImpl<arrow::Int8Type>(factor);
 return GetFactorTypeImpl<arrow::Int8Type>(is_ordered);
 } else if (n < 32768) {
 return GetFactorTypeImpl<arrow::Int16Type>(factor);
 return GetFactorTypeImpl<arrow::Int16Type>(is_ordered);
 } else {
 return GetFactorTypeImpl<arrow::Int32Type>(factor);
 return GetFactorTypeImpl<arrow::Int32Type>(is_ordered);
 }
}

Expand DownExpand Up@@ -909,21 +910,7 @@ bool CheckCompatibleFactor(SEXP obj, const std::shared_ptr<arrow::DataType>& typ

 arrow::DictionaryType* dict_type =
 arrow::checked_cast<arrow::DictionaryType*>(type.get());
 auto dictionary = dict_type->dictionary();
 if (dictionary->type() != utf8()) return false;

 // then compare levels
 auto typed_dict = checked_cast<arrow::StringArray*>(dictionary.get());
 SEXP levels = Rf_getAttrib(obj, R_LevelsSymbol);

 R_xlen_t n = XLENGTH(levels);
 if (n != typed_dict->length()) return false;

 for (R_xlen_t i = 0; i < n; i++) {
 if (typed_dict->GetString(i) != CHAR(STRING_ELT(levels, i))) return false;
 }

 return true;
 return dict_type->value_type() == utf8();
}

std::shared_ptr<arrow::Array> Array__from_vector(
Expand Down

16 changes: 8 additions & 8 deletions
r/src/datatype.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,9 +250,9 @@ arrow::TimeUnit::type TimestampType__unit(

// [[Rcpp::export]]
std::shared_ptr<arrow::DataType> DictionaryType__initialize(
 const std::shared_ptr<arrow::DataType>& type,
 const std::shared_ptr<arrow::Array>& array, bool ordered) {
 return arrow::dictionary(type, array, ordered);
 const std::shared_ptr<arrow::DataType>& index_type,
 const std::shared_ptr<arrow::DataType>& value_type, bool ordered) {
 return arrow::dictionary(index_type, value_type, ordered);
}

// [[Rcpp::export]]
Expand All@@ -262,14 +262,14 @@ std::shared_ptr<arrow::DataType> DictionaryType__index_type(
}

// [[Rcpp::export]]
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
std::shared_ptr<arrow::DataType> DictionaryType__value_type(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->value_type();
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Array> DictionaryType__dictionary(
 const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->dictionary();
std::string DictionaryType__name(const std::shared_ptr<arrow::DictionaryType>& type) {
 return type->name();
}

// [[Rcpp::export]]
Expand Down

9 changes: 7 additions & 2 deletions
r/src/message.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,15 +56,20 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__Message__Schema(
 const std::unique_ptr<arrow::ipc::Message>& message,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &batch));

 // TODO: perhaps this should come from the R side
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(*message, schema, &memo, &batch));
 return batch;
}

// [[Rcpp::export]]
std::shared_ptr<arrow::Schema> ipc___ReadSchema_InputStream(
 const std::shared_ptr<arrow::io::InputStream>& stream) {
 std::shared_ptr<arrow::Schema> schema;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &schema));
 // TODO: promote to function argument
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadSchema(stream.get(), &memo, &schema));
 return schema;
}

Expand Down

4 changes: 3 additions & 1 deletion
r/src/recordbatch.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,6 +140,8 @@ std::shared_ptr<arrow::RecordBatch> ipc___ReadRecordBatch__InputStream__Schema(
 const std::shared_ptr<arrow::io::InputStream>& stream,
 const std::shared_ptr<arrow::Schema>& schema) {
 std::shared_ptr<arrow::RecordBatch> batch;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, stream.get(), &batch));
 // TODO: promote to function arg
 arrow::ipc::DictionaryMemo memo;
 STOP_IF_NOT_OK(arrow::ipc::ReadRecordBatch(schema, &memo, stream.get(), &batch));
 return batch;
}

4 changes: 2 additions & 2 deletions
r/tests/testthat/test-DataType.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,13 +314,13 @@ test_that("struct type works as expected", {
})

test_that("DictionaryType works as expected (ARROW-3355)", {
 d <- dictionary(int32(), array(c("foo", "bar", "baz")))
 d <- dictionary(int32(), utf8())
 expect_equal(d, d)
 expect_true(d == d)
 expect_false(d == int32())
 expect_equal(d$id, Type$DICTIONARY)
 expect_equal(d$bit_width, 32L)
 expect_equal(d$ToString(), "dictionary<values=string, indices=int32, ordered=0>")
 expect_equal(d$index_type, int32())
 expect_equal(d$dictionary, array(c("foo", "bar", "baz")))
 expect_equal(d$value_type, utf8())
})