Skip to content

SQLRowCount: always return row set size #182

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

Merged
merged 1 commit into from
Sep 5, 2019
Merged

SQLRowCount: always return row set size #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 22 additions & 20 deletions driver/queries.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4040,28 +4040,30 @@ SQLRETURN EsSQLRowCount(_In_ SQLHSTMT StatementHandle, _Out_ SQLLEN *RowCount)
RET_HDIAGS(stmt, SQL_STATE_HY010);
}

if (STMT_HAS_CURSOR(stmt)) {
/* fetch_size or scroller size chunks the result */
ERRH(stmt, "can't evaluate the total size of paged result set.");
/* returning a _WITH_INFO here will fail the query for MSQRY32. */
# if 0
RET_HDIAG(stmt, SQL_STATE_01000, "row count is for partial result "
"only", 0);
# endif /* 0 */
*RowCount = 0;
if (stmt->rset.pack_json) {
*RowCount = UJLengthArray(stmt->rset.pack.json.rows_obj);
} else {
if (stmt->rset.pack_json) {
*RowCount = UJLengthArray(stmt->rset.pack.json.rows_obj);
} else {
res = cbor_get_array_count(stmt->rset.pack.cbor.rows_obj, &nrows);
if (res != CborNoError) {
ERRH(stmt, "failed to read row array count: %s.",
cbor_error_string(res));
RET_HDIAGS(stmt, SQL_STATE_HY000);
}
*RowCount = (SQLLEN)nrows;
res = cbor_get_array_count(stmt->rset.pack.cbor.rows_obj, &nrows);
if (res != CborNoError) {
ERRH(stmt, "failed to read row array count: %s.",
cbor_error_string(res));
RET_HDIAGS(stmt, SQL_STATE_HY000);
}
DBGH(stmt, "result set rows count: %zd.", *RowCount);
*RowCount = (SQLLEN)nrows;
}
DBGH(stmt, "result set rows count: %zd.", *RowCount);

/* Log a warning if a cursor is present.
* Note: ES/SQL can apparently attach a cursor even for SYS queries and no
* restrictive max fetch row count. Since this function is now also called
* while attaching types during bootstrapping, it shouldn't fail if a
* cursor is attached. This assumes however that ES will never return just
* a cursor (and no rows) on a first page. */
if (STMT_HAS_CURSOR(stmt)) {
/* fetch_size or scroller size will chunk the result */
WARNH(stmt, "can't evaluate the total size of paged result set.");
RET_HDIAG(stmt, SQL_STATE_01000, "row count is for current row set "
"only", 0);
}

return SQL_SUCCESS;
Expand Down