Skip to content

ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins#13036

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

ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins #13036

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
bbb49f2
ARROW-16419: [Python] Properly wait for ExecPlan to finish
lidavidm Apr 29, 2022
48f7ee0
Switch from non-owning SourceNode to non-owning TableSourceNode. Pas…
westonpace Apr 30, 2022
85a736b
ARROW-16417: python lint
westonpace Apr 30, 2022
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
21 changes: 11 additions & 10 deletions cpp/src/arrow/compute/exec/hash_join_node.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -634,16 +634,17 @@ class HashJoinNode : public ExecNode {
Status ScheduleTaskCallback(std::function<Status(size_t)> func) {
auto executor = plan_->exec_context()->executor();
if (executor) {
ARROW_ASSIGN_OR_RAISE(auto task_fut, executor->Submit([this, func] {
size_t thread_index = thread_indexer_();
Status status = func(thread_index);
if (!status.ok()) {
StopProducing();
ErrorIfNotOk(status);
return;
}
}));
return task_group_.AddTask(task_fut);
return task_group_.AddTask([this, executor, func] {
return DeferNotOk(executor->Submit([this, func] {
size_t thread_index = thread_indexer_();
Status status = func(thread_index);
if (!status.ok()) {
StopProducing();
ErrorIfNotOk(status);
return;
}
}));
});
} else {
// We should not get here in serial execution mode
ARROW_DCHECK(false);
Expand Down
29 changes: 16 additions & 13 deletions python/pyarrow/_exec_plan.pyx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ from cython.operator cimport dereference as deref, preincrement as inc
from pyarrow.includes.common cimport *
from pyarrow.includes.libarrow cimport *
from pyarrow.includes.libarrow_dataset cimport *
from pyarrow.lib cimport (Table, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib cimport (Table, check_status, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib import tobytes
from pyarrow._compute cimport Expression, _true
from pyarrow._dataset cimport Dataset
Expand DownExpand Up@@ -56,29 +56,29 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
"""
cdef:
CExecutor *c_executor
shared_ptr[CThreadPool] c_executor_sptr
shared_ptr[CExecContext] c_exec_context
shared_ptr[CExecPlan] c_exec_plan
vector[CDeclaration] c_decls
vector[CExecNode*] _empty
vector[CExecNode*] c_final_node_vec
CExecNode *c_node
CTable* c_table
shared_ptr[CTable] c_in_table
shared_ptr[CTable] c_out_table
shared_ptr[CSourceNodeOptions] c_sourceopts
shared_ptr[CTableSourceNodeOptions] c_tablesourceopts
shared_ptr[CScanNodeOptions] c_scanopts
shared_ptr[CExecNodeOptions] c_input_node_opts
shared_ptr[CSinkNodeOptions] c_sinkopts
shared_ptr[CAsyncExecBatchGenerator] c_async_exec_batch_gen
shared_ptr[CRecordBatchReader] c_recordbatchreader
vector[CDeclaration].iterator plan_iter
vector[CDeclaration.Input] no_c_inputs
CStatus c_plan_status

if use_threads:
c_executor = GetCpuThreadPool()
else:
c_executor_sptr = GetResultValue(CThreadPool.Make(1))
c_executor = c_executor_sptr.get()
c_executor = NULL

c_exec_context = make_shared[CExecContext](
c_default_memory_pool(), c_executor)
Expand All@@ -89,12 +89,12 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
# Create source nodes for each input
for ipt in inputs:
if isinstance(ipt, Table):
node_factory = "source"
c_in_table = pyarrow_unwrap_table(ipt).get()
c_sourceopts = GetResultValue(
CSourceNodeOptions.FromTable(deref(c_in_table), deref(c_exec_context).executor()))
c_input_node_opts = static_pointer_cast[CExecNodeOptions, CSourceNodeOptions](
c_sourceopts)
node_factory = "table_source"
c_in_table = pyarrow_unwrap_table(ipt)
c_tablesourceopts = make_shared[CTableSourceNodeOptions](
c_in_table, 1 << 20)
c_input_node_opts = static_pointer_cast[CExecNodeOptions, CTableSourceNodeOptions](
c_tablesourceopts)
elif isinstance(ipt, Dataset):
node_factory = "scan"
c_in_dataset = (<Dataset>ipt).unwrap()
Expand DownExpand Up@@ -157,7 +157,9 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
else:
raise TypeError("Unsupported output type")

deref(c_exec_plan).StopProducing()
with nogil:
c_plan_status = deref(c_exec_plan).finished().status()
check_status(c_plan_status)

return output

Expand DownExpand Up@@ -345,6 +347,7 @@ def _perform_join(join_type, left_operand not None, left_keys,

result_table = execplan([left_operand, right_operand],
plan=c_decl_plan,
output_type=output_type)
output_type=output_type,
use_threads=use_threads)

return result_table
12 changes: 9 additions & 3 deletions python/pyarrow/includes/libarrow.pxd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,11 @@ cdef extern from "arrow/config.h" namespace "arrow" nogil:
CRuntimeInfo GetRuntimeInfo()


cdef extern from "arrow/util/future.h" namespace "arrow" nogil:
cdef cppclass CFuture_Void" arrow::Future<>":
CStatus status()


cdef extern from "arrow/api.h" namespace "arrow" nogil:
cdef enum Type" arrow::Type::type":
_Type_NA" arrow::Type::NA"
Expand DownExpand Up@@ -2442,9 +2447,8 @@ cdef extern from "arrow/compute/exec/options.h" namespace "arrow::compute" nogil
cdef cppclass CExecNodeOptions "arrow::compute::ExecNodeOptions":
pass

cdef cppclass CSourceNodeOptions "arrow::compute::SourceNodeOptions"(CExecNodeOptions):
@staticmethod
CResult[shared_ptr[CSourceNodeOptions]] FromTable(const CTable& table, CExecutor*)
cdef cppclass CTableSourceNodeOptions "arrow::compute::TableSourceNodeOptions"(CExecNodeOptions):
CTableSourceNodeOptions(shared_ptr[CTable] table, int64_t max_batch_size)

cdef cppclass CSinkNodeOptions "arrow::compute::SinkNodeOptions"(CExecNodeOptions):
pass
Expand DownExpand Up@@ -2497,6 +2501,8 @@ cdef extern from "arrow/compute/exec/exec_plan.h" namespace "arrow::compute" nog
CStatus Validate()
CStatus StopProducing()

CFuture_Void finished()

vector[CExecNode*] sinks() const
vector[CExecNode*] sources() const

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins by westonpace · Pull Request #13036 · apache/arrow · GitHub
Skip to content
ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins#13036

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

westonpace
wants to merge
3
commits into

from

 Closed


ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins
#13036
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
bbb49f2

ARROW-16419: [Python] Properly wait for ExecPlan to finish


lidavidm Apr 29, 2022
48f7ee0

Switch from non-owning SourceNode to non-owning TableSourceNode. Pas…


westonpace Apr 30, 2022
85a736b

ARROW-16417: python lint


westonpace Apr 30, 2022

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


21 changes: 11 additions & 10 deletions
cpp/src/arrow/compute/exec/hash_join_node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,16 +634,17 @@ class HashJoinNode : public ExecNode {
 Status ScheduleTaskCallback(std::function<Status(size_t)> func) {
 auto executor = plan_->exec_context()->executor();
 if (executor) {
 ARROW_ASSIGN_OR_RAISE(auto task_fut, executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 return task_group_.AddTask(task_fut);
 return task_group_.AddTask([this, executor, func] {
 return DeferNotOk(executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 });
 } else {
 // We should not get here in serial execution mode
 ARROW_DCHECK(false);
Expand Down

29 changes: 16 additions & 13 deletions
python/pyarrow/_exec_plan.pyx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ from cython.operator cimport dereference as deref, preincrement as inc
from pyarrow.includes.common cimport *
from pyarrow.includes.libarrow cimport *
from pyarrow.includes.libarrow_dataset cimport *
from pyarrow.lib cimport (Table, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib cimport (Table, check_status, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib import tobytes
from pyarrow._compute cimport Expression, _true
from pyarrow._dataset cimport Dataset
Expand DownExpand Up@@ -56,29 +56,29 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 """
 cdef:
 CExecutor *c_executor
 shared_ptr[CThreadPool] c_executor_sptr
 shared_ptr[CExecContext] c_exec_context
 shared_ptr[CExecPlan] c_exec_plan
 vector[CDeclaration] c_decls
 vector[CExecNode*] _empty
 vector[CExecNode*] c_final_node_vec
 CExecNode *c_node
 CTable* c_table
 shared_ptr[CTable] c_in_table
 shared_ptr[CTable] c_out_table
 shared_ptr[CSourceNodeOptions] c_sourceopts
 shared_ptr[CTableSourceNodeOptions] c_tablesourceopts
 shared_ptr[CScanNodeOptions] c_scanopts
 shared_ptr[CExecNodeOptions] c_input_node_opts
 shared_ptr[CSinkNodeOptions] c_sinkopts
 shared_ptr[CAsyncExecBatchGenerator] c_async_exec_batch_gen
 shared_ptr[CRecordBatchReader] c_recordbatchreader
 vector[CDeclaration].iterator plan_iter
 vector[CDeclaration.Input] no_c_inputs
 CStatus c_plan_status

 if use_threads:
 c_executor = GetCpuThreadPool()
 else:
 c_executor_sptr = GetResultValue(CThreadPool.Make(1))
 c_executor = c_executor_sptr.get()
 c_executor = NULL

 c_exec_context = make_shared[CExecContext](
 c_default_memory_pool(), c_executor)
Expand All@@ -89,12 +89,12 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 # Create source nodes for each input
 for ipt in inputs:
 if isinstance(ipt, Table):
 node_factory = "source"
 c_in_table = pyarrow_unwrap_table(ipt).get()
c_sourceopts = GetResultValue(
CSourceNodeOptions.FromTable(deref(c_in_table), deref(c_exec_context).executor()))
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CSourceNodeOptions](
c_sourceopts)
 node_factory = "table_source"
 c_in_table = pyarrow_unwrap_table(ipt)
c_tablesourceopts = make_shared[CTableSourceNodeOptions](
 c_in_table, 1 << 20)
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CTableSourceNodeOptions](
c_tablesourceopts)
 elif isinstance(ipt, Dataset):
 node_factory = "scan"
 c_in_dataset = (<Dataset>ipt).unwrap()
Expand DownExpand Up@@ -157,7 +157,9 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 else:
 raise TypeError("Unsupported output type")

 deref(c_exec_plan).StopProducing()
 with nogil:
 c_plan_status = deref(c_exec_plan).finished().status()
 check_status(c_plan_status)

 return output

Expand DownExpand Up@@ -345,6 +347,7 @@ def _perform_join(join_type, left_operand not None, left_keys,

 result_table = execplan([left_operand, right_operand],
 plan=c_decl_plan,
 output_type=output_type)
 output_type=output_type,
 use_threads=use_threads)

 return result_table

12 changes: 9 additions & 3 deletions
python/pyarrow/includes/libarrow.pxd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,11 @@ cdef extern from "arrow/config.h" namespace "arrow" nogil:
 CRuntimeInfo GetRuntimeInfo()


cdef extern from "arrow/util/future.h" namespace "arrow" nogil:
 cdef cppclass CFuture_Void" arrow::Future<>":
 CStatus status()


cdef extern from "arrow/api.h" namespace "arrow" nogil:
 cdef enum Type" arrow::Type::type":
 _Type_NA" arrow::Type::NA"
Expand DownExpand Up@@ -2442,9 +2447,8 @@ cdef extern from "arrow/compute/exec/options.h" namespace "arrow::compute" nogil
 cdef cppclass CExecNodeOptions "arrow::compute::ExecNodeOptions":
 pass

 cdef cppclass CSourceNodeOptions "arrow::compute::SourceNodeOptions"(CExecNodeOptions):
 @staticmethod
 CResult[shared_ptr[CSourceNodeOptions]] FromTable(const CTable& table, CExecutor*)
 cdef cppclass CTableSourceNodeOptions "arrow::compute::TableSourceNodeOptions"(CExecNodeOptions):
 CTableSourceNodeOptions(shared_ptr[CTable] table, int64_t max_batch_size)

 cdef cppclass CSinkNodeOptions "arrow::compute::SinkNodeOptions"(CExecNodeOptions):
 pass
Expand DownExpand Up@@ -2497,6 +2501,8 @@ cdef extern from "arrow/compute/exec/exec_plan.h" namespace "arrow::compute" nog
 CStatus Validate()
 CStatus StopProducing()

 CFuture_Void finished()

 vector[CExecNode*] sinks() const
 vector[CExecNode*] sources() const

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins by westonpace · Pull Request #13036 · apache/arrow · GitHub
Skip to content
ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins#13036

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

westonpace
wants to merge
3
commits into

from

 Closed


ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins
#13036
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
bbb49f2

ARROW-16419: [Python] Properly wait for ExecPlan to finish


lidavidm Apr 29, 2022
48f7ee0

Switch from non-owning SourceNode to non-owning TableSourceNode. Pas…


westonpace Apr 30, 2022
85a736b

ARROW-16417: python lint


westonpace Apr 30, 2022

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


21 changes: 11 additions & 10 deletions
cpp/src/arrow/compute/exec/hash_join_node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,16 +634,17 @@ class HashJoinNode : public ExecNode {
 Status ScheduleTaskCallback(std::function<Status(size_t)> func) {
 auto executor = plan_->exec_context()->executor();
 if (executor) {
 ARROW_ASSIGN_OR_RAISE(auto task_fut, executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 return task_group_.AddTask(task_fut);
 return task_group_.AddTask([this, executor, func] {
 return DeferNotOk(executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 });
 } else {
 // We should not get here in serial execution mode
 ARROW_DCHECK(false);
Expand Down

29 changes: 16 additions & 13 deletions
python/pyarrow/_exec_plan.pyx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ from cython.operator cimport dereference as deref, preincrement as inc
from pyarrow.includes.common cimport *
from pyarrow.includes.libarrow cimport *
from pyarrow.includes.libarrow_dataset cimport *
from pyarrow.lib cimport (Table, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib cimport (Table, check_status, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib import tobytes
from pyarrow._compute cimport Expression, _true
from pyarrow._dataset cimport Dataset
Expand DownExpand Up@@ -56,29 +56,29 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 """
 cdef:
 CExecutor *c_executor
 shared_ptr[CThreadPool] c_executor_sptr
 shared_ptr[CExecContext] c_exec_context
 shared_ptr[CExecPlan] c_exec_plan
 vector[CDeclaration] c_decls
 vector[CExecNode*] _empty
 vector[CExecNode*] c_final_node_vec
 CExecNode *c_node
 CTable* c_table
 shared_ptr[CTable] c_in_table
 shared_ptr[CTable] c_out_table
 shared_ptr[CSourceNodeOptions] c_sourceopts
 shared_ptr[CTableSourceNodeOptions] c_tablesourceopts
 shared_ptr[CScanNodeOptions] c_scanopts
 shared_ptr[CExecNodeOptions] c_input_node_opts
 shared_ptr[CSinkNodeOptions] c_sinkopts
 shared_ptr[CAsyncExecBatchGenerator] c_async_exec_batch_gen
 shared_ptr[CRecordBatchReader] c_recordbatchreader
 vector[CDeclaration].iterator plan_iter
 vector[CDeclaration.Input] no_c_inputs
 CStatus c_plan_status

 if use_threads:
 c_executor = GetCpuThreadPool()
 else:
 c_executor_sptr = GetResultValue(CThreadPool.Make(1))
 c_executor = c_executor_sptr.get()
 c_executor = NULL

 c_exec_context = make_shared[CExecContext](
 c_default_memory_pool(), c_executor)
Expand All@@ -89,12 +89,12 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 # Create source nodes for each input
 for ipt in inputs:
 if isinstance(ipt, Table):
 node_factory = "source"
 c_in_table = pyarrow_unwrap_table(ipt).get()
c_sourceopts = GetResultValue(
CSourceNodeOptions.FromTable(deref(c_in_table), deref(c_exec_context).executor()))
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CSourceNodeOptions](
c_sourceopts)
 node_factory = "table_source"
 c_in_table = pyarrow_unwrap_table(ipt)
c_tablesourceopts = make_shared[CTableSourceNodeOptions](
 c_in_table, 1 << 20)
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CTableSourceNodeOptions](
c_tablesourceopts)
 elif isinstance(ipt, Dataset):
 node_factory = "scan"
 c_in_dataset = (<Dataset>ipt).unwrap()
Expand DownExpand Up@@ -157,7 +157,9 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 else:
 raise TypeError("Unsupported output type")

 deref(c_exec_plan).StopProducing()
 with nogil:
 c_plan_status = deref(c_exec_plan).finished().status()
 check_status(c_plan_status)

 return output

Expand DownExpand Up@@ -345,6 +347,7 @@ def _perform_join(join_type, left_operand not None, left_keys,

 result_table = execplan([left_operand, right_operand],
 plan=c_decl_plan,
 output_type=output_type)
 output_type=output_type,
 use_threads=use_threads)

 return result_table

12 changes: 9 additions & 3 deletions
python/pyarrow/includes/libarrow.pxd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,11 @@ cdef extern from "arrow/config.h" namespace "arrow" nogil:
 CRuntimeInfo GetRuntimeInfo()


cdef extern from "arrow/util/future.h" namespace "arrow" nogil:
 cdef cppclass CFuture_Void" arrow::Future<>":
 CStatus status()


cdef extern from "arrow/api.h" namespace "arrow" nogil:
 cdef enum Type" arrow::Type::type":
 _Type_NA" arrow::Type::NA"
Expand DownExpand Up@@ -2442,9 +2447,8 @@ cdef extern from "arrow/compute/exec/options.h" namespace "arrow::compute" nogil
 cdef cppclass CExecNodeOptions "arrow::compute::ExecNodeOptions":
 pass

 cdef cppclass CSourceNodeOptions "arrow::compute::SourceNodeOptions"(CExecNodeOptions):
 @staticmethod
 CResult[shared_ptr[CSourceNodeOptions]] FromTable(const CTable& table, CExecutor*)
 cdef cppclass CTableSourceNodeOptions "arrow::compute::TableSourceNodeOptions"(CExecNodeOptions):
 CTableSourceNodeOptions(shared_ptr[CTable] table, int64_t max_batch_size)

 cdef cppclass CSinkNodeOptions "arrow::compute::SinkNodeOptions"(CExecNodeOptions):
 pass
Expand DownExpand Up@@ -2497,6 +2501,8 @@ cdef extern from "arrow/compute/exec/exec_plan.h" namespace "arrow::compute" nog
 CStatus Validate()
 CStatus StopProducing()

 CFuture_Void finished()

 vector[CExecNode*] sinks() const
 vector[CExecNode*] sources() const

Expand Down

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

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

westonpace
wants to merge
3
commits into

from

 Closed


ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins
#13036
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
bbb49f2

ARROW-16419: [Python] Properly wait for ExecPlan to finish


lidavidm Apr 29, 2022
48f7ee0

Switch from non-owning SourceNode to non-owning TableSourceNode. Pas…


westonpace Apr 30, 2022
85a736b

ARROW-16417: python lint


westonpace Apr 30, 2022

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


21 changes: 11 additions & 10 deletions
cpp/src/arrow/compute/exec/hash_join_node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,16 +634,17 @@ class HashJoinNode : public ExecNode {
 Status ScheduleTaskCallback(std::function<Status(size_t)> func) {
 auto executor = plan_->exec_context()->executor();
 if (executor) {
 ARROW_ASSIGN_OR_RAISE(auto task_fut, executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 return task_group_.AddTask(task_fut);
 return task_group_.AddTask([this, executor, func] {
 return DeferNotOk(executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 });
 } else {
 // We should not get here in serial execution mode
 ARROW_DCHECK(false);
Expand Down

29 changes: 16 additions & 13 deletions
python/pyarrow/_exec_plan.pyx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ from cython.operator cimport dereference as deref, preincrement as inc
from pyarrow.includes.common cimport *
from pyarrow.includes.libarrow cimport *
from pyarrow.includes.libarrow_dataset cimport *
from pyarrow.lib cimport (Table, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib cimport (Table, check_status, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib import tobytes
from pyarrow._compute cimport Expression, _true
from pyarrow._dataset cimport Dataset
Expand DownExpand Up@@ -56,29 +56,29 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 """
 cdef:
 CExecutor *c_executor
 shared_ptr[CThreadPool] c_executor_sptr
 shared_ptr[CExecContext] c_exec_context
 shared_ptr[CExecPlan] c_exec_plan
 vector[CDeclaration] c_decls
 vector[CExecNode*] _empty
 vector[CExecNode*] c_final_node_vec
 CExecNode *c_node
 CTable* c_table
 shared_ptr[CTable] c_in_table
 shared_ptr[CTable] c_out_table
 shared_ptr[CSourceNodeOptions] c_sourceopts
 shared_ptr[CTableSourceNodeOptions] c_tablesourceopts
 shared_ptr[CScanNodeOptions] c_scanopts
 shared_ptr[CExecNodeOptions] c_input_node_opts
 shared_ptr[CSinkNodeOptions] c_sinkopts
 shared_ptr[CAsyncExecBatchGenerator] c_async_exec_batch_gen
 shared_ptr[CRecordBatchReader] c_recordbatchreader
 vector[CDeclaration].iterator plan_iter
 vector[CDeclaration.Input] no_c_inputs
 CStatus c_plan_status

 if use_threads:
 c_executor = GetCpuThreadPool()
 else:
 c_executor_sptr = GetResultValue(CThreadPool.Make(1))
 c_executor = c_executor_sptr.get()
 c_executor = NULL

 c_exec_context = make_shared[CExecContext](
 c_default_memory_pool(), c_executor)
Expand All@@ -89,12 +89,12 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 # Create source nodes for each input
 for ipt in inputs:
 if isinstance(ipt, Table):
 node_factory = "source"
 c_in_table = pyarrow_unwrap_table(ipt).get()
c_sourceopts = GetResultValue(
CSourceNodeOptions.FromTable(deref(c_in_table), deref(c_exec_context).executor()))
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CSourceNodeOptions](
c_sourceopts)
 node_factory = "table_source"
 c_in_table = pyarrow_unwrap_table(ipt)
c_tablesourceopts = make_shared[CTableSourceNodeOptions](
 c_in_table, 1 << 20)
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CTableSourceNodeOptions](
c_tablesourceopts)
 elif isinstance(ipt, Dataset):
 node_factory = "scan"
 c_in_dataset = (<Dataset>ipt).unwrap()
Expand DownExpand Up@@ -157,7 +157,9 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 else:
 raise TypeError("Unsupported output type")

 deref(c_exec_plan).StopProducing()
 with nogil:
 c_plan_status = deref(c_exec_plan).finished().status()
 check_status(c_plan_status)

 return output

Expand DownExpand Up@@ -345,6 +347,7 @@ def _perform_join(join_type, left_operand not None, left_keys,

 result_table = execplan([left_operand, right_operand],
 plan=c_decl_plan,
 output_type=output_type)
 output_type=output_type,
 use_threads=use_threads)

 return result_table

12 changes: 9 additions & 3 deletions
python/pyarrow/includes/libarrow.pxd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,11 @@ cdef extern from "arrow/config.h" namespace "arrow" nogil:
 CRuntimeInfo GetRuntimeInfo()


cdef extern from "arrow/util/future.h" namespace "arrow" nogil:
 cdef cppclass CFuture_Void" arrow::Future<>":
 CStatus status()


cdef extern from "arrow/api.h" namespace "arrow" nogil:
 cdef enum Type" arrow::Type::type":
 _Type_NA" arrow::Type::NA"
Expand DownExpand Up@@ -2442,9 +2447,8 @@ cdef extern from "arrow/compute/exec/options.h" namespace "arrow::compute" nogil
 cdef cppclass CExecNodeOptions "arrow::compute::ExecNodeOptions":
 pass

 cdef cppclass CSourceNodeOptions "arrow::compute::SourceNodeOptions"(CExecNodeOptions):
 @staticmethod
 CResult[shared_ptr[CSourceNodeOptions]] FromTable(const CTable& table, CExecutor*)
 cdef cppclass CTableSourceNodeOptions "arrow::compute::TableSourceNodeOptions"(CExecNodeOptions):
 CTableSourceNodeOptions(shared_ptr[CTable] table, int64_t max_batch_size)

 cdef cppclass CSinkNodeOptions "arrow::compute::SinkNodeOptions"(CExecNodeOptions):
 pass
Expand DownExpand Up@@ -2497,6 +2501,8 @@ cdef extern from "arrow/compute/exec/exec_plan.h" namespace "arrow::compute" nog
 CStatus Validate()
 CStatus StopProducing()

 CFuture_Void finished()

 vector[CExecNode*] sinks() const
 vector[CExecNode*] sources() const

Expand Down

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

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

westonpace
wants to merge
3
commits into

from

 Closed


ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins
#13036
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
bbb49f2

ARROW-16419: [Python] Properly wait for ExecPlan to finish


lidavidm Apr 29, 2022
48f7ee0

Switch from non-owning SourceNode to non-owning TableSourceNode. Pas…


westonpace Apr 30, 2022
85a736b

ARROW-16417: python lint


westonpace Apr 30, 2022

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


21 changes: 11 additions & 10 deletions
cpp/src/arrow/compute/exec/hash_join_node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,16 +634,17 @@ class HashJoinNode : public ExecNode {
 Status ScheduleTaskCallback(std::function<Status(size_t)> func) {
 auto executor = plan_->exec_context()->executor();
 if (executor) {
 ARROW_ASSIGN_OR_RAISE(auto task_fut, executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 return task_group_.AddTask(task_fut);
 return task_group_.AddTask([this, executor, func] {
 return DeferNotOk(executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 });
 } else {
 // We should not get here in serial execution mode
 ARROW_DCHECK(false);
Expand Down

29 changes: 16 additions & 13 deletions
python/pyarrow/_exec_plan.pyx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ from cython.operator cimport dereference as deref, preincrement as inc
from pyarrow.includes.common cimport *
from pyarrow.includes.libarrow cimport *
from pyarrow.includes.libarrow_dataset cimport *
from pyarrow.lib cimport (Table, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib cimport (Table, check_status, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib import tobytes
from pyarrow._compute cimport Expression, _true
from pyarrow._dataset cimport Dataset
Expand DownExpand Up@@ -56,29 +56,29 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 """
 cdef:
 CExecutor *c_executor
 shared_ptr[CThreadPool] c_executor_sptr
 shared_ptr[CExecContext] c_exec_context
 shared_ptr[CExecPlan] c_exec_plan
 vector[CDeclaration] c_decls
 vector[CExecNode*] _empty
 vector[CExecNode*] c_final_node_vec
 CExecNode *c_node
 CTable* c_table
 shared_ptr[CTable] c_in_table
 shared_ptr[CTable] c_out_table
 shared_ptr[CSourceNodeOptions] c_sourceopts
 shared_ptr[CTableSourceNodeOptions] c_tablesourceopts
 shared_ptr[CScanNodeOptions] c_scanopts
 shared_ptr[CExecNodeOptions] c_input_node_opts
 shared_ptr[CSinkNodeOptions] c_sinkopts
 shared_ptr[CAsyncExecBatchGenerator] c_async_exec_batch_gen
 shared_ptr[CRecordBatchReader] c_recordbatchreader
 vector[CDeclaration].iterator plan_iter
 vector[CDeclaration.Input] no_c_inputs
 CStatus c_plan_status

 if use_threads:
 c_executor = GetCpuThreadPool()
 else:
 c_executor_sptr = GetResultValue(CThreadPool.Make(1))
 c_executor = c_executor_sptr.get()
 c_executor = NULL

 c_exec_context = make_shared[CExecContext](
 c_default_memory_pool(), c_executor)
Expand All@@ -89,12 +89,12 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 # Create source nodes for each input
 for ipt in inputs:
 if isinstance(ipt, Table):
 node_factory = "source"
 c_in_table = pyarrow_unwrap_table(ipt).get()
c_sourceopts = GetResultValue(
CSourceNodeOptions.FromTable(deref(c_in_table), deref(c_exec_context).executor()))
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CSourceNodeOptions](
c_sourceopts)
 node_factory = "table_source"
 c_in_table = pyarrow_unwrap_table(ipt)
c_tablesourceopts = make_shared[CTableSourceNodeOptions](
 c_in_table, 1 << 20)
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CTableSourceNodeOptions](
c_tablesourceopts)
 elif isinstance(ipt, Dataset):
 node_factory = "scan"
 c_in_dataset = (<Dataset>ipt).unwrap()
Expand DownExpand Up@@ -157,7 +157,9 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 else:
 raise TypeError("Unsupported output type")

 deref(c_exec_plan).StopProducing()
 with nogil:
 c_plan_status = deref(c_exec_plan).finished().status()
 check_status(c_plan_status)

 return output

Expand DownExpand Up@@ -345,6 +347,7 @@ def _perform_join(join_type, left_operand not None, left_keys,

 result_table = execplan([left_operand, right_operand],
 plan=c_decl_plan,
 output_type=output_type)
 output_type=output_type,
 use_threads=use_threads)

 return result_table

12 changes: 9 additions & 3 deletions
python/pyarrow/includes/libarrow.pxd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,11 @@ cdef extern from "arrow/config.h" namespace "arrow" nogil:
 CRuntimeInfo GetRuntimeInfo()


cdef extern from "arrow/util/future.h" namespace "arrow" nogil:
 cdef cppclass CFuture_Void" arrow::Future<>":
 CStatus status()


cdef extern from "arrow/api.h" namespace "arrow" nogil:
 cdef enum Type" arrow::Type::type":
 _Type_NA" arrow::Type::NA"
Expand DownExpand Up@@ -2442,9 +2447,8 @@ cdef extern from "arrow/compute/exec/options.h" namespace "arrow::compute" nogil
 cdef cppclass CExecNodeOptions "arrow::compute::ExecNodeOptions":
 pass

 cdef cppclass CSourceNodeOptions "arrow::compute::SourceNodeOptions"(CExecNodeOptions):
 @staticmethod
 CResult[shared_ptr[CSourceNodeOptions]] FromTable(const CTable& table, CExecutor*)
 cdef cppclass CTableSourceNodeOptions "arrow::compute::TableSourceNodeOptions"(CExecNodeOptions):
 CTableSourceNodeOptions(shared_ptr[CTable] table, int64_t max_batch_size)

 cdef cppclass CSinkNodeOptions "arrow::compute::SinkNodeOptions"(CExecNodeOptions):
 pass
Expand DownExpand Up@@ -2497,6 +2501,8 @@ cdef extern from "arrow/compute/exec/exec_plan.h" namespace "arrow::compute" nog
 CStatus Validate()
 CStatus StopProducing()

 CFuture_Void finished()

 vector[CExecNode*] sinks() const
 vector[CExecNode*] sources() const

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins by westonpace · Pull Request #13036 · apache/arrow · GitHub
Skip to content
ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins#13036

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

westonpace
wants to merge
3
commits into

from

 Closed


ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins
#13036
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
bbb49f2

ARROW-16419: [Python] Properly wait for ExecPlan to finish


lidavidm Apr 29, 2022
48f7ee0

Switch from non-owning SourceNode to non-owning TableSourceNode. Pas…


westonpace Apr 30, 2022
85a736b

ARROW-16417: python lint


westonpace Apr 30, 2022

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


21 changes: 11 additions & 10 deletions
cpp/src/arrow/compute/exec/hash_join_node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,16 +634,17 @@ class HashJoinNode : public ExecNode {
 Status ScheduleTaskCallback(std::function<Status(size_t)> func) {
 auto executor = plan_->exec_context()->executor();
 if (executor) {
 ARROW_ASSIGN_OR_RAISE(auto task_fut, executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 return task_group_.AddTask(task_fut);
 return task_group_.AddTask([this, executor, func] {
 return DeferNotOk(executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 });
 } else {
 // We should not get here in serial execution mode
 ARROW_DCHECK(false);
Expand Down

29 changes: 16 additions & 13 deletions
python/pyarrow/_exec_plan.pyx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ from cython.operator cimport dereference as deref, preincrement as inc
from pyarrow.includes.common cimport *
from pyarrow.includes.libarrow cimport *
from pyarrow.includes.libarrow_dataset cimport *
from pyarrow.lib cimport (Table, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib cimport (Table, check_status, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib import tobytes
from pyarrow._compute cimport Expression, _true
from pyarrow._dataset cimport Dataset
Expand DownExpand Up@@ -56,29 +56,29 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 """
 cdef:
 CExecutor *c_executor
 shared_ptr[CThreadPool] c_executor_sptr
 shared_ptr[CExecContext] c_exec_context
 shared_ptr[CExecPlan] c_exec_plan
 vector[CDeclaration] c_decls
 vector[CExecNode*] _empty
 vector[CExecNode*] c_final_node_vec
 CExecNode *c_node
 CTable* c_table
 shared_ptr[CTable] c_in_table
 shared_ptr[CTable] c_out_table
 shared_ptr[CSourceNodeOptions] c_sourceopts
 shared_ptr[CTableSourceNodeOptions] c_tablesourceopts
 shared_ptr[CScanNodeOptions] c_scanopts
 shared_ptr[CExecNodeOptions] c_input_node_opts
 shared_ptr[CSinkNodeOptions] c_sinkopts
 shared_ptr[CAsyncExecBatchGenerator] c_async_exec_batch_gen
 shared_ptr[CRecordBatchReader] c_recordbatchreader
 vector[CDeclaration].iterator plan_iter
 vector[CDeclaration.Input] no_c_inputs
 CStatus c_plan_status

 if use_threads:
 c_executor = GetCpuThreadPool()
 else:
 c_executor_sptr = GetResultValue(CThreadPool.Make(1))
 c_executor = c_executor_sptr.get()
 c_executor = NULL

 c_exec_context = make_shared[CExecContext](
 c_default_memory_pool(), c_executor)
Expand All@@ -89,12 +89,12 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 # Create source nodes for each input
 for ipt in inputs:
 if isinstance(ipt, Table):
 node_factory = "source"
 c_in_table = pyarrow_unwrap_table(ipt).get()
c_sourceopts = GetResultValue(
CSourceNodeOptions.FromTable(deref(c_in_table), deref(c_exec_context).executor()))
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CSourceNodeOptions](
c_sourceopts)
 node_factory = "table_source"
 c_in_table = pyarrow_unwrap_table(ipt)
c_tablesourceopts = make_shared[CTableSourceNodeOptions](
 c_in_table, 1 << 20)
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CTableSourceNodeOptions](
c_tablesourceopts)
 elif isinstance(ipt, Dataset):
 node_factory = "scan"
 c_in_dataset = (<Dataset>ipt).unwrap()
Expand DownExpand Up@@ -157,7 +157,9 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 else:
 raise TypeError("Unsupported output type")

 deref(c_exec_plan).StopProducing()
 with nogil:
 c_plan_status = deref(c_exec_plan).finished().status()
 check_status(c_plan_status)

 return output

Expand DownExpand Up@@ -345,6 +347,7 @@ def _perform_join(join_type, left_operand not None, left_keys,

 result_table = execplan([left_operand, right_operand],
 plan=c_decl_plan,
 output_type=output_type)
 output_type=output_type,
 use_threads=use_threads)

 return result_table

12 changes: 9 additions & 3 deletions
python/pyarrow/includes/libarrow.pxd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,11 @@ cdef extern from "arrow/config.h" namespace "arrow" nogil:
 CRuntimeInfo GetRuntimeInfo()


cdef extern from "arrow/util/future.h" namespace "arrow" nogil:
 cdef cppclass CFuture_Void" arrow::Future<>":
 CStatus status()


cdef extern from "arrow/api.h" namespace "arrow" nogil:
 cdef enum Type" arrow::Type::type":
 _Type_NA" arrow::Type::NA"
Expand DownExpand Up@@ -2442,9 +2447,8 @@ cdef extern from "arrow/compute/exec/options.h" namespace "arrow::compute" nogil
 cdef cppclass CExecNodeOptions "arrow::compute::ExecNodeOptions":
 pass

 cdef cppclass CSourceNodeOptions "arrow::compute::SourceNodeOptions"(CExecNodeOptions):
 @staticmethod
 CResult[shared_ptr[CSourceNodeOptions]] FromTable(const CTable& table, CExecutor*)
 cdef cppclass CTableSourceNodeOptions "arrow::compute::TableSourceNodeOptions"(CExecNodeOptions):
 CTableSourceNodeOptions(shared_ptr[CTable] table, int64_t max_batch_size)

 cdef cppclass CSinkNodeOptions "arrow::compute::SinkNodeOptions"(CExecNodeOptions):
 pass
Expand DownExpand Up@@ -2497,6 +2501,8 @@ cdef extern from "arrow/compute/exec/exec_plan.h" namespace "arrow::compute" nog
 CStatus Validate()
 CStatus StopProducing()

 CFuture_Void finished()

 vector[CExecNode*] sinks() const
 vector[CExecNode*] sources() const

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins by westonpace · Pull Request #13036 · apache/arrow · GitHub
Skip to content
ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins#13036

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

westonpace
wants to merge
3
commits into

from

 Closed


ARROW-16417: [C++][Python] Segfault in test_exec_plan.py / test_joins
#13036
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
bbb49f2

ARROW-16419: [Python] Properly wait for ExecPlan to finish


lidavidm Apr 29, 2022
48f7ee0

Switch from non-owning SourceNode to non-owning TableSourceNode. Pas…


westonpace Apr 30, 2022
85a736b

ARROW-16417: python lint


westonpace Apr 30, 2022

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


21 changes: 11 additions & 10 deletions
cpp/src/arrow/compute/exec/hash_join_node.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -634,16 +634,17 @@ class HashJoinNode : public ExecNode {
 Status ScheduleTaskCallback(std::function<Status(size_t)> func) {
 auto executor = plan_->exec_context()->executor();
 if (executor) {
 ARROW_ASSIGN_OR_RAISE(auto task_fut, executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 return task_group_.AddTask(task_fut);
 return task_group_.AddTask([this, executor, func] {
 return DeferNotOk(executor->Submit([this, func] {
 size_t thread_index = thread_indexer_();
 Status status = func(thread_index);
 if (!status.ok()) {
 StopProducing();
 ErrorIfNotOk(status);
 return;
 }
 }));
 });
 } else {
 // We should not get here in serial execution mode
 ARROW_DCHECK(false);
Expand Down

29 changes: 16 additions & 13 deletions
python/pyarrow/_exec_plan.pyx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ from cython.operator cimport dereference as deref, preincrement as inc
from pyarrow.includes.common cimport *
from pyarrow.includes.libarrow cimport *
from pyarrow.includes.libarrow_dataset cimport *
from pyarrow.lib cimport (Table, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib cimport (Table, check_status, pyarrow_unwrap_table, pyarrow_wrap_table)
from pyarrow.lib import tobytes
from pyarrow._compute cimport Expression, _true
from pyarrow._dataset cimport Dataset
Expand DownExpand Up@@ -56,29 +56,29 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 """
 cdef:
 CExecutor *c_executor
 shared_ptr[CThreadPool] c_executor_sptr
 shared_ptr[CExecContext] c_exec_context
 shared_ptr[CExecPlan] c_exec_plan
 vector[CDeclaration] c_decls
 vector[CExecNode*] _empty
 vector[CExecNode*] c_final_node_vec
 CExecNode *c_node
 CTable* c_table
 shared_ptr[CTable] c_in_table
 shared_ptr[CTable] c_out_table
 shared_ptr[CSourceNodeOptions] c_sourceopts
 shared_ptr[CTableSourceNodeOptions] c_tablesourceopts
 shared_ptr[CScanNodeOptions] c_scanopts
 shared_ptr[CExecNodeOptions] c_input_node_opts
 shared_ptr[CSinkNodeOptions] c_sinkopts
 shared_ptr[CAsyncExecBatchGenerator] c_async_exec_batch_gen
 shared_ptr[CRecordBatchReader] c_recordbatchreader
 vector[CDeclaration].iterator plan_iter
 vector[CDeclaration.Input] no_c_inputs
 CStatus c_plan_status

 if use_threads:
 c_executor = GetCpuThreadPool()
 else:
 c_executor_sptr = GetResultValue(CThreadPool.Make(1))
 c_executor = c_executor_sptr.get()
 c_executor = NULL

 c_exec_context = make_shared[CExecContext](
 c_default_memory_pool(), c_executor)
Expand All@@ -89,12 +89,12 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 # Create source nodes for each input
 for ipt in inputs:
 if isinstance(ipt, Table):
 node_factory = "source"
 c_in_table = pyarrow_unwrap_table(ipt).get()
c_sourceopts = GetResultValue(
CSourceNodeOptions.FromTable(deref(c_in_table), deref(c_exec_context).executor()))
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CSourceNodeOptions](
c_sourceopts)
 node_factory = "table_source"
 c_in_table = pyarrow_unwrap_table(ipt)
c_tablesourceopts = make_shared[CTableSourceNodeOptions](
 c_in_table, 1 << 20)
 c_input_node_opts = static_pointer_cast[CExecNodeOptions, CTableSourceNodeOptions](
c_tablesourceopts)
 elif isinstance(ipt, Dataset):
 node_factory = "scan"
 c_in_dataset = (<Dataset>ipt).unwrap()
Expand DownExpand Up@@ -157,7 +157,9 @@ cdef execplan(inputs, output_type, vector[CDeclaration] plan, c_bool use_threads
 else:
 raise TypeError("Unsupported output type")

 deref(c_exec_plan).StopProducing()
 with nogil:
 c_plan_status = deref(c_exec_plan).finished().status()
 check_status(c_plan_status)

 return output

Expand DownExpand Up@@ -345,6 +347,7 @@ def _perform_join(join_type, left_operand not None, left_keys,

 result_table = execplan([left_operand, right_operand],
 plan=c_decl_plan,
 output_type=output_type)
 output_type=output_type,
 use_threads=use_threads)

 return result_table

12 changes: 9 additions & 3 deletions
python/pyarrow/includes/libarrow.pxd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,11 @@ cdef extern from "arrow/config.h" namespace "arrow" nogil:
 CRuntimeInfo GetRuntimeInfo()


cdef extern from "arrow/util/future.h" namespace "arrow" nogil:
 cdef cppclass CFuture_Void" arrow::Future<>":
 CStatus status()


cdef extern from "arrow/api.h" namespace "arrow" nogil:
 cdef enum Type" arrow::Type::type":
 _Type_NA" arrow::Type::NA"
Expand DownExpand Up@@ -2442,9 +2447,8 @@ cdef extern from "arrow/compute/exec/options.h" namespace "arrow::compute" nogil
 cdef cppclass CExecNodeOptions "arrow::compute::ExecNodeOptions":
 pass

 cdef cppclass CSourceNodeOptions "arrow::compute::SourceNodeOptions"(CExecNodeOptions):
 @staticmethod
 CResult[shared_ptr[CSourceNodeOptions]] FromTable(const CTable& table, CExecutor*)
 cdef cppclass CTableSourceNodeOptions "arrow::compute::TableSourceNodeOptions"(CExecNodeOptions):
 CTableSourceNodeOptions(shared_ptr[CTable] table, int64_t max_batch_size)

 cdef cppclass CSinkNodeOptions "arrow::compute::SinkNodeOptions"(CExecNodeOptions):
 pass
Expand DownExpand Up@@ -2497,6 +2501,8 @@ cdef extern from "arrow/compute/exec/exec_plan.h" namespace "arrow::compute" nog
 CStatus Validate()
 CStatus StopProducing()

 CFuture_Void finished()

 vector[CExecNode*] sinks() const
 vector[CExecNode*] sources() const

Expand Down