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

B-0 fixed bugs in GridFSFile related to seeking and flushing current page #251

Closed
wants to merge 7 commits into from
Closed

B-0 fixed bugs in GridFSFile related to seeking and flushing current page #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8505754
B-0 fixed error on GridFS files when trying to seek into a position a…
Jul 24, 2015
69ed4b9
B-0 moved hack when calculating position of file for the purpose of f…
Jul 26, 2015
3c0f688
B-0 removed two unnecesary white spaces
Jul 26, 2015
246e6df
B-0 fixed problem with operator precedence when calculating of backin…
Jul 27, 2015
a77430a
B-0 added pos_after_read_write to gridfs file structure
Jul 27, 2015
45f7ffe
B-0 some tunning to the comment done
Jul 27, 2015
1b1f0f4
B-0 removed extra white space on comment
Jul 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/mongoc/mongoc-gridfs-file-private.h
View file
Open in desktop
Expand Up @@ -59,6 +59,7 @@ struct _mongoc_gridfs_file_t
const char *bson_content_type;
bson_t bson_aliases;
bson_t bson_metadata;
bool pos_after_read_write;
};


Expand Down
30 changes: 19 additions & 11 deletions src/mongoc/mongoc-gridfs-file.c
View file
Open in desktop
Expand Up @@ -197,6 +197,7 @@ _mongoc_gridfs_file_new_from_bson (mongoc_gridfs_t *gridfs,
file = bson_malloc0 (sizeof *file);

file->gridfs = gridfs;
file->pos_after_read_write = false;
bson_copy_to (data, &file->bson);

bson_iter_init (&iter, &file->bson);
Expand Down Expand Up @@ -295,6 +296,7 @@ _mongoc_gridfs_file_new (mongoc_gridfs_t *gridfs,

file->gridfs = gridfs;
file->is_dirty = 1;
file->pos_after_read_write = false;

if (opt->chunk_size) {
file->chunk_size = opt->chunk_size;
Expand Down Expand Up @@ -430,6 +432,7 @@ mongoc_gridfs_file_readv (mongoc_gridfs_file_t *file,

iov_pos += r;
file->pos += r;
file->pos_after_read_write = true;
bytes_read += r;

if (iov_pos == iov[i].iov_len) {
Expand Down Expand Up @@ -488,6 +491,7 @@ mongoc_gridfs_file_writev (mongoc_gridfs_file_t *file,

iov_pos += r;
file->pos += r;
file->pos_after_read_write = true;
bytes_written += r;

file->length = BSON_MAX (file->length, (int64_t)file->pos);
Expand All @@ -496,15 +500,7 @@ mongoc_gridfs_file_writev (mongoc_gridfs_file_t *file,
/** filled a bucket, keep going */
break;
} else {
/** flush the buffer, the next pass through will bring in a new page
*
* Our file pointer is now on the new page, so push it back one so
* that flush knows to flush the old page rather than a new one.
* This is a little hacky
*/
file->pos--;
_mongoc_gridfs_file_flush_page (file);
file->pos++;
}
}
}
Expand All @@ -523,6 +519,7 @@ _mongoc_gridfs_file_flush_page (mongoc_gridfs_file_t *file)
bool r;
const uint8_t *buf;
uint32_t len;
int32_t n;

ENTRY;
BSON_ASSERT (file);
Expand All @@ -534,12 +531,22 @@ _mongoc_gridfs_file_flush_page (mongoc_gridfs_file_t *file)
selector = bson_new ();

bson_append_value (selector, "files_id", -1, &file->files_id);
bson_append_int32 (selector, "n", -1, (int32_t)(file->pos / file->chunk_size));
/** Note when calculating page number:
*
* Our file pointer *could* be on the next byte to be read or written after a read or write operation,
* that in fact could be the next page when we cross the chunk_size boundary.
* So we will push it back by one byte when calculating "n" if pos_after_read_write is true
* to really flush the previous page.
* This is a little hacky and this trick has been moved from function mongoc_gridfs_file_writev().
* Before it was located in the "else" section of statement "if (iov_pos == iov[i].iov_len)" and implemented by
* decrementing file->pos by one and then re-incrementing it by one.
*/
bson_append_int32 (selector, "n", -1, n = (int32_t)((file->pos - (file->pos_after_read_write ? 1 : 0)) / file->chunk_size));

update = bson_sized_new (file->chunk_size + 100);

bson_append_value (update, "files_id", -1, &file->files_id);
bson_append_int32 (update, "n", -1, (int32_t)(file->pos / file->chunk_size));
bson_append_int32 (update, "n", -1, n);
bson_append_binary (update, "data", -1, BSON_SUBTYPE_BINARY, buf, len);

r = mongoc_collection_update (file->gridfs->chunks, MONGOC_UPDATE_UPSERT,
Expand Down Expand Up @@ -598,7 +605,7 @@ _mongoc_gridfs_file_refresh_page (mongoc_gridfs_file_t *file)
/* if we have a cursor, but the cursor doesn't have the chunk we're going
* to need, destroy it (we'll grab a new one immediately there after) */
if (file->cursor &&
!(file->cursor_range[0] >= n && file->cursor_range[1] <= n)) {
!(file->cursor_range[0] <= n && file->cursor_range[1] >= n)) {
mongoc_cursor_destroy (file->cursor);
file->cursor = NULL;
}
Expand Down Expand Up @@ -738,6 +745,7 @@ mongoc_gridfs_file_seek (mongoc_gridfs_file_t *file,
}

file->pos = offset;
file->pos_after_read_write = false;

return 0;
}
Expand Down