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

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

Browse Source
This commit is contained in:
Ben Thompson
2019-04-04 17:03:09 -05:00
parent 4ec8e12266 d5dfe5ee67
commit 729953c273
23 changed files with 152 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MetadataFile.cpp
View File

@@ -225,7 +225,7 @@ vector<metadataObject> MetadataFile::metadataRead(off_t offset, size_t length) c
// find the first object in range
while (i != mObjects.end())
{
if (offset <= (i->offset + i->length - 1))
if ((uint64_t) offset <= (i->offset + i->length - 1))
break;
++i;
}
@@ -315,7 +315,7 @@ string MetadataFile::getNewKey(string sourceName, size_t offset, size_t length)
boost::uuids::uuid u = boost::uuids::random_generator()();
stringstream ss;
for (int i = 0; i < sourceName.length(); i++)
for (uint i = 0; i < sourceName.length(); i++)
{
if (sourceName[i] == '/')
{
@@ -341,7 +341,7 @@ string MetadataFile::getSourceFromKey(const string &key)
// this is to convert the munged filenames back to regular filenames
// for consistent use in IOC locks
for (int i = 0; i < split[3].length(); i++)
for (uint i = 0; i < split[3].length(); i++)
if (split[3][i] == '~')
split[3][i] = '/';