MCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp

equal deleted inserted replaced

-:ffb2d5dd62e9
+:ad31f4183ddc
 #include "thumbnailpanic.h"
 #include "thumbnailmanagerconstants.h"
 #include "thumbnailserver.h"
-_LIT8( KThumbnailSqlConfig, "page_size=32768; cache_size=32;" );
+_LIT8( KThumbnailSqlConfig, "page_size=32768; cache_size=64;" );
 const TInt KStreamBufferSize = 1024 * 8;
 const TInt KMajor = 3;
 const TInt KMinor = 2;
 // ---------------------------------------------------------------------------
 TInt CThumbnailStore::OpenDatabaseL( TBool aNewDatabase )
 {
 TN_DEBUG2( "CThumbnailStore::OpenDatabaseL() drive: %d", iDrive );
+CloseStatements();
 iDatabase.Close();
 iUnrecoverable = ETrue;
 TInt checkError = KErrNone;
 TInt blistError = KErrNone;
 User::LeaveIfError( iFs.Volume(volumeinfo, iDrive) );
 TUint id = volumeinfo.iUniqueID;
 TBuf<50> mediaid;
 mediaid.Num(id);
+CloseStatements();
 iDatabase.Close();
 iUnrecoverable = ETrue;
 TN_DEBUG1( "CThumbnailStore::RecreateDatabaseL() database closed" );
 }
 // delete db if not fully complete
 if (prepareErr < 0 || mediaidErr < 0)
 {
+CloseStatements();
 iDatabase.Close();
 TN_DEBUG1( "CThumbnailStore::RecreateDatabaseL() delete database" );
 TInt del = iDatabase.Delete(pathPtr);
 TN_DEBUG2( "CThumbnailStore::RecreateDatabaseL() deleted database, err: %d", del );
 }
 TInt paramIndex = 0;
 TInt found = KErrNotFound;
 TInt rowStatus = 0;
 TInt column = 0;
