vaclavt/usql
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crash fix in distinct (strict weak ordering)

Browse Source
This commit is contained in:
vaclavt
2022-05-31 19:25:47 +02:00
parent 33f7cba493
commit a063e14f3e
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Readme.md
View File

@@ -1,10 +1,8 @@
### WIP ### WIP
compare in row.cpp shoud take into account m_visible
### TODO ### TODO
- create local_install.sh - create local_install.sh
- change float type keyword to double and in code functions too - change float type keyword to double and in code functions too
- add functions: - add functions:

3
row.cpp
View File

@@ -157,9 +157,6 @@ void Row::setColumnValue(ColDefNode *col_def, ValueNode *col_value) {
int Row::compare(const Row &other) const { int Row::compare(const Row &other) const {
for (size_t ci = 0; ci < m_columns.size(); ci++) { for (size_t ci = 0; ci < m_columns.size(); ci++) {
// CRASHES HERE
// auto a = this->operator[](ci).getStringValue();
// auto b = other[ci].getStringValue();
int cmp = this->operator[](ci).compare(other[ci]); int cmp = this->operator[](ci).compare(other[ci]);
if (cmp != 0) return cmp; if (cmp != 0) return cmp;
} }

3
usql_dml.cpp
View File

@@ -155,8 +155,7 @@ void USql::setup_order_columns(std::vector<ColOrderNode> &node, Table *table) {
void USql::execute_distinct(SelectFromTableNode &node, Table *result) { void USql::execute_distinct(SelectFromTableNode &node, Table *result) {
if (!node.distinct) return; if (!node.distinct) return;
auto compare_rows = [](const Row &a, const Row &b) { return a.compare(b) >= 0; }; std::sort(result->m_rows.begin(), result->m_rows.end(), [](const Row &a, const Row &b) { return a.compare(b) > 0; });
std::sort(result->m_rows.begin(), result->m_rows.end(), compare_rows);
result->m_rows.erase(std::unique(result->m_rows.begin(), result->m_rows.end()), result->m_rows.end()); result->m_rows.erase(std::unique(result->m_rows.begin(), result->m_rows.end()), result->m_rows.end());
} }