1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-13 23:02:14 +03:00

Merge branch 'develop' of github.com:pleblanc1976/storage-manager into develop

This commit is contained in:
Patrick LeBlanc
2019-04-12 15:12:27 -05:00

View File

@@ -282,7 +282,7 @@ int IOCoordinator::_write(const char *filename, const uint8_t *data, off_t offse
objectOffset = 0;
}
cache->makeSpace(writeLength+JOURNAL_ENTRY_HEADER_SIZE);
err = replicator->addJournalEntry(i->key.c_str(),&data[count],objectOffset,writeLength);
assert((uint) err == writeLength);
@@ -373,6 +373,7 @@ int IOCoordinator::append(const char *filename, const uint8_t *data, size_t leng
errno = EBADF;
return -1;
}
uint64_t offset = metadata.getLength();
//read metadata determine if this fits in the last object