X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=framework%2Fmain%2Fclasses%2Fdatabase%2Fbackend%2Flfdb_legacy%2Fclass_CachedLocalFileDatabase.php;h=593f9b702dc2f6234f8f8c37f7c4322b6586ee21;hb=HEAD;hp=2e47f6fb718d98bdb2c38652cb57242b6690efcf;hpb=a60894f1d6ef33613d2d0351075aa07aa257f304;p=core.git

diff --git a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php
index 2e47f6fb..b82baad5 100644
--- a/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php
+++ b/framework/main/classes/database/backend/lfdb_legacy/class_CachedLocalFileDatabase.php
@@ -3,16 +3,25 @@
 namespace Org\Mxchange\CoreFramework\Database\Backend\Lfdb;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Criteria\Criteria;
 use Org\Mxchange\CoreFramework\Criteria\Local\LocalSearchCriteria;
 use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria;
 use Org\Mxchange\CoreFramework\Database\Backend\BaseDatabaseBackend;
 use Org\Mxchange\CoreFramework\Database\Backend\DatabaseBackend;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Database\Sql\SqlException;
+use Org\Mxchange\CoreFramework\EntryPoint\ApplicationEntryPoint;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filesystem\FileNotFoundException;
 use Org\Mxchange\CoreFramework\Generic\FrameworkException;
+use Org\Mxchange\CoreFramework\Generic\FrameworkInterface;
+use Org\Mxchange\CoreFramework\Result\Database\BaseDatabaseResult;
+use Org\Mxchange\CoreFramework\Traits\Compressor\Channel\CompressorChannelTrait;
+use Org\Mxchange\CoreFramework\Traits\Handler\Io\IoHandlerTrait;
 
 // Import SPL stuff
+use \BadMethodCallException;
+use \InvalidArgumentException;
 use \SplFileInfo;
 
 /**
@@ -26,7 +35,7 @@ use \SplFileInfo;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -44,6 +53,10 @@ use \SplFileInfo;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBackend {
+	// Load traits
+	use CompressorChannelTrait;
+	use IoHandlerTrait;
+
 	/**
 	 * The file's extension
 	 */
@@ -57,7 +70,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	/**
 	 * The last read file's content including header information
 	 */
-	private $lastContents = array();
+	private $lastContents = [];
 
 	/**
 	 * Whether the "connection is already up
@@ -67,20 +80,26 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	/**
 	 * Table information array
 	 */
-	private $tableInfo = array();
+	private $tableInfo = [];
 
 	/**
 	 * Element for index
 	 */
 	private $indexKey = '__idx';
 
+	/**
+	 * Cached file names based on table name to avoid "expensive" invocations
+	 * of FrameworkConfiguration->getConfigEntry().
+	 */
+	private $pathNames = [];
+
 	/**
 	 * The protected constructor. Do never instance from outside! You need to
 	 * set a local file path. The class will then validate it.
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -93,24 +112,20 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 */
 	public static final function createCachedLocalFileDatabase () {
 		// Get an instance
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: CALLED!');
 		$databaseInstance = new CachedLocalFileDatabase();
 
-		// Get a new compressor channel instance
-		$compressorInstance = ObjectFactory::createObjectByConfiguredName('compressor_channel_class');
-
 		// Set the compressor channel
-		$databaseInstance->setCompressorChannel($compressorInstance);
-
-		// Get a file IO handler
-		$fileIoInstance = ObjectFactory::createObjectByConfiguredName('file_io_class');
+		$databaseInstance->setCompressorChannelInstance(ObjectFactory::createObjectByConfiguredName('compressor_channel_class'));
 
-		// ... and set it
-		$databaseInstance->setFileIoInstance($fileIoInstance);
+		// Get a file IO handler and set it
+		$databaseInstance->setFileIoInstance(ObjectFactory::createObjectByConfiguredName('file_io_class'));
 
 		// "Connect" to the database
 		$databaseInstance->connectToDatabase();
 
 		// Return database instance
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: databaseInstance=%s - EXIT!', $databaseInstance->__toString()));
 		return $databaseInstance;
 	}
 
