Skip to content

bpo-24905: Support BLOB incremental I/O in sqlite module #271

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
palaviv wants to merge 18 commits into from
Closed

bpo-24905: Support BLOB incremental I/O in sqlite module #271

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4fa0e91
support BLOB incremental I/O in sqlite module
palaviv Feb 24, 2017
3fe9108
Note that blob size cannot be changed using the blob object
palaviv Feb 25, 2017
865c1c8
Use assertRaises in tests
palaviv Feb 25, 2017
788fd54
Fix doc error
palaviv Feb 25, 2017
a1361e5
blob support sequence protocol
palaviv Mar 4, 2017
5aedfba
Calculate blob length once at creation
palaviv Mar 4, 2017
db6ef32
Add initial Doc for sequence protocol
palaviv Mar 4, 2017
219f4cb
Don't support blob operation
palaviv Apr 18, 2018
6dafe0e
move news entry to blurb
palaviv Apr 18, 2018
ffac901
Add blob to PCBuild
palaviv Apr 18, 2018
3475fa1
Update version
palaviv May 8, 2019
f6015ff
Fix memory leak
palaviv May 8, 2019
01e526c
Update version
palaviv Jul 29, 2020
354bebf
Fix CR comments in documentation and testing
palaviv Aug 3, 2020
9709456
Fix CR comments in code
palaviv Aug 3, 2020
e6e5099
Make readonly and dbname keyword arguements only
palaviv Aug 3, 2020
e9a8080
Fix more CR comments
palaviv Aug 3, 2020
d4fb1b5
Add more indicative error on write bigger then blob length
palaviv Aug 3, 2020
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
Prev Previous commit
Next Next commit
Fix more CR comments
  • Loading branch information
@palaviv
palaviv committed Aug 3, 2020
commit e9a80800f0883de7e3b9fb34ca1b8172fd745460
16 changes: 8 additions & 8 deletions Modules/_sqlite/blob.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,19 +257,19 @@ PyObject* pysqlite_blob_seek(pysqlite_Blob *self, PyObject *args)
offset = self->length + offset;
break;
default:
return PyErr_Format(PyExc_ValueError,
return PyErr_SetString(PyExc_ValueError,
"from_what should be 0, 1 or 2");
}

if (offset < 0 || offset > self->length) {
return PyErr_Format(PyExc_ValueError, "offset out of blob range");
return PyErr_SetString(PyExc_ValueError, "offset out of blob range");
}

self->offset = offset;
Py_RETURN_NONE;

overflow:
return PyErr_Format(PyExc_OverflowError, "seek offset result in overflow");
return PyErr_SetString(PyExc_OverflowError, "seek offset result in overflow");
}


Expand Down Expand Up @@ -332,7 +332,7 @@ static int pysqlite_blob_contains(pysqlite_Blob *self, PyObject *args)
{
if (pysqlite_check_blob(self)) {
PyErr_SetString(PyExc_SystemError,
"Blob don't support cotains operation");
"Blob don't support contains operation");
}
return -1;
}
Expand Down Expand Up @@ -407,11 +407,11 @@ static PyObject * pysqlite_blob_subscript(pysqlite_Blob *self, PyObject *item)
return NULL;
}

if (slicelen <= 0)
if (slicelen <= 0) {
return PyBytes_FromStringAndSize("", 0);
else if (step == 1)
} else if (step == 1) {
return inner_read(self, slicelen, start);
else {
} else {
char *result_buf = (char *)PyMem_Malloc(slicelen);
char *data_buff = NULL;
Py_ssize_t cur, i;
Expand Down Expand Up @@ -586,7 +586,7 @@ static int pysqlite_blob_ass_subscript(pysqlite_Blob *self, PyObject *item, PyOb
}
else {
PyErr_SetString(PyExc_TypeError,
"mmap indices must be integer");
"Blob indices must be integer");
return -1;
}
}
Expand Down