ARROW-5775: [C++] Fix thread-unsafe cached data#4791

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
pitrou wants to merge 2 commits into from
Closed

ARROW-5775: [C++] Fix thread-unsafe cached data #4791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fe0b86
ARROW-5775: [C++] Fix thread-unsafe cached data
pitrou Jul 3, 2019
9c2a333
Add "inline"
pitrou Jul 4, 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
1 change: 1 addition & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ endif()
message(STATUS "Arrow version: "
"${ARROW_VERSION_MAJOR}.${ARROW_VERSION_MINOR}.${ARROW_VERSION_PATCH} "
"(full: '${ARROW_VERSION}')")
message(STATUS "Arrow SO version: ${ARROW_SO_VERSION} (full: ${ARROW_FULL_SO_VERSION})")

set(ARROW_SOURCE_DIR ${PROJECT_SOURCE_DIR})
set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
Expand Down
24 changes: 11 additions & 13 deletions cpp/src/arrow/array.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/bit-util.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
Expand DownExpand Up@@ -530,17 +531,19 @@ const StructType* StructArray::struct_type() const {
}

std::shared_ptr<Array> StructArray::field(int i) const {
if (!boxed_fields_[i]) {
std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
if (!result) {
std::shared_ptr<ArrayData> field_data;
if (data_->offset != 0 || data_->child_data[i]->length != data_->length) {
field_data = std::make_shared<ArrayData>(
data_->child_data[i]->Slice(data_->offset, data_->length));
} else {
field_data = data_->child_data[i];
}
boxed_fields_[i] = MakeArray(field_data);
result = MakeArray(field_data);
internal::atomic_store(&boxed_fields_[i], result);
}
return boxed_fields_[i];
return result;
}

std::shared_ptr<Array> StructArray::GetFieldByName(const std::string& name) const {
Expand DownExpand Up@@ -709,7 +712,8 @@ Status UnionArray::MakeSparse(const Array& type_ids,
}

std::shared_ptr<Array> UnionArray::child(int i) const {
if (!boxed_fields_[i]) {
std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
if (!result) {
std::shared_ptr<ArrayData> child_data = data_->child_data[i]->Copy();
if (mode() == UnionMode::SPARSE) {
// Sparse union: need to adjust child if union is sliced
Expand All@@ -719,16 +723,10 @@ std::shared_ptr<Array> UnionArray::child(int i) const {
*child_data = child_data->Slice(data_->offset, data_->length);
}
}
boxed_fields_[i] = MakeArray(child_data);
result = MakeArray(child_data);
internal::atomic_store(&boxed_fields_[i], result);
}
return boxed_fields_[i];
}

const Array* UnionArray::UnsafeChild(int i) const {
if (!boxed_fields_[i]) {
boxed_fields_[i] = MakeArray(data_->child_data[i]);
}
return boxed_fields_[i].get();
return result;
}

// ----------------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions cpp/src/arrow/array.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1042,9 +1042,6 @@ class ARROW_EXPORT UnionArray : public Array {
// For dense unions, the returned array is unchanged.
std::shared_ptr<Array> child(int pos) const;

/// Only use this while the UnionArray is in scope
const Array* UnsafeChild(int pos) const;

protected:
void SetData(const std::shared_ptr<ArrayData>& data);

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/python/deserialize.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ Status DeserializeSequence(PyObject* context, const Array& array, int64_t start_
int64_t offset = value_offsets[i];
uint8_t type = type_ids[i];
PyObject* value;
RETURN_NOT_OK(GetValue(context, *data.UnsafeChild(type), offset,
RETURN_NOT_OK(GetValue(context, *data.child(type), offset,
python_types[type_ids[i]], base, blobs, &value));
RETURN_NOT_OK(set_item(result.obj(), i - start_idx, value));
}
Expand Down
11 changes: 7 additions & 4 deletions cpp/src/arrow/record_batch.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include "arrow/record_batch.h"

#include <algorithm>
#include <atomic>
#include <cstdlib>
#include <memory>
#include <string>
Expand All@@ -27,6 +28,7 @@
#include "arrow/status.h"
#include "arrow/table.h"
#include "arrow/type.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/logging.h"
#include "arrow/util/stl.h"

Expand DownExpand Up@@ -85,11 +87,12 @@ class SimpleRecordBatch : public RecordBatch {
}

std::shared_ptr<Array> column(int i) const override {
if (!boxed_columns_[i]) {
boxed_columns_[i] = MakeArray(columns_[i]);
std::shared_ptr<Array> result = internal::atomic_load(&boxed_columns_[i]);
if (!result) {
result = MakeArray(columns_[i]);
internal::atomic_store(&boxed_columns_[i], result);
}
DCHECK(boxed_columns_[i]);
return boxed_columns_[i];
return result;
}

std::shared_ptr<ArrayData> column_data(int i) const override { return columns_[i]; }
Expand Down
57 changes: 57 additions & 0 deletions cpp/src/arrow/util/atomic_shared_ptr.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#pragma once

#include <atomic>
#include <memory>
#include <utility>

namespace arrow {
namespace internal {

#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5

// atomic shared_ptr operations only appeared in gcc 5,
// emulate them with unsafe ops on gcc 4.x.

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
return *p;
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
*p = r;
}

#else

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
return std::atomic_load(p);
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
std::atomic_store(p, std::move(r));
}

#endif

} // namespace internal
} // namespace arrow
, '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-5775: [C++] Fix thread-unsafe cached data#4791

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

pitrou
wants to merge
2
commits into

from

 Closed


ARROW-5775: [C++] Fix thread-unsafe cached data
#4791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6fe0b86

ARROW-5775: [C++] Fix thread-unsafe cached data


pitrou Jul 3, 2019
9c2a333

Add "inline"


pitrou Jul 4, 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


1 change: 1 addition & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ endif()
message(STATUS "Arrow version: "
 "${ARROW_VERSION_MAJOR}.${ARROW_VERSION_MINOR}.${ARROW_VERSION_PATCH} "
 "(full: '${ARROW_VERSION}')")
message(STATUS "Arrow SO version: ${ARROW_SO_VERSION} (full: ${ARROW_FULL_SO_VERSION})")

set(ARROW_SOURCE_DIR ${PROJECT_SOURCE_DIR})
set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
Expand Down

24 changes: 11 additions & 13 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/bit-util.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
Expand DownExpand Up@@ -530,17 +531,19 @@ const StructType* StructArray::struct_type() const {
}

std::shared_ptr<Array> StructArray::field(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> field_data;
 if (data_->offset != 0 || data_->child_data[i]->length != data_->length) {
 field_data = std::make_shared<ArrayData>(
 data_->child_data[i]->Slice(data_->offset, data_->length));
 } else {
 field_data = data_->child_data[i];
 }
 boxed_fields_[i] = MakeArray(field_data);
 result = MakeArray(field_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
 return result;
}

std::shared_ptr<Array> StructArray::GetFieldByName(const std::string& name) const {
Expand DownExpand Up@@ -709,7 +712,8 @@ Status UnionArray::MakeSparse(const Array& type_ids,
}

std::shared_ptr<Array> UnionArray::child(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> child_data = data_->child_data[i]->Copy();
 if (mode() == UnionMode::SPARSE) {
 // Sparse union: need to adjust child if union is sliced
Expand All@@ -719,16 +723,10 @@ std::shared_ptr<Array> UnionArray::child(int i) const {
 *child_data = child_data->Slice(data_->offset, data_->length);
 }
 }
 boxed_fields_[i] = MakeArray(child_data);
 result = MakeArray(child_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
}

const Array* UnionArray::UnsafeChild(int i) const {
 if (!boxed_fields_[i]) {
 boxed_fields_[i] = MakeArray(data_->child_data[i]);
 }
 return boxed_fields_[i].get();
 return result;
}

// ----------------------------------------------------------------------
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1042,9 +1042,6 @@ class ARROW_EXPORT UnionArray : public Array {
 // For dense unions, the returned array is unchanged.
 std::shared_ptr<Array> child(int pos) const;

 /// Only use this while the UnionArray is in scope
 const Array* UnsafeChild(int pos) const;

 protected:
 void SetData(const std::shared_ptr<ArrayData>& data);

Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/python/deserialize.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ Status DeserializeSequence(PyObject* context, const Array& array, int64_t start_
 int64_t offset = value_offsets[i];
 uint8_t type = type_ids[i];
 PyObject* value;
 RETURN_NOT_OK(GetValue(context, *data.UnsafeChild(type), offset,
 RETURN_NOT_OK(GetValue(context, *data.child(type), offset,
 python_types[type_ids[i]], base, blobs, &value));
 RETURN_NOT_OK(set_item(result.obj(), i - start_idx, value));
 }
Expand Down

11 changes: 7 additions & 4 deletions
cpp/src/arrow/record_batch.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include "arrow/record_batch.h"

#include <algorithm>
#include <atomic>
#include <cstdlib>
#include <memory>
#include <string>
Expand All@@ -27,6 +28,7 @@
#include "arrow/status.h"
#include "arrow/table.h"
#include "arrow/type.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/logging.h"
#include "arrow/util/stl.h"

Expand DownExpand Up@@ -85,11 +87,12 @@ class SimpleRecordBatch : public RecordBatch {
 }

 std::shared_ptr<Array> column(int i) const override {
 if (!boxed_columns_[i]) {
 boxed_columns_[i] = MakeArray(columns_[i]);
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_columns_[i]);
 if (!result) {
 result = MakeArray(columns_[i]);
 internal::atomic_store(&boxed_columns_[i], result);
 }
 DCHECK(boxed_columns_[i]);
 return boxed_columns_[i];
 return result;
 }

 std::shared_ptr<ArrayData> column_data(int i) const override { return columns_[i]; }
Expand Down

57 changes: 57 additions & 0 deletions
cpp/src/arrow/util/atomic_shared_ptr.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#pragma once

#include <atomic>
#include <memory>
#include <utility>

namespace arrow {
namespace internal {

#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5

// atomic shared_ptr operations only appeared in gcc 5,
// emulate them with unsafe ops on gcc 4.x.

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return *p;
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 *p = r;
}

#else

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return std::atomic_load(p);
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 std::atomic_store(p, std::move(r));
}

#endif

} // namespace internal
} // namespace arrow

, '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-5775: [C++] Fix thread-unsafe cached data#4791

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

pitrou
wants to merge
2
commits into

from

 Closed


ARROW-5775: [C++] Fix thread-unsafe cached data
#4791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6fe0b86

ARROW-5775: [C++] Fix thread-unsafe cached data


pitrou Jul 3, 2019
9c2a333

Add "inline"


pitrou Jul 4, 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


1 change: 1 addition & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ endif()
message(STATUS "Arrow version: "
 "${ARROW_VERSION_MAJOR}.${ARROW_VERSION_MINOR}.${ARROW_VERSION_PATCH} "
 "(full: '${ARROW_VERSION}')")
message(STATUS "Arrow SO version: ${ARROW_SO_VERSION} (full: ${ARROW_FULL_SO_VERSION})")

set(ARROW_SOURCE_DIR ${PROJECT_SOURCE_DIR})
set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
Expand Down

24 changes: 11 additions & 13 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/bit-util.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
Expand DownExpand Up@@ -530,17 +531,19 @@ const StructType* StructArray::struct_type() const {
}

std::shared_ptr<Array> StructArray::field(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> field_data;
 if (data_->offset != 0 || data_->child_data[i]->length != data_->length) {
 field_data = std::make_shared<ArrayData>(
 data_->child_data[i]->Slice(data_->offset, data_->length));
 } else {
 field_data = data_->child_data[i];
 }
 boxed_fields_[i] = MakeArray(field_data);
 result = MakeArray(field_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
 return result;
}

std::shared_ptr<Array> StructArray::GetFieldByName(const std::string& name) const {
Expand DownExpand Up@@ -709,7 +712,8 @@ Status UnionArray::MakeSparse(const Array& type_ids,
}

std::shared_ptr<Array> UnionArray::child(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> child_data = data_->child_data[i]->Copy();
 if (mode() == UnionMode::SPARSE) {
 // Sparse union: need to adjust child if union is sliced
Expand All@@ -719,16 +723,10 @@ std::shared_ptr<Array> UnionArray::child(int i) const {
 *child_data = child_data->Slice(data_->offset, data_->length);
 }
 }
 boxed_fields_[i] = MakeArray(child_data);
 result = MakeArray(child_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
}

const Array* UnionArray::UnsafeChild(int i) const {
 if (!boxed_fields_[i]) {
 boxed_fields_[i] = MakeArray(data_->child_data[i]);
 }
 return boxed_fields_[i].get();
 return result;
}

// ----------------------------------------------------------------------
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1042,9 +1042,6 @@ class ARROW_EXPORT UnionArray : public Array {
 // For dense unions, the returned array is unchanged.
 std::shared_ptr<Array> child(int pos) const;

 /// Only use this while the UnionArray is in scope
 const Array* UnsafeChild(int pos) const;

 protected:
 void SetData(const std::shared_ptr<ArrayData>& data);

Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/python/deserialize.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ Status DeserializeSequence(PyObject* context, const Array& array, int64_t start_
 int64_t offset = value_offsets[i];
 uint8_t type = type_ids[i];
 PyObject* value;
 RETURN_NOT_OK(GetValue(context, *data.UnsafeChild(type), offset,
 RETURN_NOT_OK(GetValue(context, *data.child(type), offset,
 python_types[type_ids[i]], base, blobs, &value));
 RETURN_NOT_OK(set_item(result.obj(), i - start_idx, value));
 }
Expand Down

11 changes: 7 additions & 4 deletions
cpp/src/arrow/record_batch.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include "arrow/record_batch.h"

#include <algorithm>
#include <atomic>
#include <cstdlib>
#include <memory>
#include <string>
Expand All@@ -27,6 +28,7 @@
#include "arrow/status.h"
#include "arrow/table.h"
#include "arrow/type.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/logging.h"
#include "arrow/util/stl.h"

Expand DownExpand Up@@ -85,11 +87,12 @@ class SimpleRecordBatch : public RecordBatch {
 }

 std::shared_ptr<Array> column(int i) const override {
 if (!boxed_columns_[i]) {
 boxed_columns_[i] = MakeArray(columns_[i]);
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_columns_[i]);
 if (!result) {
 result = MakeArray(columns_[i]);
 internal::atomic_store(&boxed_columns_[i], result);
 }
 DCHECK(boxed_columns_[i]);
 return boxed_columns_[i];
 return result;
 }

 std::shared_ptr<ArrayData> column_data(int i) const override { return columns_[i]; }
Expand Down

57 changes: 57 additions & 0 deletions
cpp/src/arrow/util/atomic_shared_ptr.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#pragma once

#include <atomic>
#include <memory>
#include <utility>

namespace arrow {
namespace internal {

#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5

// atomic shared_ptr operations only appeared in gcc 5,
// emulate them with unsafe ops on gcc 4.x.

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return *p;
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 *p = r;
}

#else

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return std::atomic_load(p);
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 std::atomic_store(p, std::move(r));
}

#endif

} // namespace internal
} // namespace arrow

, '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-5775: [C++] Fix thread-unsafe cached data#4791

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

pitrou
wants to merge
2
commits into

from

 Closed


ARROW-5775: [C++] Fix thread-unsafe cached data
#4791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6fe0b86

ARROW-5775: [C++] Fix thread-unsafe cached data


pitrou Jul 3, 2019
9c2a333

Add "inline"


pitrou Jul 4, 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


1 change: 1 addition & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ endif()
message(STATUS "Arrow version: "
 "${ARROW_VERSION_MAJOR}.${ARROW_VERSION_MINOR}.${ARROW_VERSION_PATCH} "
 "(full: '${ARROW_VERSION}')")
message(STATUS "Arrow SO version: ${ARROW_SO_VERSION} (full: ${ARROW_FULL_SO_VERSION})")

set(ARROW_SOURCE_DIR ${PROJECT_SOURCE_DIR})
set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
Expand Down

24 changes: 11 additions & 13 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/bit-util.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
Expand DownExpand Up@@ -530,17 +531,19 @@ const StructType* StructArray::struct_type() const {
}

std::shared_ptr<Array> StructArray::field(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> field_data;
 if (data_->offset != 0 || data_->child_data[i]->length != data_->length) {
 field_data = std::make_shared<ArrayData>(
 data_->child_data[i]->Slice(data_->offset, data_->length));
 } else {
 field_data = data_->child_data[i];
 }
 boxed_fields_[i] = MakeArray(field_data);
 result = MakeArray(field_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
 return result;
}

std::shared_ptr<Array> StructArray::GetFieldByName(const std::string& name) const {
Expand DownExpand Up@@ -709,7 +712,8 @@ Status UnionArray::MakeSparse(const Array& type_ids,
}

std::shared_ptr<Array> UnionArray::child(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> child_data = data_->child_data[i]->Copy();
 if (mode() == UnionMode::SPARSE) {
 // Sparse union: need to adjust child if union is sliced
Expand All@@ -719,16 +723,10 @@ std::shared_ptr<Array> UnionArray::child(int i) const {
 *child_data = child_data->Slice(data_->offset, data_->length);
 }
 }
 boxed_fields_[i] = MakeArray(child_data);
 result = MakeArray(child_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
}

const Array* UnionArray::UnsafeChild(int i) const {
 if (!boxed_fields_[i]) {
 boxed_fields_[i] = MakeArray(data_->child_data[i]);
 }
 return boxed_fields_[i].get();
 return result;
}

// ----------------------------------------------------------------------
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1042,9 +1042,6 @@ class ARROW_EXPORT UnionArray : public Array {
 // For dense unions, the returned array is unchanged.
 std::shared_ptr<Array> child(int pos) const;

 /// Only use this while the UnionArray is in scope
 const Array* UnsafeChild(int pos) const;

 protected:
 void SetData(const std::shared_ptr<ArrayData>& data);

Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/python/deserialize.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ Status DeserializeSequence(PyObject* context, const Array& array, int64_t start_
 int64_t offset = value_offsets[i];
 uint8_t type = type_ids[i];
 PyObject* value;
 RETURN_NOT_OK(GetValue(context, *data.UnsafeChild(type), offset,
 RETURN_NOT_OK(GetValue(context, *data.child(type), offset,
 python_types[type_ids[i]], base, blobs, &value));
 RETURN_NOT_OK(set_item(result.obj(), i - start_idx, value));
 }
Expand Down

11 changes: 7 additions & 4 deletions
cpp/src/arrow/record_batch.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include "arrow/record_batch.h"

#include <algorithm>
#include <atomic>
#include <cstdlib>
#include <memory>
#include <string>
Expand All@@ -27,6 +28,7 @@
#include "arrow/status.h"
#include "arrow/table.h"
#include "arrow/type.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/logging.h"
#include "arrow/util/stl.h"

Expand DownExpand Up@@ -85,11 +87,12 @@ class SimpleRecordBatch : public RecordBatch {
 }

 std::shared_ptr<Array> column(int i) const override {
 if (!boxed_columns_[i]) {
 boxed_columns_[i] = MakeArray(columns_[i]);
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_columns_[i]);
 if (!result) {
 result = MakeArray(columns_[i]);
 internal::atomic_store(&boxed_columns_[i], result);
 }
 DCHECK(boxed_columns_[i]);
 return boxed_columns_[i];
 return result;
 }

 std::shared_ptr<ArrayData> column_data(int i) const override { return columns_[i]; }
Expand Down

57 changes: 57 additions & 0 deletions
cpp/src/arrow/util/atomic_shared_ptr.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#pragma once

#include <atomic>
#include <memory>
#include <utility>

namespace arrow {
namespace internal {

#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5

// atomic shared_ptr operations only appeared in gcc 5,
// emulate them with unsafe ops on gcc 4.x.

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return *p;
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 *p = r;
}

#else

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return std::atomic_load(p);
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 std::atomic_store(p, std::move(r));
}

#endif

} // namespace internal
} // namespace arrow

, '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-5775: [C++] Fix thread-unsafe cached data#4791

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

pitrou
wants to merge
2
commits into

from

 Closed


ARROW-5775: [C++] Fix thread-unsafe cached data
#4791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6fe0b86

ARROW-5775: [C++] Fix thread-unsafe cached data


pitrou Jul 3, 2019
9c2a333

Add "inline"


pitrou Jul 4, 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


1 change: 1 addition & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ endif()
message(STATUS "Arrow version: "
 "${ARROW_VERSION_MAJOR}.${ARROW_VERSION_MINOR}.${ARROW_VERSION_PATCH} "
 "(full: '${ARROW_VERSION}')")
message(STATUS "Arrow SO version: ${ARROW_SO_VERSION} (full: ${ARROW_FULL_SO_VERSION})")

set(ARROW_SOURCE_DIR ${PROJECT_SOURCE_DIR})
set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
Expand Down

24 changes: 11 additions & 13 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/bit-util.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
Expand DownExpand Up@@ -530,17 +531,19 @@ const StructType* StructArray::struct_type() const {
}

std::shared_ptr<Array> StructArray::field(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> field_data;
 if (data_->offset != 0 || data_->child_data[i]->length != data_->length) {
 field_data = std::make_shared<ArrayData>(
 data_->child_data[i]->Slice(data_->offset, data_->length));
 } else {
 field_data = data_->child_data[i];
 }
 boxed_fields_[i] = MakeArray(field_data);
 result = MakeArray(field_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
 return result;
}

std::shared_ptr<Array> StructArray::GetFieldByName(const std::string& name) const {
Expand DownExpand Up@@ -709,7 +712,8 @@ Status UnionArray::MakeSparse(const Array& type_ids,
}

std::shared_ptr<Array> UnionArray::child(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> child_data = data_->child_data[i]->Copy();
 if (mode() == UnionMode::SPARSE) {
 // Sparse union: need to adjust child if union is sliced
Expand All@@ -719,16 +723,10 @@ std::shared_ptr<Array> UnionArray::child(int i) const {
 *child_data = child_data->Slice(data_->offset, data_->length);
 }
 }
 boxed_fields_[i] = MakeArray(child_data);
 result = MakeArray(child_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
}

const Array* UnionArray::UnsafeChild(int i) const {
 if (!boxed_fields_[i]) {
 boxed_fields_[i] = MakeArray(data_->child_data[i]);
 }
 return boxed_fields_[i].get();
 return result;
}

// ----------------------------------------------------------------------
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1042,9 +1042,6 @@ class ARROW_EXPORT UnionArray : public Array {
 // For dense unions, the returned array is unchanged.
 std::shared_ptr<Array> child(int pos) const;

 /// Only use this while the UnionArray is in scope
 const Array* UnsafeChild(int pos) const;

 protected:
 void SetData(const std::shared_ptr<ArrayData>& data);

Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/python/deserialize.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ Status DeserializeSequence(PyObject* context, const Array& array, int64_t start_
 int64_t offset = value_offsets[i];
 uint8_t type = type_ids[i];
 PyObject* value;
 RETURN_NOT_OK(GetValue(context, *data.UnsafeChild(type), offset,
 RETURN_NOT_OK(GetValue(context, *data.child(type), offset,
 python_types[type_ids[i]], base, blobs, &value));
 RETURN_NOT_OK(set_item(result.obj(), i - start_idx, value));
 }
Expand Down

11 changes: 7 additions & 4 deletions
cpp/src/arrow/record_batch.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include "arrow/record_batch.h"

#include <algorithm>
#include <atomic>
#include <cstdlib>
#include <memory>
#include <string>
Expand All@@ -27,6 +28,7 @@
#include "arrow/status.h"
#include "arrow/table.h"
#include "arrow/type.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/logging.h"
#include "arrow/util/stl.h"

Expand DownExpand Up@@ -85,11 +87,12 @@ class SimpleRecordBatch : public RecordBatch {
 }

 std::shared_ptr<Array> column(int i) const override {
 if (!boxed_columns_[i]) {
 boxed_columns_[i] = MakeArray(columns_[i]);
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_columns_[i]);
 if (!result) {
 result = MakeArray(columns_[i]);
 internal::atomic_store(&boxed_columns_[i], result);
 }
 DCHECK(boxed_columns_[i]);
 return boxed_columns_[i];
 return result;
 }

 std::shared_ptr<ArrayData> column_data(int i) const override { return columns_[i]; }
Expand Down

57 changes: 57 additions & 0 deletions
cpp/src/arrow/util/atomic_shared_ptr.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#pragma once

#include <atomic>
#include <memory>
#include <utility>

namespace arrow {
namespace internal {

#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5

// atomic shared_ptr operations only appeared in gcc 5,
// emulate them with unsafe ops on gcc 4.x.

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return *p;
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 *p = r;
}

#else

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return std::atomic_load(p);
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 std::atomic_store(p, std::move(r));
}

#endif

} // namespace internal
} // namespace arrow

, '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-5775: [C++] Fix thread-unsafe cached data#4791

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

pitrou
wants to merge
2
commits into

from

 Closed


ARROW-5775: [C++] Fix thread-unsafe cached data
#4791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6fe0b86

ARROW-5775: [C++] Fix thread-unsafe cached data


pitrou Jul 3, 2019
9c2a333

Add "inline"


pitrou Jul 4, 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


1 change: 1 addition & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ endif()
message(STATUS "Arrow version: "
 "${ARROW_VERSION_MAJOR}.${ARROW_VERSION_MINOR}.${ARROW_VERSION_PATCH} "
 "(full: '${ARROW_VERSION}')")
message(STATUS "Arrow SO version: ${ARROW_SO_VERSION} (full: ${ARROW_FULL_SO_VERSION})")

set(ARROW_SOURCE_DIR ${PROJECT_SOURCE_DIR})
set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
Expand Down

24 changes: 11 additions & 13 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/bit-util.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
Expand DownExpand Up@@ -530,17 +531,19 @@ const StructType* StructArray::struct_type() const {
}

std::shared_ptr<Array> StructArray::field(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> field_data;
 if (data_->offset != 0 || data_->child_data[i]->length != data_->length) {
 field_data = std::make_shared<ArrayData>(
 data_->child_data[i]->Slice(data_->offset, data_->length));
 } else {
 field_data = data_->child_data[i];
 }
 boxed_fields_[i] = MakeArray(field_data);
 result = MakeArray(field_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
 return result;
}

std::shared_ptr<Array> StructArray::GetFieldByName(const std::string& name) const {
Expand DownExpand Up@@ -709,7 +712,8 @@ Status UnionArray::MakeSparse(const Array& type_ids,
}

std::shared_ptr<Array> UnionArray::child(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> child_data = data_->child_data[i]->Copy();
 if (mode() == UnionMode::SPARSE) {
 // Sparse union: need to adjust child if union is sliced
Expand All@@ -719,16 +723,10 @@ std::shared_ptr<Array> UnionArray::child(int i) const {
 *child_data = child_data->Slice(data_->offset, data_->length);
 }
 }
 boxed_fields_[i] = MakeArray(child_data);
 result = MakeArray(child_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
}

const Array* UnionArray::UnsafeChild(int i) const {
 if (!boxed_fields_[i]) {
 boxed_fields_[i] = MakeArray(data_->child_data[i]);
 }
 return boxed_fields_[i].get();
 return result;
}

// ----------------------------------------------------------------------
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1042,9 +1042,6 @@ class ARROW_EXPORT UnionArray : public Array {
 // For dense unions, the returned array is unchanged.
 std::shared_ptr<Array> child(int pos) const;

 /// Only use this while the UnionArray is in scope
 const Array* UnsafeChild(int pos) const;

 protected:
 void SetData(const std::shared_ptr<ArrayData>& data);

Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/python/deserialize.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ Status DeserializeSequence(PyObject* context, const Array& array, int64_t start_
 int64_t offset = value_offsets[i];
 uint8_t type = type_ids[i];
 PyObject* value;
 RETURN_NOT_OK(GetValue(context, *data.UnsafeChild(type), offset,
 RETURN_NOT_OK(GetValue(context, *data.child(type), offset,
 python_types[type_ids[i]], base, blobs, &value));
 RETURN_NOT_OK(set_item(result.obj(), i - start_idx, value));
 }
Expand Down

11 changes: 7 additions & 4 deletions
cpp/src/arrow/record_batch.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include "arrow/record_batch.h"

#include <algorithm>
#include <atomic>
#include <cstdlib>
#include <memory>
#include <string>
Expand All@@ -27,6 +28,7 @@
#include "arrow/status.h"
#include "arrow/table.h"
#include "arrow/type.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/logging.h"
#include "arrow/util/stl.h"

Expand DownExpand Up@@ -85,11 +87,12 @@ class SimpleRecordBatch : public RecordBatch {
 }

 std::shared_ptr<Array> column(int i) const override {
 if (!boxed_columns_[i]) {
 boxed_columns_[i] = MakeArray(columns_[i]);
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_columns_[i]);
 if (!result) {
 result = MakeArray(columns_[i]);
 internal::atomic_store(&boxed_columns_[i], result);
 }
 DCHECK(boxed_columns_[i]);
 return boxed_columns_[i];
 return result;
 }

 std::shared_ptr<ArrayData> column_data(int i) const override { return columns_[i]; }
Expand Down

57 changes: 57 additions & 0 deletions
cpp/src/arrow/util/atomic_shared_ptr.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#pragma once

#include <atomic>
#include <memory>
#include <utility>

namespace arrow {
namespace internal {

#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5

// atomic shared_ptr operations only appeared in gcc 5,
// emulate them with unsafe ops on gcc 4.x.

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return *p;
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 *p = r;
}

#else

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return std::atomic_load(p);
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 std::atomic_store(p, std::move(r));
}

#endif

} // namespace internal
} // namespace arrow

, '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-5775: [C++] Fix thread-unsafe cached data#4791

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

pitrou
wants to merge
2
commits into

from

 Closed


ARROW-5775: [C++] Fix thread-unsafe cached data
#4791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6fe0b86

ARROW-5775: [C++] Fix thread-unsafe cached data


pitrou Jul 3, 2019
9c2a333

Add "inline"


pitrou Jul 4, 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


1 change: 1 addition & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ endif()
message(STATUS "Arrow version: "
 "${ARROW_VERSION_MAJOR}.${ARROW_VERSION_MINOR}.${ARROW_VERSION_PATCH} "
 "(full: '${ARROW_VERSION}')")
message(STATUS "Arrow SO version: ${ARROW_SO_VERSION} (full: ${ARROW_FULL_SO_VERSION})")

set(ARROW_SOURCE_DIR ${PROJECT_SOURCE_DIR})
set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
Expand Down

24 changes: 11 additions & 13 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/bit-util.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
Expand DownExpand Up@@ -530,17 +531,19 @@ const StructType* StructArray::struct_type() const {
}

std::shared_ptr<Array> StructArray::field(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> field_data;
 if (data_->offset != 0 || data_->child_data[i]->length != data_->length) {
 field_data = std::make_shared<ArrayData>(
 data_->child_data[i]->Slice(data_->offset, data_->length));
 } else {
 field_data = data_->child_data[i];
 }
 boxed_fields_[i] = MakeArray(field_data);
 result = MakeArray(field_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
 return result;
}

std::shared_ptr<Array> StructArray::GetFieldByName(const std::string& name) const {
Expand DownExpand Up@@ -709,7 +712,8 @@ Status UnionArray::MakeSparse(const Array& type_ids,
}

std::shared_ptr<Array> UnionArray::child(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> child_data = data_->child_data[i]->Copy();
 if (mode() == UnionMode::SPARSE) {
 // Sparse union: need to adjust child if union is sliced
Expand All@@ -719,16 +723,10 @@ std::shared_ptr<Array> UnionArray::child(int i) const {
 *child_data = child_data->Slice(data_->offset, data_->length);
 }
 }
 boxed_fields_[i] = MakeArray(child_data);
 result = MakeArray(child_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
}

const Array* UnionArray::UnsafeChild(int i) const {
 if (!boxed_fields_[i]) {
 boxed_fields_[i] = MakeArray(data_->child_data[i]);
 }
 return boxed_fields_[i].get();
 return result;
}

// ----------------------------------------------------------------------
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1042,9 +1042,6 @@ class ARROW_EXPORT UnionArray : public Array {
 // For dense unions, the returned array is unchanged.
 std::shared_ptr<Array> child(int pos) const;

 /// Only use this while the UnionArray is in scope
 const Array* UnsafeChild(int pos) const;

 protected:
 void SetData(const std::shared_ptr<ArrayData>& data);

Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/python/deserialize.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ Status DeserializeSequence(PyObject* context, const Array& array, int64_t start_
 int64_t offset = value_offsets[i];
 uint8_t type = type_ids[i];
 PyObject* value;
 RETURN_NOT_OK(GetValue(context, *data.UnsafeChild(type), offset,
 RETURN_NOT_OK(GetValue(context, *data.child(type), offset,
 python_types[type_ids[i]], base, blobs, &value));
 RETURN_NOT_OK(set_item(result.obj(), i - start_idx, value));
 }
Expand Down

11 changes: 7 additions & 4 deletions
cpp/src/arrow/record_batch.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include "arrow/record_batch.h"

#include <algorithm>
#include <atomic>
#include <cstdlib>
#include <memory>
#include <string>
Expand All@@ -27,6 +28,7 @@
#include "arrow/status.h"
#include "arrow/table.h"
#include "arrow/type.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/logging.h"
#include "arrow/util/stl.h"

Expand DownExpand Up@@ -85,11 +87,12 @@ class SimpleRecordBatch : public RecordBatch {
 }

 std::shared_ptr<Array> column(int i) const override {
 if (!boxed_columns_[i]) {
 boxed_columns_[i] = MakeArray(columns_[i]);
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_columns_[i]);
 if (!result) {
 result = MakeArray(columns_[i]);
 internal::atomic_store(&boxed_columns_[i], result);
 }
 DCHECK(boxed_columns_[i]);
 return boxed_columns_[i];
 return result;
 }

 std::shared_ptr<ArrayData> column_data(int i) const override { return columns_[i]; }
Expand Down

57 changes: 57 additions & 0 deletions
cpp/src/arrow/util/atomic_shared_ptr.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#pragma once

#include <atomic>
#include <memory>
#include <utility>

namespace arrow {
namespace internal {

#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5

// atomic shared_ptr operations only appeared in gcc 5,
// emulate them with unsafe ops on gcc 4.x.

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return *p;
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 *p = r;
}

#else

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return std::atomic_load(p);
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 std::atomic_store(p, std::move(r));
}

#endif

} // namespace internal
} // namespace arrow

, '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-5775: [C++] Fix thread-unsafe cached data#4791

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

pitrou
wants to merge
2
commits into

from

 Closed


ARROW-5775: [C++] Fix thread-unsafe cached data
#4791
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
6fe0b86

ARROW-5775: [C++] Fix thread-unsafe cached data


pitrou Jul 3, 2019
9c2a333

Add "inline"


pitrou Jul 4, 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


1 change: 1 addition & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ endif()
message(STATUS "Arrow version: "
 "${ARROW_VERSION_MAJOR}.${ARROW_VERSION_MINOR}.${ARROW_VERSION_PATCH} "
 "(full: '${ARROW_VERSION}')")
message(STATUS "Arrow SO version: ${ARROW_SO_VERSION} (full: ${ARROW_FULL_SO_VERSION})")

set(ARROW_SOURCE_DIR ${PROJECT_SOURCE_DIR})
set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
Expand Down

24 changes: 11 additions & 13 deletions
cpp/src/arrow/array.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@
#include "arrow/status.h"
#include "arrow/type.h"
#include "arrow/type_traits.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/bit-util.h"
#include "arrow/util/checked_cast.h"
#include "arrow/util/decimal.h"
Expand DownExpand Up@@ -530,17 +531,19 @@ const StructType* StructArray::struct_type() const {
}

std::shared_ptr<Array> StructArray::field(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> field_data;
 if (data_->offset != 0 || data_->child_data[i]->length != data_->length) {
 field_data = std::make_shared<ArrayData>(
 data_->child_data[i]->Slice(data_->offset, data_->length));
 } else {
 field_data = data_->child_data[i];
 }
 boxed_fields_[i] = MakeArray(field_data);
 result = MakeArray(field_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
 return result;
}

std::shared_ptr<Array> StructArray::GetFieldByName(const std::string& name) const {
Expand DownExpand Up@@ -709,7 +712,8 @@ Status UnionArray::MakeSparse(const Array& type_ids,
}

std::shared_ptr<Array> UnionArray::child(int i) const {
 if (!boxed_fields_[i]) {
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_fields_[i]);
 if (!result) {
 std::shared_ptr<ArrayData> child_data = data_->child_data[i]->Copy();
 if (mode() == UnionMode::SPARSE) {
 // Sparse union: need to adjust child if union is sliced
Expand All@@ -719,16 +723,10 @@ std::shared_ptr<Array> UnionArray::child(int i) const {
 *child_data = child_data->Slice(data_->offset, data_->length);
 }
 }
 boxed_fields_[i] = MakeArray(child_data);
 result = MakeArray(child_data);
 internal::atomic_store(&boxed_fields_[i], result);
 }
 return boxed_fields_[i];
}

const Array* UnionArray::UnsafeChild(int i) const {
 if (!boxed_fields_[i]) {
 boxed_fields_[i] = MakeArray(data_->child_data[i]);
 }
 return boxed_fields_[i].get();
 return result;
}

// ----------------------------------------------------------------------
Expand Down

3 changes: 0 additions & 3 deletions
cpp/src/arrow/array.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1042,9 +1042,6 @@ class ARROW_EXPORT UnionArray : public Array {
 // For dense unions, the returned array is unchanged.
 std::shared_ptr<Array> child(int pos) const;

 /// Only use this while the UnionArray is in scope
 const Array* UnsafeChild(int pos) const;

 protected:
 void SetData(const std::shared_ptr<ArrayData>& data);

Expand Down

2 changes: 1 addition & 1 deletion
cpp/src/arrow/python/deserialize.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ Status DeserializeSequence(PyObject* context, const Array& array, int64_t start_
 int64_t offset = value_offsets[i];
 uint8_t type = type_ids[i];
 PyObject* value;
 RETURN_NOT_OK(GetValue(context, *data.UnsafeChild(type), offset,
 RETURN_NOT_OK(GetValue(context, *data.child(type), offset,
 python_types[type_ids[i]], base, blobs, &value));
 RETURN_NOT_OK(set_item(result.obj(), i - start_idx, value));
 }
Expand Down

11 changes: 7 additions & 4 deletions
cpp/src/arrow/record_batch.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include "arrow/record_batch.h"

#include <algorithm>
#include <atomic>
#include <cstdlib>
#include <memory>
#include <string>
Expand All@@ -27,6 +28,7 @@
#include "arrow/status.h"
#include "arrow/table.h"
#include "arrow/type.h"
#include "arrow/util/atomic_shared_ptr.h"
#include "arrow/util/logging.h"
#include "arrow/util/stl.h"

Expand DownExpand Up@@ -85,11 +87,12 @@ class SimpleRecordBatch : public RecordBatch {
 }

 std::shared_ptr<Array> column(int i) const override {
 if (!boxed_columns_[i]) {
 boxed_columns_[i] = MakeArray(columns_[i]);
 std::shared_ptr<Array> result = internal::atomic_load(&boxed_columns_[i]);
 if (!result) {
 result = MakeArray(columns_[i]);
 internal::atomic_store(&boxed_columns_[i], result);
 }
 DCHECK(boxed_columns_[i]);
 return boxed_columns_[i];
 return result;
 }

 std::shared_ptr<ArrayData> column_data(int i) const override { return columns_[i]; }
Expand Down

57 changes: 57 additions & 0 deletions
cpp/src/arrow/util/atomic_shared_ptr.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

#pragma once

#include <atomic>
#include <memory>
#include <utility>

namespace arrow {
namespace internal {

#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5

// atomic shared_ptr operations only appeared in gcc 5,
// emulate them with unsafe ops on gcc 4.x.

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return *p;
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 *p = r;
}

#else

template <class T>
inline std::shared_ptr<T> atomic_load(const std::shared_ptr<T>* p) {
 return std::atomic_load(p);
}

template <class T>
inline void atomic_store(std::shared_ptr<T>* p, std::shared_ptr<T> r) {
 std::atomic_store(p, std::move(r));
}

#endif

} // namespace internal
} // namespace arrow