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

Jump to bottom

fix raw read short read #60

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix raw read short read #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a153794
raw read seperated from strings
c-bik Jun 18, 2018
986a192
fixes RAW de-alloc at stmt close
c-bik Jun 18, 2018
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
26 changes: 22 additions & 4 deletions c_src/erloci_lib/ocistmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,10 +477,15 @@ unsigned int ocistmt::execute(void * column_list, void * rowid_list, void * out_
OCIDEF(SQLT_STR, "SQLT_STR");
break;
case SQLT_BIN: // RAW
cur_clm.row_valp = new unsigned char[cur_clm.dlen + 1];
memset(cur_clm.row_valp, 0, (cur_clm.dlen + 1)*sizeof(unsigned char));
cur_clm.rtype = LCL_DTYPE_NONE;
OCIDEF(SQLT_BIN, "SQLT_BIN");
// There isn't any allocator for OCIRaw specially, OCIRawResize to tricked to allocate to max possible
// full length of the column (cur_clm.dlen)
checkerr(&r, OCIRawResize(envhp, (OCIError*)_errhp, (ub2)cur_clm.dlen, (OCIRaw **)&(cur_clm.row_valp)));
if (r.fn_ret != SUCCESS) {
REMOTE_LOG(ERR, "failed OCIRawResize error %s (%s)\n", r.gerrbuf, _stmtstr);
ocisess->release_stmt(this);
throw r;
}
OCIDEF(SQLT_LVB, "SQLT_LVB");
break;
// 5 bytes buffer
case SQLT_INTERVAL_YM:
Expand Down Expand Up @@ -972,6 +977,12 @@ intf_ret ocistmt::rows(void * row_list, unsigned int maxrowcount)
break;
}
case SQLT_BIN:
(*intf.append_string_to_list)(
(char*)OCIRawPtr(envhp, (OCIRaw*)_columns[i]->row_valp),
(size_t)OCIRawSize(envhp, (OCIRaw*)_columns[i]->row_valp),
row
);
break;
case SQLT_RID:
case SQLT_AFC:
case SQLT_STR: {
Expand Down Expand Up @@ -1119,6 +1130,13 @@ ocistmt::~ocistmt(void)
checkerr(&r, OCIObjectFree((OCIEnv*)ocisession::getenv(), (OCIError*)_errhp, (dvoid*)(_columns[i]->row_valp), OCI_OBJECTFREE_FORCE | OCI_OBJECTFREE_NONULL));
if(r.fn_ret != SUCCESS)
REMOTE_LOG(ERR, "failed OCIObjectFree for %p column %d reason %s (%s)\n", _stmthp, i, r.gerrbuf, _stmtstr);
} else if (_columns[i]->dtype == SQLT_BIN) {
// There isn't any de-allocator for OCIRaw specially, OCIRawResize to tricked to de-allocate
// by requesting it to resize to zero
checkerr(&r, OCIRawResize((OCIEnv*)ocisession::getenv(), (OCIError*)_errhp, 0, (OCIRaw **)&(_columns[i]->row_valp)));
if (r.fn_ret != SUCCESS) {
REMOTE_LOG(ERR, "failed OCIRawResize for %p column %d reason %s (%s)\n", _stmthp, i, r.gerrbuf, _stmtstr);
}
} else {
if(_columns[i]->rtype == LCL_DTYPE_NONE)
delete (char*)(_columns[i]->row_valp);
Expand Down