mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQL changes. Updated everything so that it builds on Windows and uses the new FTK interfaces.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@674 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-07-17 20:35:20 +00:00
parent e18750d9eb
commit dae150e693
32 changed files with 427 additions and 1373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sql/src/flbackup.cpp
View File

@@ -86,10 +86,10 @@ private:
RCODE _setup( void);
static RCODE readThread(
static RCODE FLMAPI readThread(
IF_Thread * pThread);
static RCODE writeThread(
static RCODE FLMAPI writeThread(
IF_Thread * pThread);
// Data
@@ -1094,7 +1094,8 @@ RCODE F_DbSystem::dbRestore(
goto Exit;
}
if( RC_BAD( rc = pSFile->setup( &SFileClient)))
if( RC_BAD( rc = pSFile->setup( &SFileClient, gv_SFlmSysData.pFileHdlCache,
gv_SFlmSysData.uiFileOpenFlags, gv_SFlmSysData.uiFileCreateFlags)))
{
goto Exit;
}
@@ -1618,7 +1619,7 @@ FSTATIC RCODE flmRestoreFile(
// Compare the incremental backup sequence number to the value in the
// database's DB header.
if( RC_BAD( rc = pSFile->readHeader( 0, sizeof( SFLM_DB_HDR),
if( RC_BAD( rc = pSFile->readBlock( 0, sizeof( SFLM_DB_HDR),
&dbHdr, &uiTmp)))
{
goto Exit;
@@ -1680,7 +1681,7 @@ FSTATIC RCODE flmRestoreFile(
// Write the database header
if( RC_BAD( rc = pSFile->writeHeader( 0,
if( RC_BAD( rc = pSFile->writeBlock( 0,
uiBlockSize, pucBlkBuf, &uiBytesWritten)))
{
goto Exit;
@@ -1754,22 +1755,8 @@ FSTATIC RCODE flmRestoreFile(
// Write the block to the database
#ifdef FLM_UNIX
// Unix systems can have sector sizes that are larger than our
// typical 4K database blocks. The Unix implementation of SectorWrite
// (called by WriteBlock) will write the passed-in block and clobber any
// additional data beyond the end of the block to the end of the sector if
// it has enough room in the block buffer to write a full sector. If the
// block buffer is less than a full sector, the Unix SectorWrite will only
// write out the amount requested, not a full sector.
if( RC_BAD( rc = pSFile->writeBlock( uiBlkAddr,
uiBlockSize, pucBlkBuf, NULL, &uiBytesWritten)))
#else
if( RC_BAD( rc = pSFile->writeBlock( uiBlkAddr,
uiBlockSize, pucBlkBuf, NULL, &uiBytesWritten)))
#endif
uiBlockSize, pucBlkBuf, &uiBytesWritten)))
{
if( rc == NE_FLM_IO_PATH_NOT_FOUND ||
rc == NE_FLM_IO_INVALID_FILENAME)
@@ -1787,13 +1774,8 @@ FSTATIC RCODE flmRestoreFile(
goto Exit;
}
#ifdef FLM_UNIX
if( RC_BAD( rc = pSFile->writeBlock( uiBlkAddr,
uiBlockSize, pucBlkBuf, NULL, &uiBytesWritten)))
#else
if( RC_BAD( rc = pSFile->writeBlock( uiBlkAddr,
uiBlockSize, pucBlkBuf, NULL, &uiBytesWritten)))
#endif
uiBlockSize, pucBlkBuf, &uiBytesWritten)))
{
goto Exit;
}
@@ -2512,7 +2494,7 @@ Exit:
/****************************************************************************
Desc: This thread writes data in the background
****************************************************************************/
RCODE F_BackerStream::writeThread(
RCODE FLMAPI F_BackerStream::writeThread(
IF_Thread * pThread)
{
F_BackerStream * pBackerStream = (F_BackerStream *)pThread->getParm1();