@@ -179,24 +194,26 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 * @return	$dataArray
 	 */
 	private function getDataArrayFromFile (SplFileInfo $infoInstance) {
-		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: Reading elements from database file ' . $infoInstance . ' ...');
-
 		// Init compressed data
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: infoInstance=%s - CALLED!', $infoInstance->__toString()));
 		$compressedData = $this->getFileIoInstance()->loadFileContents($infoInstance);
-		$compressedData = $compressedData['data'];
+
+		// Is it valid?
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CACHED-LOCAL-FILE-DATABASE: compressedData[]=%s', gettype($compressedData)));
+		//* DEBUG-DIE: */ die(sprintf('[%s:%d]: compressedData=%s', __METHOD__, __LINE__, print_r($compressedData, TRUE)));
+		if (!isset($compressedData['data'])) {
+			// Important element not found
+			ApplicationEntryPoint::exitApplication(sprintf('compressedData()=%d has no element "data"', count($compressedData)), FrameworkInterface::EXCEPTION_OUT_OF_BOUNDS);
+		}
 
 		// Decompress it
-		$serializedData = $this->getCompressorChannel()->getCompressor()->decompressStream($compressedData);
+		$serializedData = $this->getCompressorChannelInstance()->getCompressor()->decompressStream($compressedData['data']);
 
 		// Unserialize it
 		$dataArray = json_decode($serializedData, true);
 
-		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: Read ' . count($dataArray) . ' elements from database file ' . $infoInstance . '.');
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: dataArray=' . print_r($dataArray, true));
-
 		// Finally return it
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: dataArray()=%d - EXIT!', count($dataArray)));
 		return $dataArray;
 	}
 
@@ -208,21 +225,16 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 * @return	void
 	 */
 	private function writeDataArrayToFqfn (SplFileInfo $infoInstance, array $dataArray) {
-		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: Flushing ' . count($dataArray) . ' elements to database file ' . $infoInstance . ' ...');
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: dataArray=' . print_r($dataArray, true));
-
 		// Serialize and compress it
-		$compressedData = $this->getCompressorChannel()->getCompressor()->compressStream(json_encode($dataArray));
-
-		// Write data
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: Writing ' . strlen($compressedData) . ' bytes ...');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: Flushing ' . count($dataArray) . ' elements to database file ' . $infoInstance . ' ...');
+		$compressedData = $this->getCompressorChannelInstance()->getCompressor()->compressStream(json_encode($dataArray));
 
 		// Write this data BASE64 encoded to the file
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CACHED-LOCAL-FILE-DATABASE: Writing ' . strlen($compressedData) . ' bytes ...');
 		$this->getFileIoInstance()->saveStreamToFile($infoInstance, $compressedData, $this);
 
-		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: Flushing ' . count($dataArray) . ' elements to database file completed.');
+		// Trace message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: Flushing ' . count($dataArray) . ' elements to database file completed.');
 	}
 
 	/**
@@ -233,12 +245,14 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 */
 	private function getContentsFromTableInfoFile (StoreableCriteria $dataSetInstance) {
 		// Default content is no data
-		$infoArray = array();
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: dataSetInstance=%s - CALLED!', $dataSetInstance->__toString()));
+		$infoArray = [];
 
 		// Create FQFN for getting the table information file
 		$infoInstance = $this->generateFileFromDataSet($dataSetInstance, 'info');
 
 		// Get the file contents
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: infoInstance=%s', $infoInstance->__toString()));
 		try {
 			$infoArray = $this->getDataArrayFromFile($infoInstance);
 		} catch (FileNotFoundException $e) {
@@ -246,6 +260,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 		}
 
 		// ... and return it
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: infoArray()=%d - EXIT!', count($infoArray)));
 		return $infoArray;
 	}
 
@@ -256,11 +271,13 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 * @param	$rowName			Name of the row
 	 * @return	$infoInstance		An instance of a SplFileInfo class
 	 */
