1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

Eventually found the problem with rename(). Was calling

::unlink() instead of our unlink/remove.
This commit is contained in:
Patrick LeBlanc
2019-04-10 15:01:29 -05:00
parent c0f93d904a
commit dfc29fa833
4 changed files with 9 additions and 3 deletions

View File

@ -20,6 +20,8 @@
#include "SMFileFactory.h" #include "SMFileFactory.h"
#include "SMDataFile.h" #include "SMDataFile.h"
#include "SMComm.h" #include "SMComm.h"
#include "BufferedFile.h"
#include "IDBDataFile.h"
using namespace std; using namespace std;
@ -28,6 +30,10 @@ namespace idbdatafile {
IDBDataFile* SMFileFactory::open(const char *filename, const char *mode, unsigned opts, unsigned colWidth) IDBDataFile* SMFileFactory::open(const char *filename, const char *mode, unsigned opts, unsigned colWidth)
{ {
// TODO, test whether this breaks anything.
//if (opts & IDBDataFile::USE_TMPFILE)
// return new BufferedFile(filename, mode, opts);
bool _read = false; bool _read = false;
bool _write = false; bool _write = false;
bool create = false; bool create = false;

View File

@ -68,7 +68,7 @@ int SMFileSystem::rename(const char *oldFile, const char *newFile)
int err = copyFile(oldFile, newFile); int err = copyFile(oldFile, newFile);
if (err) if (err)
return err; return err;
err = unlink(oldFile); err = this->remove(oldFile);
return err; return err;
} }

View File

@ -110,7 +110,6 @@ vector<IDBDataFile::Types> IDBFactory::listPlugins()
IDBDataFile* IDBFactory::open(IDBDataFile::Types type, const char* fname, const char* mode, unsigned opts, unsigned colWidth) IDBDataFile* IDBFactory::open(IDBDataFile::Types type, const char* fname, const char* mode, unsigned opts, unsigned colWidth)
{ {
/* If this is a tmp file, ie opts & USE_TMPFILE, might want to force that to be a local file */
if ( s_plugins.find(type) == s_plugins.end() ) if ( s_plugins.find(type) == s_plugins.end() )
{ {
ostringstream oss; ostringstream oss;

View File

@ -1889,7 +1889,8 @@ void SlaveComm::do_vbRollback1(ByteStream& msg)
if (!standalone) if (!standalone)
master.write(reply); master.write(reply);
takeSnapshot = true; //takeSnapshot = true;
doSaveDelta = true;
} }
void SlaveComm::do_vbRollback2(ByteStream& msg) void SlaveComm::do_vbRollback2(ByteStream& msg)