-TBool inTempTable = ETrue;
 TN_DEBUG1( "CThumbnailStore::FetchThumbnailL() -- TEMP TABLE lookup" );
 RSqlStatement* stmt = NULL;
 stmt = &iStmt_KThumbnailSelectTempInfoByPath;
 //if not found from temp table, look from real table
 if(rowStatus != KSqlAtRow)
 {
 TN_DEBUG1( "CThumbnailStore::FetchThumbnailL() -- MAIN TABLE lookup" );
-inTempTable = EFalse;
 CleanupStack::PopAndDestroy( stmt );
 stmt = &iStmt_KThumbnailSelectInfoByPath;
 CleanupStack::PushL(TCleanupItem(ResetStatement, stmt));
 // If thumbnail is marked as blacklisted and timestamp has
 // changed, delete thumbnails from tables and leave with
 // KErrNotFound to get thumbnail regenerated.
 column = 4;
 TInt flags = stmt->ColumnInt( column );
-if( flags & KThumbnailDbFlagBlacklisted && (*path).Length() )
+if( flags & KThumbnailDbFlagDeleted )
 {
-TBool modified = EFalse;
+CleanupStack::PopAndDestroy( stmt );
-CheckModifiedByPathL( aPath, inTempTable, modified );
-if( modified )
+// delete existing blacklisted thumbs
-{
+DeleteThumbnailsL(*path, ETrue);
-// Close db to get deletion of thumbnails executed.
-CleanupStack::PopAndDestroy( &stmt );
+CleanupStack::PopAndDestroy( path );
-DeleteThumbnailsL( *path );
 User::Leave( KErrNotFound );
 }
-else
+else if( flags & KThumbnailDbFlagBlacklisted )
 {
-User::Leave( KErrCompletion );
+CleanupStack::PopAndDestroy( stmt );
-}
+CleanupStack::PopAndDestroy( path );
+User::Leave( KErrCompletion );
 }
 else if( !(flags & KThumbnailDbFlagBlacklisted) )
 {
 found = KErrNone;
 column = 0;
 		//remove delete mark
 User::LeaveIfError( iDatabase.Exec( KThumbnailSqlDeleteFromDeleted ) );
 }
 else
 {
-TN_DEBUG1( "CThumbnailStore::DeleteThumbnailByPathL() -- add to Deleted" );
+TN_DEBUG1( "CThumbnailStore::DeleteThumbnailByPathL() -- MAIN TABLE lookup" );
-// only add path to deleted table
+stmt = &iStmt_KThumbnailSqlSelectRowIDInfoByPath;
-stmt = &iStmt_KThumbnailSqlInsertDeleted;
 CleanupStack::PushL(TCleanupItem(ResetStatement, stmt));
 paramIndex = stmt->ParameterIndex( KThumbnailSqlParamPath );
 User::LeaveIfError( paramIndex );
 User::LeaveIfError( stmt->BindText( paramIndex, *path ));
-count = stmt->Exec();
+rowStatus = stmt->Next();
 CleanupStack::PopAndDestroy( stmt );
+// there were matching rows in main table
+if (rowStatus == KSqlAtRow)
+{
+TN_DEBUG1( "CThumbnailStore::DeleteThumbnailByPathL() -- add to Deleted" );
+// only add path to deleted table
+stmt = &iStmt_KThumbnailSqlInsertDeleted;
+CleanupStack::PushL(TCleanupItem(ResetStatement, stmt));
+paramIndex = stmt->ParameterIndex( KThumbnailSqlParamPath );
+User::LeaveIfError( paramIndex );
+User::LeaveIfError( stmt->BindText( paramIndex, *path ));
+count = stmt->Exec();
+CleanupStack::PopAndDestroy( stmt );
+}
+else
+{
+TN_DEBUG1( "CThumbnailStore::DeleteThumbnailByPathL() -- no thumbs in MAIN" );
+}
 }
 if (aTransaction)
 {
 transaction.CommitL();
 StopAutoFlush();
 if(iBatchItemCount <= 0 || CheckDbState() != KErrNone)
 {
 // cache empty or db unusable
+TN_DEBUG1( "CThumbnailStore::FlushCacheTable() error ");
 return;
 }
 // longer flush allowed if MTP sync on
 TInt MPXHarvesting(0);
 {
 TN_DEBUG2( "CThumbnailStore::FlushCacheTable() error checking MTP sync: %d", ret);
 }
 //set init max flush delay
-TInt aMaxFlushDelay(KMaxFlushDelay);
+TReal32 aMaxFlushDelay(KMaxFlushDelay);
+TReal32 aPreviousFlushDelay(iPreviousFlushDelay);
+TReal32 aBatchFlushItemCount(iBatchFlushItemCount);
 if(MPXHarvesting)
 {
 //MTP or MPX harvesting active, allow longer flush -> bigger batch size
 TN_DEBUG1("CThumbnailStore::FlushCacheTable() MTP sync, longer flush..");
 }
 //1st item in batch
 if( iBatchItemCount == 1)
 {
+TN_DEBUG2("CThumbnailStore::FlushCacheTable() calculate new batch size iPreviousFlushDelay = %d", iPreviousFlushDelay);
 //adjust batch size dynamically between min and max based on previous flush speed
-if(iPreviousFlushDelay > 0 )
+if( iPreviousFlushDelay > 0 )
 {
-iBatchFlushItemCount = (aMaxFlushDelay/iPreviousFlushDelay)*iBatchFlushItemCount;
+TReal32 aNewBatchFlushItemCount = aMaxFlushDelay / aPreviousFlushDelay * aBatchFlushItemCount;
+iBatchFlushItemCount = (TInt)aNewBatchFlushItemCount;
-if(iBatchFlushItemCount < KMInBatchItems)
+TN_DEBUG2("CThumbnailStore::FlushCacheTable() aMaxFlushDelay %e", aMaxFlushDelay);
+TN_DEBUG2("CThumbnailStore::FlushCacheTable() aPreviousFlushDelay %e", aPreviousFlushDelay);
+			TN_DEBUG2("CThumbnailStore::FlushCacheTable() aBatchFlushItemCount %e", aBatchFlushItemCount);
+TN_DEBUG2("CThumbnailStore::FlushCacheTable() aNewBatchFlushItemCount %e", aNewBatchFlushItemCount);
+TN_DEBUG2("CThumbnailStore::FlushCacheTable() iBatchFlushItemCount %d", iBatchFlushItemCount);
+if( iBatchFlushItemCount < KMInBatchItems )
 {
 iBatchFlushItemCount = KMInBatchItems;
 }
-else if(iBatchFlushItemCount > KMaxBatchItems)
+else if( iBatchFlushItemCount > KMaxBatchItems )
 {
 iBatchFlushItemCount = KMaxBatchItems;
 }
 }
 else
 TBool finished = EFalse;
 TRAPD( err, finished = self->FileExistenceCheckL() );
 if (err != KErrNone)
 {
-TN_DEBUG2( "CThumbnailStore::MaintenanceTimerCallBack() - file existance check failed, err %d", err);
+TN_DEBUG2( "CThumbnailStore::MaintenanceTimerCallBack() - file existence check failed, err %d", err);
 return err;
 }
 // all files checked.
 if (finished)
 {
-TN_DEBUG2( "CThumbnailStore::MaintenanceTimerCallBack() - file existance check finished, store %d", self->iDrive);
+TN_DEBUG2( "CThumbnailStore::MaintenanceTimerCallBack() - file existence check finished, store %d", self->iDrive);
 self->iCheckFilesExist = EFalse;
 }
 }
 // next round
 }
 else if (oldModified == aModified)
 {
 TN_DEBUG1( "CThumbnailStore::CheckModifiedL() -- timestamp is the same as original" );
 }
-}
+rowStatus = stmt->Next();
-rowStatus = stmt->Next();
+}
 //switch to main table if modified not found from temp
 if(rowStatus != KSqlAtRow && !checkMain && !modifiedChanged)
 {
 TN_DEBUG1( "CThumbnailStore::CheckModifiedL() -- main" );

branch	RCL_3
changeset 14	ad31f4183ddc
parent 13	ffb2d5dd62e9
child 15	f0aa341a25bf