-	private function generateFileFromDataSet (Criteria $dataSetInstance, $rowName) {
+	private function generateFileFromDataSet (Criteria $dataSetInstance, string $rowName) {
 		// Instanciate new file object
-		$infoInstance = new SplFileInfo($this->getConfigInstance()->getConfigEntry('local_database_path') . $dataSetInstance->getTableName() . DIRECTORY_SEPARATOR . $rowName . '.' . $this->getFileExtension());
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: dataSetInstance=%s,rowName=%s - CALLED!', $dataSetInstance->__toString(), $rowName));
+		$infoInstance = new SplFileInfo(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('local_database_path') . $dataSetInstance->getTableName() . DIRECTORY_SEPARATOR . $rowName . '.' . $this->getFileExtension());
 
 		// Return it
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: infoInstance=%s - EXIT!', $infoInstance->__toString()));
 		return $infoInstance;
 	}
 
@@ -271,18 +288,27 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 * @return	void
 	 */
 	private function createTableInfoFile (StoreableCriteria $dataSetInstance) {
-		// Create FQFN for creating the table information file
-		$infoInstance = $this->generateFileFromDataSet($dataSetInstance, 'info');
+		// Get table name
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: dataSetInstance=%s - CALLED!', $dataSetInstance->__toString()));
+		$tableName = $dataSetInstance->getTableName();
 
 		// Get the data out from dataset in a local array
-		$this->tableInfo[$dataSetInstance->getTableName()] = array(
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: tableName=%', $tableName));
+		$this->tableInfo[$tableName] = [
 			'primary'      => $dataSetInstance->getPrimaryKey(),
 			'created'      => time(),
-			'last_updated' => time()
-		);
+			'last_updated' => time(),
+		];
+
+		// Get info instance
+		$infoInstance = $this->generateFileFromDataSet($dataSetInstance, 'info');
 
 		// Write the data to the file
-		$this->writeDataArrayToFqfn($infoInstance, $this->tableInfo[$dataSetInstance->getTableName()]);
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: Invoking this->writeDataArrayToFqfn(%s,this->tableInfo[%s]()=%d) ...', $infoInstance->__toString(), $tableName, count($this->tableInfo[$tableName])));
+		$this->writeDataArrayToFqfn($infoInstance, $this->tableInfo[$tableName]);
+
+		// Trace message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: EXIT!');
 	}
 
 	/**
@@ -293,17 +319,24 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 */
 	private function updateTableInfoFile (StoreableCriteria $dataSetInstance) {
 		// Get table name from criteria
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: dataSetInstance=%s - CALLED!', $dataSetInstance->__toString()));
 		$tableName = $dataSetInstance->getTableName();
 
 		// Create FQFN for creating the table information file
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: tableName=%', $tableName));
 		$infoInstance = $this->generateFileFromDataSet($dataSetInstance, 'info');
 
 		// Get the data out from dataset in a local array
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: infoInstance=%s', $infoInstance->__toString()));
 		$this->tableInfo[$tableName]['primary']      = $dataSetInstance->getPrimaryKey();
 		$this->tableInfo[$tableName]['last_updated'] = time();
 
 		// Write the data to the file
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: Invoking this->writeDataArrayToFqfn(%s,this->tableInfo[%s]()=%d) ...', $infoInstance->__toString(), $tableName, count($this->tableInfo[$tableName])));
 		$this->writeDataArrayToFqfn($infoInstance, $this->tableInfo[$tableName]);
+
+		// Trace message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: EXIT!');
 	}
 
 	/**
@@ -314,23 +347,31 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 */
 	private function updatePrimaryKey (StoreableCriteria $dataSetInstance) {
 		// Get table name from criteria
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: dataSetInstance=%s - CALLED!', $dataSetInstance->__toString()));
 		$tableName = $dataSetInstance->getTableName();
 
 		// Get the information array from lower method
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CACHED-LOCAL-FILE-DATABASE: tableName=%s', $tableName));
 		$infoArray = $this->getContentsFromTableInfoFile($dataSetInstance);
 
 		// Is the primary key there?
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: tableInfo=' . print_r($this->tableInfo, true));
+		//* PRINTR-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('CACHED-LOCAL-FILE-DATABASE: tableInfo=' . print_r($this->tableInfo, true));
 		if (!isset($this->tableInfo[$tableName]['primary'])) {
 			// Then create the info file
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CACHED-LOCAL-FILE-DATABASE: Creating info table for tableName=%s ...', $tableName));
 			$this->createTableInfoFile($dataSetInstance);
-		} elseif (($this->getConfigInstance()->getConfigEntry('db_update_primary_forced') == 'Y') && ($dataSetInstance->getPrimaryKey() != $this->tableInfo[$tableName]['primary'])) {
+		} elseif (FrameworkBootstrap::getConfigurationInstance()->isEnabled('db_update_primary_forced') && $dataSetInstance->getPrimaryKey() != $this->tableInfo[$tableName]['primary']) {
 			// Set the array element
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CACHED-LOCAL-FILE-DATABASE: Setting primaryKey=%s for tableName=%s ...', $dataSetInstance->getPrimaryKey(), $tableName));
 			$this->tableInfo[$tableName]['primary'] = $dataSetInstance->getPrimaryKey();
 
 			// Update the entry
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('CACHED-LOCAL-FILE-DATABASE: Updating info table for tableName=%s ...', $tableName));
 			$this->updateTableInfoFile($dataSetInstance);
 		}
+
+		// Trace message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: EXIT!');
 	}
 
 	/**
@@ -340,6 +381,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 * @todo	Do some checks on the database directory and files here
 	 */
 	public function connectToDatabase () {
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: CALLED!');
 	}
 
 	/**
@@ -349,32 +391,39 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 * @param	$tableName			Name of the database table
 	 * @param	$searchInstance		Local search criteria class
 	 * @return	$resultData			Result data of the query
+	 * @throws	InvalidArgumentException	If a parameter is not valid
 	 * @throws	UnsupportedCriteriaException	If the criteria is unsupported
 	 * @throws	SqlException					If an 'SQL error' occurs
 	 */
