database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-15 12:09:09 +03:00
Code Activity

Fixed a couple things I noticed. Also allowed it to

Browse Source 
return a partial result in some easy cases.
This commit is contained in:
Patrick LeBlanc
2019-03-28 09:20:37 -05:00
parent 63a8897489
commit 28ccac81c4
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/IOCoordinator.cpp
View File

@@ -111,8 +111,8 @@ int IOCoordinator::loadObjectAndJournal(const char *objFilename, const char *jou
int IOCoordinator::read(const char *filename, uint8_t *data, off_t offset, size_t length) int IOCoordinator::read(const char *filename, uint8_t *data, off_t offset, size_t length)
{ {
/* /*
This is a bit complex and verbose, so for the first cut, it won't bother returning This is a bit complex and verbose, so for the first cut, it will only return a partial
a partial result. If an error happens, it will just fail the whole operation. result where that is easy to do. Otherwise it will return an error.
*/ */
/* /*
@@ -195,20 +195,25 @@ int IOCoordinator::read(const char *filename, uint8_t *data, off_t offset, size_
// if this is the last object, the length of the read is length - count, // if this is the last object, the length of the read is length - count,
// otherwise it is the length of the object // otherwise it is the length of the object
size_t thisLength = min(object.length, count - length); size_t thisLength = min(object.length, length - count);
if (jit == journalFDs.end()) if (jit == journalFDs.end())
err = loadObject(objectFDs[object.key], &data[count], thisOffset, thisLength); err = loadObject(objectFDs[object.key], &data[count], thisOffset, thisLength);
else else
err = loadObjectAndJournal(keyToObjectName[object.key].c_str(), keyToJournalName[object.key].c_str(), err = loadObjectAndJournal(keyToObjectName[object.key].c_str(), keyToJournalName[object.key].c_str(),
&data[count], thisOffset, thisLength); &data[count], thisOffset, thisLength);
if (err) if (err)
return -1; {
if (count == 0)
return -1;
else
return count;
}
count += thisLength; count += thisLength;
} }
// all done // all done
return length; return count;
/* /*
int fd, err; int fd, err;