Code Cleanup

- Removed FEATURE_TDB_OPT conditional compilation.
This commit is contained in:
Paul Beckingham 2011-04-03 19:44:58 -04:00
parent 2ad3d0d449
commit 7961ca136f
2 changed files with 0 additions and 7 deletions

View file

@ -244,7 +244,6 @@ void TDB::unlock ()
// multiple files. // multiple files.
int TDB::load (std::vector <Task>& tasks, Filter& filter) int TDB::load (std::vector <Task>& tasks, Filter& filter)
{ {
#ifdef FEATURE_TDB_OPT
// Special optimization: if the filter contains Att ('status', '', 'pending'), // Special optimization: if the filter contains Att ('status', '', 'pending'),
// and no other 'status' filters, then loadCompleted can be skipped. // and no other 'status' filters, then loadCompleted can be skipped.
int numberStatusClauses = 0; int numberStatusClauses = 0;
@ -261,19 +260,14 @@ int TDB::load (std::vector <Task>& tasks, Filter& filter)
++numberSimpleStatusClauses; ++numberSimpleStatusClauses;
} }
} }
#endif
loadPending (tasks, filter); loadPending (tasks, filter);
#ifdef FEATURE_TDB_OPT
if (numberStatusClauses == 0 || if (numberStatusClauses == 0 ||
numberStatusClauses != numberSimpleStatusClauses) numberStatusClauses != numberSimpleStatusClauses)
loadCompleted (tasks, filter); loadCompleted (tasks, filter);
else else
context.debug ("load optimization short circuit"); context.debug ("load optimization short circuit");
#else
loadCompleted (tasks, filter);
#endif
return tasks.size (); return tasks.size ();
} }

View file

@ -27,7 +27,6 @@
#ifndef INCLUDED_MAIN #ifndef INCLUDED_MAIN
#define INCLUDED_MAIN #define INCLUDED_MAIN
#define FEATURE_TDB_OPT 1 // TDB Optimization reduces file I/O.
#define FEATURE_NEW_ID 1 // Echoes back new id. #define FEATURE_NEW_ID 1 // Echoes back new id.
//#define FEATURE_REGEX 1 // Enables regexes for attribute modifiers, //#define FEATURE_REGEX 1 // Enables regexes for attribute modifiers,
// // subst, general search. // // subst, general search.