-	public function querySelect ($tableName, LocalSearchCriteria $searchInstance) {
-		// Debug message
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: tableName=' . $tableName . ' - CALLED!');
+	public function querySelect (string $tableName, LocalSearchCriteria $searchInstance) {
+		// Validate parameter
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: tableName=%s,searchInstance=%s - CALLED!', $tableName, $searchInstance->__toString()));
+		if (empty($tableName)) {
+			// Throw IAE
+			throw new InvalidArgumentException('Parameter "tableName" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
+		} elseif (!isset($this->pathNames[$tableName])) {
+			// "Cache" is not present, so create and assign it
+			$this->pathNames[$tableName] = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('local_database_path') . $tableName . DIRECTORY_SEPARATOR;
+		}
 
 		// The result is null by any errors
 		$resultData = NULL;
 
-		// Create full path name
-		$pathName = $this->getConfigInstance()->getConfigEntry('local_database_path') . $tableName . DIRECTORY_SEPARATOR;
-
 		/*
 		 * A 'select' query is not that easy on local files, so first try to
 		 * find the 'table' which is in fact a directory on the server
 		 */
 		try {
 			// Get a directory pointer instance
-			$directoryInstance = ObjectFactory::createObjectByConfiguredName('directory_class', array($pathName));
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: Getting directory_class for this->pathNames[%s]=%s ...', $tableName, $this->pathNames[$tableName]));
+			$directoryInstance = ObjectFactory::createObjectByConfiguredName('directory_class', [$this->pathNames[$tableName]]);
 
 			// Initialize the result data, this need to be rewritten e.g. if a local file cannot be read
-			$resultData = array(
-				BaseDatabaseBackend::RESULT_INDEX_STATUS => self::RESULT_OKAY,
-				BaseDatabaseBackend::RESULT_INDEX_ROWS   => array()
-			);
+			$resultData = [
+				BaseDatabaseResult::RESULT_NAME_STATUS    => self::RESULT_OKAY,
+				BaseDatabaseResult::RESULT_NAME_ROWS      => [],
+				BaseDatabaseResult::RESULT_NAME_EXCEPTION => NULL,
+			];
 
 			// Initialize limit/skip
 			$limitFound = 0;
@@ -382,58 +431,55 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 			$idx = 1;
 
 			// Read the directory with some exceptions
-			while (($fileInfoInstance = $directoryInstance->readDirectoryExcept(array('.htaccess', 'info.' . $this->getFileExtension()))) && (($limitFound < $searchInstance->getLimit()) || ($searchInstance->getLimit() == 0))) {
-				// Debug message
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInstance.extension=' . $fileInfoInstance->getExtension() . ',this->getFileExtension()=' . $this->getFileExtension());
-
+			while (($fileInfoInstance = $directoryInstance->readDirectoryExcept(['.gitkeep', 'info.' . $this->getFileExtension()])) && (($limitFound < $searchInstance->getLimit()) || ($searchInstance->getLimit() == 0))) {
 				// Does the extension match?
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: fileInfoInstance->extension=%s,this->fileExtension=%s', $fileInfoInstance->getExtension(), $this->getFileExtension()));
 				if ($fileInfoInstance->getExtension() !== $this->getFileExtension()) {
 					// Skip this file!
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: Skipping fileInfoInstance->filename=%s ...', $fileInfoInstance->getFilename()));
+					$directoryInstance->getDirectoryIteratorInstance()->next();
 					continue;
-				} // END - if
+				}
 
 				// Read the file
 				$dataArray = $this->getDataArrayFromFile($fileInfoInstance);
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInfoInstance.pathname=' . $fileInfoInstance->getPathname() . ',dataArray='.print_r($dataArray, true));
 
 				// Is this an array?
+				//* PRINTR-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('CACHED-LOCAL-FILE-DATABASE: fileInfoInstance->pathname=' . $fileInfoInstance->getPathname() . ',dataArray='.print_r($dataArray, true));
 				if (is_array($dataArray)) {
 					// Default is nothing found
 					$isFound = true;
 
 					// Search in the criteria with FMFW (First Matches, First Wins)
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: data[]=%d', count($dataArray)));
 					foreach ($dataArray as $key => $value) {
-						// Make sure value is not bool
-						assert(!is_bool($value));
-
 						// Found one entry?
-						$isFound = (($isFound === true) && ($searchInstance->isCriteriaMatching($key, $value)));
-						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: key=' . $key . ',value=' . $value . ',isFound=' . intval($isFound));
-					} // END - foreach
+						$isFound = ($isFound && $searchInstance->isCriteriaMatching($key, $value));
+						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: key=%s,value[%s]=%s,isFound=%s', $key, gettype($value), $value, intval($isFound)));
+					}
 
 					// Is all found?
-					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: isFound=' . intval($isFound) . ',limitFound=' . $limitFound . ',limit=' . $searchInstance->getLimit());
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: isFound=%d,limitFound=%d,limit=%d', intval($isFound), $limitFound, $searchInstance->getLimit()));
 					if ($isFound === true) {
 						// Shall we skip this entry?
-						if ($searchInstance->getSkip() > 0) {
-							// We shall skip some entries
-							if ($skipFound < $searchInstance->getSkip()) {
-								// Skip this entry
-								$skipFound++;
-								break;
-							} // END - if
-						} // END - if
+						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: searchInstance->skip=%d,skipFound=%d', $searchInstance->getSkip(), $skipFound));
+						if ($searchInstance->getSkip() > 0 && $skipFound < $searchInstance->getSkip()) {
+							// Skip this entry
+							$skipFound++;
+							break;
+						}
 
 						// Set id number
+						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: Setting dataArray[%s]=%d', $this->getIndexKey(), $idx));
 						$dataArray[$this->getIndexKey()] = $idx;
 
 						// Entry found!
-						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: indexKey=' . $this->getIndexKey() . ',idx=' . $idx . ',dataArray=' . print_r($dataArray, true));
-						array_push($resultData[BaseDatabaseBackend::RESULT_INDEX_ROWS], $dataArray);
+						array_push($resultData[BaseDatabaseResult::RESULT_NAME_ROWS], $dataArray);
 
 						// Count found entries up
+						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: resultData[%s]()=%d', BaseDatabaseResult::RESULT_NAME_ROWS, count($resultData[BaseDatabaseResult::RESULT_NAME_ROWS])));
 						$limitFound++;
-					} // END - if
+					}
 				} else {
 					// Throw an exception here
 					throw new SqlException(array($this, sprintf('File &#39;%s&#39; contains invalid data.', $fileInfoInstance->getPathname()), self::DB_CODE_DATA_FILE_CORRUPT), self::EXCEPTION_SQL_QUERY);
@@ -441,7 +487,10 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 
 				// Count entry up
 				$idx++;
-			} // END - while
+
+				// Advance to next entry
+				$directoryInstance->getDirectoryIteratorInstance()->next();
+			}
 
 			// Close directory and throw the instance away
 			$directoryInstance->closeDirectory();
@@ -461,6 +510,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 		}
 
 		// Return the gathered result
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: resultData()=%d - EXIT!', count($resultData)));
 		return $resultData;
 	}
 
