Skip to content
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

Fix pivot null update bug #501

Merged
merged 3 commits into from
Mar 29, 2019
Merged

Fix pivot null update bug #501

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
72d9a49
Update test for clarity
JHawk Mar 27, 2019
21b2c53
Fixed replacement of STATUS_CLEAR in initial table load
texodus Mar 29, 2019
8b3e185
Updated Python to API changes
texodus Mar 29, 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
89 changes: 56 additions & 33 deletions cpp/perspective/src/cpp/emscripten.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ namespace binding {

void
_fill_col_int64(val accessor, std::shared_ptr<t_column> col, std::string name,
std::int32_t cidx, t_dtype type, bool is_arrow) {
std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update) {
t_uindex nrows = col->size();

if (is_arrow) {
Expand All @@ -700,7 +700,7 @@ namespace binding {

void
_fill_col_time(val accessor, std::shared_ptr<t_column> col, std::string name,
std::int32_t cidx, t_dtype type, bool is_arrow) {
std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update) {
t_uindex nrows = col->size();

if (is_arrow) {
Expand Down Expand Up @@ -729,7 +729,11 @@ namespace binding {
continue;

if (item.isNull()) {
col->unset(i);
if (is_update) {
col->unset(i);
} else {
col->clear(i);
}
continue;
}

Expand All @@ -742,7 +746,7 @@ namespace binding {

void
_fill_col_date(val accessor, std::shared_ptr<t_column> col, std::string name,
std::int32_t cidx, t_dtype type, bool is_arrow) {
std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update) {
t_uindex nrows = col->size();

if (is_arrow) {
Expand Down Expand Up @@ -771,7 +775,11 @@ namespace binding {
continue;

if (item.isNull()) {
col->unset(i);
if (is_update) {
col->unset(i);
} else {
col->clear(i);
}
continue;
}

Expand All @@ -782,7 +790,7 @@ namespace binding {

void
_fill_col_bool(val accessor, std::shared_ptr<t_column> col, std::string name,
std::int32_t cidx, t_dtype type, bool is_arrow) {
std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update) {
t_uindex nrows = col->size();

if (is_arrow) {
Expand All @@ -801,7 +809,11 @@ namespace binding {
continue;

if (item.isNull()) {
col->unset(i);
if (is_update) {
col->unset(i);
} else {
col->clear(i);
}
continue;
}

Expand All @@ -813,7 +825,7 @@ namespace binding {

void
_fill_col_string(val accessor, std::shared_ptr<t_column> col, std::string name,
std::int32_t cidx, t_dtype type, bool is_arrow) {
std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update) {

t_uindex nrows = col->size();

Expand Down Expand Up @@ -866,7 +878,11 @@ namespace binding {
continue;

if (item.isNull()) {
col->unset(i);
if (is_update) {
col->unset(i);
} else {
col->clear(i);
}
continue;
}

Expand All @@ -880,7 +896,7 @@ namespace binding {

void
_fill_col_numeric(val accessor, t_table& tbl, std::shared_ptr<t_column> col,
std::string name, std::int32_t cidx, t_dtype type, bool is_arrow) {
std::string name, std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update) {
t_uindex nrows = col->size();

if (is_arrow) {
Expand Down Expand Up @@ -913,7 +929,11 @@ namespace binding {
continue;

if (item.isNull()) {
col->unset(i);
if (is_update) {
col->unset(i);
} else {
col->clear(i);
}
continue;
}

Expand All @@ -939,7 +959,8 @@ namespace binding {
std::cout << "Promoting to string" << std::endl;
tbl.promote_column(name, DTYPE_STR, i, false);
col = tbl.get_column(name);
_fill_col_string(accessor, col, name, cidx, DTYPE_STR, is_arrow);
_fill_col_string(
accessor, col, name, cidx, DTYPE_STR, is_arrow, is_update);
return;
} else {
col->set_nth(i, static_cast<std::int32_t>(fval));
Expand Down Expand Up @@ -976,7 +997,7 @@ namespace binding {
*/
void
_fill_data(t_table& tbl, std::vector<std::string> ocolnames, val accessor,
std::vector<t_dtype> odt, std::uint32_t offset, bool is_arrow) {
std::vector<t_dtype> odt, std::uint32_t offset, bool is_arrow, bool is_update) {

for (auto cidx = 0; cidx < ocolnames.size(); ++cidx) {
auto name = ocolnames[cidx];
Expand All @@ -993,25 +1014,26 @@ namespace binding {

switch (col_type) {
case DTYPE_INT64: {
_fill_col_int64(dcol, col, name, cidx, col_type, is_arrow);
_fill_col_int64(dcol, col, name, cidx, col_type, is_arrow, is_update);
} break;
case DTYPE_BOOL: {
_fill_col_bool(dcol, col, name, cidx, col_type, is_arrow);
_fill_col_bool(dcol, col, name, cidx, col_type, is_arrow, is_update);
} break;
case DTYPE_DATE: {
_fill_col_date(dcol, col, name, cidx, col_type, is_arrow);
_fill_col_date(dcol, col, name, cidx, col_type, is_arrow, is_update);
} break;
case DTYPE_TIME: {
_fill_col_time(dcol, col, name, cidx, col_type, is_arrow);
_fill_col_time(dcol, col, name, cidx, col_type, is_arrow, is_update);
} break;
case DTYPE_STR: {
_fill_col_string(dcol, col, name, cidx, col_type, is_arrow);
_fill_col_string(dcol, col, name, cidx, col_type, is_arrow, is_update);
} break;
case DTYPE_NONE: {
break;
}
default:
_fill_col_numeric(dcol, tbl, col, name, cidx, col_type, is_arrow);
_fill_col_numeric(
dcol, tbl, col, name, cidx, col_type, is_arrow, is_update);
}

if (is_arrow) {
Expand Down Expand Up @@ -1418,9 +1440,7 @@ namespace binding {
* A gnode.
*/
std::shared_ptr<t_gnode>
make_gnode(const t_table& table) {
auto iscm = table.get_schema();

make_gnode(const t_schema& iscm) {
std::vector<std::string> ocolnames(iscm.columns());
std::vector<t_dtype> odt(iscm.types());

Expand Down Expand Up @@ -1496,7 +1516,14 @@ namespace binding {
tbl.init();
tbl.extend(size);

_fill_data(tbl, colnames, accessor, dtypes, offset, is_arrow);
bool is_new_gnode = gnode.isUndefined();
std::shared_ptr<t_gnode> new_gnode;
if (!is_new_gnode) {
new_gnode = gnode.as<std::shared_ptr<t_gnode>>();
}

_fill_data(tbl, colnames, accessor, dtypes, offset, is_arrow,
!(is_new_gnode || new_gnode->mapping_size() == 0));

// Set up pkey and op columns
if (is_delete) {
Expand All @@ -1522,19 +1549,15 @@ namespace binding {
tbl.clone_column(index, "psp_okey");
}

std::shared_ptr<t_gnode> new_gnode;

if (gnode.isUndefined()) {
new_gnode = make_gnode(tbl);
pool->register_gnode(new_gnode.get());
} else {
new_gnode = gnode.as<std::shared_ptr<t_gnode>>();
}

if (!computed.isUndefined()) {
table_add_computed_column(tbl, computed);
}

if (is_new_gnode) {
new_gnode = make_gnode(tbl.get_schema());
pool->register_gnode(new_gnode.get());
}

pool->send(new_gnode->get_id(), 0, tbl);
pool->_process();

Expand All @@ -1556,7 +1579,7 @@ namespace binding {
clone_gnode_table(t_pool* pool, std::shared_ptr<t_gnode> gnode, val computed) {
t_table* tbl = gnode->_get_pkeyed_table();
table_add_computed_column(*tbl, computed);
std::shared_ptr<t_gnode> new_gnode = make_gnode(*tbl);
std::shared_ptr<t_gnode> new_gnode = make_gnode(tbl->get_schema());
pool->register_gnode(new_gnode.get());
pool->send(new_gnode->get_id(), 0, *tbl);
pool->_process();
Expand Down
5 changes: 5 additions & 0 deletions cpp/perspective/src/cpp/gnode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,11 @@ t_gnode::_process() {
psp_log_time(repr() + " _process.noinit_path.exit");
}

t_uindex
t_gnode::mapping_size() const {
return m_state->mapping_size();
}

t_table*
t_gnode::_get_otable(t_uindex portidx) {
PSP_TRACE_SENTINEL();
Expand Down
16 changes: 8 additions & 8 deletions cpp/perspective/src/include/perspective/binding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,27 +125,27 @@ namespace binding {

template <typename T>
void _fill_col_numeric(T accessor, t_table& tbl, std::shared_ptr<t_column> col,
std::string name, std::int32_t cidx, t_dtype type, bool is_arrow);
std::string name, std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update);

template <typename T>
void _fill_col_int64(T accessor, std::shared_ptr<t_column> col, std::string name,
std::int32_t cidx, t_dtype type, bool is_arrow);
std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update);

template <typename T>
void _fill_col_time(T accessor, std::shared_ptr<t_column> col, std::string name,
std::int32_t cidx, t_dtype type, bool is_arrow);
std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update);

template <typename T>
void _fill_col_date(T accessor, std::shared_ptr<t_column> col, std::string name,
std::int32_t cidx, t_dtype type, bool is_arrow);
std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update);

template <typename T>
void _fill_col_bool(T accessor, std::shared_ptr<t_column> col, std::string name,
std::int32_t cidx, t_dtype type, bool is_arrow);
std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update);

template <typename T>
void _fill_col_string(T accessor, std::shared_ptr<t_column> col, std::string name,
std::int32_t cidx, t_dtype type, bool is_arrow);
std::int32_t cidx, t_dtype type, bool is_arrow, bool is_update);

/**
* Fills the table with data from language.
Expand All @@ -165,7 +165,7 @@ namespace binding {
*/
template <typename T>
void _fill_data(t_table& tbl, std::vector<std::string> ocolnames, T accessor,
std::vector<t_dtype> odt, std::uint32_t offset, bool is_arrow);
std::vector<t_dtype> odt, std::uint32_t offset, bool is_arrow, bool is_update);

/******************************************************************************
*
Expand Down Expand Up @@ -223,7 +223,7 @@ namespace binding {
* -------
* A gnode.
*/
std::shared_ptr<t_gnode> make_gnode(const t_table& table);
std::shared_ptr<t_gnode> make_gnode(const t_schema& iscm);

/**
* Create a populated table.
Expand Down
2 changes: 2 additions & 0 deletions cpp/perspective/src/include/perspective/gnode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ class PERSPECTIVE_EXPORT t_gnode {
bool was_updated() const;
void clear_updated();

t_uindex mapping_size() const;

// helper function for tests
std::shared_ptr<t_table> tstep(std::shared_ptr<const t_table> input_table);

Expand Down
Loading