@@ -473,6 +523,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 */
 	public function queryInsertDataSet (StoreableCriteria $dataSetInstance) {
 		// Try to save the request away
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: dataSetInstance=%s - CALLED!', $dataSetInstance->__toString()));
 		try {
 			// Create full path name
 			$infoInstance = $this->generateFileFromDataSet($dataSetInstance, md5($dataSetInstance->getUniqueValue()));
@@ -490,31 +541,50 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 			$this->setLastException($e);
 
 			// Throw an SQL exception
-			throw new SqlException(array(
+			throw new SqlException([
 					$this,
-					sprintf('Cannot write data to table &#39;%s&#39;, is the table created?', $dataSetInstance->getTableName()),
+					sprintf('Cannot write data to table &#39;%s&#39;, is the table created? e=%s,e->message=%s',
+						$dataSetInstance->getTableName(),
+						$e->__toString(),
+						$e->getMessage()
+					),
 					self::DB_CODE_TABLE_UNWRITEABLE
-				),
+				],
 				self::EXCEPTION_SQL_QUERY
 			);
 		}
+
+		// Trace message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: EXIT!');
 	}
 
 	/**
 	 * "Updates" a data set instance with a database layer
 	 *
-	 * @param	$dataSetInstance	A storeable data set
+	 * @param	$dataSetInstance	An instance of a StorableCriteria class
 	 * @return	void
+	 * @throws	InvalidArgumentException	If $tableName is empty
 	 * @throws	SqlException	If an SQL error occurs
 	 */
 	public function queryUpdateDataSet (StoreableCriteria $dataSetInstance) {
-		// Create full path name
-		$pathName = $this->getConfigInstance()->getConfigEntry('local_database_path') . $dataSetInstance->getTableName() . DIRECTORY_SEPARATOR;
+		// Get table name
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: dataSetInstance=%s - CALLED!', $dataSetInstance->__toString()));
+		$tableName = $dataSetInstance->getTableName();
+
+		// Is "cache" there?
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: tableName=%s', $tableName));
+		if (empty($tableName)) {
+			// Should never be an empty string
+			throw new InvalidArgumentException('Class field dataSetInstance->tableName is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
+		} elseif (!isset($this->pathNames[$tableName])) {
+			// "Cache" is not present, so create and assign it
+			$this->pathNames[$tableName] = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('local_database_path') . $tableName . DIRECTORY_SEPARATOR;
+		}
 
 		// Try all the requests
 		try {
 			// Get a file pointer instance
-			$directoryInstance = ObjectFactory::createObjectByConfiguredName('directory_class', array($pathName));
+			$directoryInstance = ObjectFactory::createObjectByConfiguredName('directory_class', [$this->pathNames[$tableName]]);
 
 			// Initialize limit/skip
 			$limitFound = 0;
@@ -524,75 +594,79 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 			$searchArray = $dataSetInstance->getCriteriaArray();
 
 			// Get search criteria
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: searchArray()=%d', count($searchArray)));
 			$searchInstance = $dataSetInstance->getSearchInstance();
 
 			// Read the directory with some exceptions
-			while (($fileInfoInstance = $directoryInstance->readDirectoryExcept(array('.htaccess', 'info.' . $this->getFileExtension()))) && (($limitFound < $searchInstance->getLimit()) || ($searchInstance->getLimit() == 0))) {
-				// Debug message
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInstance.extension=' . $fileInfoInstance->getExtension() . ',this->getFileExtension()=' . $this->getFileExtension());
-
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: searchInstance=%s', $searchInstance->__toString()));
+			while (($fileInfoInstance = $directoryInstance->readDirectoryExcept(['.gitkeep', 'info.' . $this->getFileExtension()])) && (($limitFound < $searchInstance->getLimit()) || ($searchInstance->getLimit() == 0))) {
 				// Does the extension match?
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: fileInfoInstance->extension=%s,this->fileExtension=%s', $fileInfoInstance->getExtension(), $this->getFileExtension()));
 				if ($fileInfoInstance->getExtension() !== $this->getFileExtension()) {
-					// Debug message
-					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInfoInstance.extension=' . $fileInfoInstance->getExtension() . ',getFileExtension()=' . $this->getFileExtension() . ' - SKIPPED!');
 					// Skip this file!
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: fileInfoInstance->extension=%s,this->fileExtension=%s - SKIPPED!', $fileInfoInstance->getExtension(), $this->getFileExtension()));
+					$directoryInstance->getDirectoryIteratorInstance()->next();
 					continue;
-				} // END - if
+				}
 
 				// Open this file for reading
 				$dataArray = $this->getDataArrayFromFile($fileInfoInstance);
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInfoInstance.pathname=' . $fileInfoInstance->getPathname() . ',dataArray='.print_r($dataArray, true));
 
 				// Is this an array?
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('CACHED-LOCAL-FILE-DATABASE: fileInfoInstance->pathname=' . $fileInfoInstance->getPathname() . ',dataArray='.print_r($dataArray, true));
 				if (is_array($dataArray)) {
 					// Default is nothing found
 					$isFound = true;
 
 					// Search in the criteria with FMFW (First Matches, First Wins)
 					foreach ($dataArray as $key => $value) {
-						// Make sure value is not bool
-						assert(!is_bool($value));
-
 						// Found one entry?
+						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: isFound=%d,key=%s,value[]=%s', intval($isFound), $key, gettype($value)));
 						$isFound = (($isFound === true) && ($searchInstance->isCriteriaMatching($key, $value)));
-					} // END - foreach
+					}
 
 					// Is all found?
-					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: isFound=' . intval($isFound));
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: isFound=%s', intval($isFound)));
 					if ($isFound === true) {
 						// Shall we skip this entry?
 						if ($searchInstance->getSkip() > 0) {
 							// We shall skip some entries
 							if ($skipFound < $searchInstance->getSkip()) {
 								// Skip this entry
-								//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: Found entry, but skipping ...');
+								//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('CACHED-LOCAL-FILE-DATABASE: Found entry, but skipping ...');
 								$skipFound++;
 								break;
-							} // END - if
-						} // END - if
+							}
+						}
 
 						// Entry found, so update it
 						foreach ($searchArray as $searchKey => $searchValue) {
 							// Make sure the value is not bool again
+							//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: searchKey=%s,searchValue[]=%s', $searchKey, gettype($searchValue)));
 							assert(!is_bool($searchValue));
-							assert($searchKey != $this->indexKey);
+							assert($searchKey != $this->getIndexKey());
 
 							// Debug message + add/update it
-							//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: criteriaKey=' . $searchKey . ',criteriaValue=' . $searchValue);
+							//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: criteriaKey=%s,criteriaValue[%s]=%s', $searchKey, gettype($searchValue), $searchValue));
 							$dataArray[$searchKey] = $searchValue;
-						} // END - foreach
+						}
 
 						// Write the data to a local file
-						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: Writing dataArray()=' . count($dataArray) . ' to ' . $fileInfoInstance->getPathname() . ' ...');
+						//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: Writing data()=%d to %s ...', count($dataArray), $fileInfoInstance->getPathname()));
 						$this->writeDataArrayToFqfn($fileInfoInstance, $dataArray);
 
 						// Count found entries up
 						$limitFound++;
-					} // END - if
-				} // END - if
-			} // END - while
+					}
+				}
+
+				// Advance to next entry
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: Invoking directoryInstance->directoryIteratorInstance->next() ...');
+				$directoryInstance->getDirectoryIteratorInstance()->next();
+			}
 
 			// Close the file pointer
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: Invoking directoryInstance->closeDirectory() ...');
 			$directoryInstance->closeDirectory();
 
 			// Update the primary key
@@ -602,11 +676,15 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 			$this->resetLastException();
 		} catch (FrameworkException $e) {
 			// Catch all exceptions and store them in last error
+			//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: e=%s,e->code=%d,e->message=%s', $e->__toString(), $e->getCode(), $e->getMessage()));
 			$this->setLastException($e);
 
 			// Throw an SQL exception
 			throw new SqlException(array($this, sprintf('Cannot write data to table &#39;%s&#39;, is the table created? Exception: %s, message:%s', $dataSetInstance->getTableName(), $e->__toString(), $e->getMessage()), self::DB_CODE_TABLE_UNWRITEABLE), self::EXCEPTION_SQL_QUERY);
 		}
+
+		// Trace message
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('CACHED-LOCAL-FILE-DATABASE: EXIT!');
 	}
 
 	/**
@@ -615,9 +693,17 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 *
 	 * @param	$tableName		Name of the table we need the primary key from
 	 * @return	$primaryKey		Primary key column of the given table
+	 * @throws	InvalidArgumentException	If a parameter is not valid
 	 * @todo	Rename method to getPrimaryKeyFromTableInfo()
 	 */
-	public function getPrimaryKeyOfTable ($tableName) {
+	public function getPrimaryKeyOfTable (string $tableName) {
+		// Validate parameter
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: tableName=%s - CALLED!', $tableName));
+		if (empty($tableName)) {
+			// Throw IAE
+			throw new InvalidArgumentException('Parameter "tableName" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
+		}
+
 		// Default key is null
 		$primaryKey = NULL;
 
@@ -625,9 +711,10 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 		if (isset($this->tableInfo[$tableName])) {
 			// Then return the primary key
 			$primaryKey = $this->tableInfo[$tableName]['primary'];
-		} // END - if
+		}
 
 		// Return the column
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: primaryKey[%s]=%s - EXIT!', gettype($primaryKey), $primaryKey));
 		return $primaryKey;
 	}
 
@@ -636,14 +723,22 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 *
 	 * @param	$data	An array with possible non-public data that needs to be removed.
 	 * @return	$data	A cleaned up array with only public data.
+	 * @throws	BadMethodCallException	If some non-public is already not found but method was called
 	 * @todo	Add more generic non-public data for removal
 	 */
 	public function removeNonPublicDataFromArray (array $data) {
+		// Check parameter
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: data()=%d - CALLED!', count($data)));
+		if (!isset($data[$this->getIndexKey()])) {
+			// Throw BMCE
+			throw new BadMethodCallException(sprintf('data()=%d does not contain this->indexKey=%s', count($data), $this->getIndexKey()));
+		}
+
 		// Remove '__idx'
-		unset($data[$this->indexKey]);
+		unset($data[$this->getIndexKey()]);
 
 		// Return it
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: data[' . gettype($data) . ']='.print_r($data, true));
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: data()=%d - EXIT!', count($data)));
 		return $data;
 	}
 
@@ -652,38 +747,43 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 	 *
 	 * @param	$tableName	Table name
 	 * @return	$count		Total rows of given table
+	 * @throws	InvalidArgumentException	If a parameter is not valid
 	 */
-	public function countTotalRows($tableName) {
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: tableName=' . $tableName . ' - CALLED!');
-
-		// Create full path name
-		$pathName = $this->getConfigInstance()->getConfigEntry('local_database_path') . $tableName . DIRECTORY_SEPARATOR;
+	public function countTotalRows (string $tableName) {
+		// Validate parameter
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: tableName=%s - CALLED!', $tableName));
+		if (empty($tableName)) {
+			// Throw IAE
+			throw new InvalidArgumentException('Parameter "tableName" is empty', FrameworkInterface::EXCEPTION_INVALID_ARGUMENT);
+		} elseif (!isset($this->pathNames[$tableName])) {
+			// "Cache" is not present, so create and assign it
+			$this->pathNames[$tableName] = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('local_database_path') . $tableName . DIRECTORY_SEPARATOR;
+		}
 
 		// Try all the requests
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: this->pathNames[%s]=%s', $tableName, $this->pathNames[$tableName]));
 		try {
 			// Get a file pointer instance
-			$directoryInstance = ObjectFactory::createObjectByConfiguredName('directory_class', array($pathName));
+			$directoryInstance = ObjectFactory::createObjectByConfiguredName('directory_class', [$this->pathNames[$tableName]]);
 
 			// Initialize counter
 			$count = 0;
 
 			// Read the directory with some exceptions
-			while ($fileInfoInstance = $directoryInstance->readDirectoryExcept(array('.htaccess', 'info.' . $this->getFileExtension()))) {
-				// Debug message
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInstance.extension=' . $fileInfoInstance->getExtension() . ',this->getFileExtension()=' . $this->getFileExtension());
-
+			while ($fileInfoInstance = $directoryInstance->readDirectoryExcept(['.gitkeep', 'info.' . $this->getFileExtension()])) {
 				// Does the extension match?
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('CACHED-LOCAL-FILE-DATABASE: fileInfoInstance->extension=' . $fileInfoInstance->getExtension() . ',this->getFileExtension()=' . $this->getFileExtension());
 				if ($fileInfoInstance->getExtension() !== $this->getFileExtension()) {
 					// Debug message
-					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInfoInstance.extension=' . $fileInfoInstance->getExtension() . ',getFileExtension()=' . $this->getFileExtension() . ' - SKIPPED!');
+					//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('CACHED-LOCAL-FILE-DATABASE: fileInfoInstance->extension=' . $fileInfoInstance->getExtension() . ',getFileExtension()=' . $this->getFileExtension() . ' - SKIPPED!');
 					// Skip this file!
 					continue;
-				} // END - if
+				}
 
 				// Count this row up
-				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: fileInfoInstance.pathname=' . $fileInfoInstance->getPathname() . ',getFileExtension()=' . $this->getFileExtension() . ' - COUNTED!');
+				//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('CACHED-LOCAL-FILE-DATABASE: fileInfoInstance->pathname=' . $fileInfoInstance->getPathname() . ',getFileExtension()=' . $this->getFileExtension() . ' - COUNTED!');
 				$count++;
-			} // END - while
+			}
 		} catch (FrameworkException $e) {
 			// Catch all exceptions and store them in last error
 			$this->setLastException($e);
@@ -693,7 +793,7 @@ class CachedLocalFileDatabase extends BaseDatabaseBackend implements DatabaseBac
 		}
 
 		// Return count
-		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('DATABASE: tableName=' . $tableName . ',count=' . $count . ' - EXIT!');
+		//* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage(sprintf('CACHED-LOCAL-FILE-DATABASE: count=%d - EXIT!', $count));
 		return $count;
 	}