Merge lp:~barry-leslie/drizzle/drizzle_pbmsV2 into lp:~drizzle-trunk/drizzle/development

[Barry Leslie]

This is the new version of PBMS which is pretty much a rewrite of the old version. This version fixes some limitations in the old version and is designed to work with replication.

It is NOT backward compatible with the old version. If this is a problem for anyone they can contact me and I will help them porting from the old version to the new one.

[Monty Taylor (mordred)]

Hey Barry,

This branch fails the "run tests twice" job:

http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-repeat-tests-twice/387/console

review: Needs Fixing

[Barry Leslie (barry-leslie)]

This is a test case problem, it is assuming the tests are being run in a new
database.

I will see if I can change this so that it will give the expected results
when run twice.

On 4/7/11 9:47 AM, "Monty Taylor" <email address hidden> wrote:

> Review: Needs Fixing
> Hey Barry,
>
> This branch fails the "run tests twice" job:
>
> http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-repeat-tests-t
> wice/387/console
>

-------------------------------------------------------------------------
Barry Leslie

[Barry Leslie (barry-leslie)]

"run tests twice" now works.

[Barry Leslie (barry-leslie)]

I am continuing to work on this branch and will let people know when I think it is ready to be merged.

[lp:~barry-leslie/drizzle/drizzle_pbmsV2]

1979. By Barry Leslie on 2011-06-01

Merged with drizzle trunk

1980. By Barry Leslie on 2011-06-01

Use correct charset.h

1981. By Barry Leslie on 2011-06-01

Merged changes from the main pbms project.

Unmerged revisions

1981. By Barry Leslie on 2011-06-01

Merged changes from the main pbms project.

1980. By Barry Leslie on 2011-06-01

Use correct charset.h

1979. By Barry Leslie on 2011-06-01

Merged with drizzle trunk

1978. By Barry Leslie on 2011-04-07

Updated test case so it can be run multiple times.

1977. By Barry Leslie on 2011-04-05

Fixed fo renamed pbms files in POTFILES.in

1976. By Barry Leslie on 2011-04-04

fixed un initialized variable warning.

1975. By Barry Leslie on 2011-04-04

Code cleanup

1974. By Barry Leslie on 2011-04-04

Merged in lp:drizzle.

1973. By Barry Leslie on 2011-04-04

Added warning message to expected test out put until bug 746720 is fixed.

1972. By Barry Leslie on 2011-03-31

Removed an invalid test from the test cases.

=== removed file 'plugin/pbms/plugin.am'
--- plugin/pbms/plugin.am	2010-07-14 22:58:28 +0000
+++ plugin/pbms/plugin.am	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-
-EXTRA_DIST+= \
-             plugin/pbms/src/TransTest.cc \
-             plugin/pbms/src/alias_ms.cc \
-             plugin/pbms/src/alias_ms.h \
-             plugin/pbms/src/discover_ms.cc \
-             plugin/pbms/src/pbms_enabled.cc \
-             plugin/pbms/src/pbms_enabled.h \
-             plugin/pbms/src/systab_enabled_ms.cc \
-             plugin/pbms/src/systab_enabled_ms.h \
-             plugin/pbms/src/udf_ms.cc
-
 
=== modified file 'plugin/pbms/plugin.ini'
--- plugin/pbms/plugin.ini	2010-12-18 04:43:40 +0000
+++ plugin/pbms/plugin.ini	2011-06-01 23:57:43 +0000
@@ -19,121 +19,132 @@
 title=PrimeBase Media Stream Daemon
 description=Provides BLOB streaming service for storage engines
 load_by_default=no
-cxxflags=-DDRIZZLED -DPBMS_VERSION=0.5.14-beta
+cxxflags= -DDRIZZLED -DPBMS_VERSION=0.6.01-beta -I$(top_srcdir)/plugin/pbms/src
 build_conditional="${ac_cv_libcurl}" = "yes"
 ldflags= ${LTLIBCURL}
 
 # disabled=yes
 
-sources=src/plugin_ms.cc
-		src/backup_ms.cc
-		src/cloud_ms.cc
-		src/compactor_ms.cc
-		src/connection_handler_ms.cc
-		src/database_ms.cc
-		src/engine_ms.cc
-		src/events_ms.cc
-		src/mysql_ms.cc
-		src/network_ms.cc
-		src/open_table_ms.cc
-		src/parameters_ms.cc
-		src/pbmsdaemon_ms.cc
-		src/ha_pbms.cc
-		src/repository_ms.cc
-		src/systab_backup_ms.cc
-		src/systab_cloud_ms.cc
-		src/systab_dump_ms.cc
-		src/systab_httpheader_ms.cc
-		src/systab_util_ms.cc
-		src/systab_variable_ms.cc
-		src/system_table_ms.cc
-		src/table_ms.cc
-		src/temp_log_ms.cc
-		src/transaction_ms.cc
-		src/trans_cache_ms.cc
-		src/trans_log_ms.cc
-		src/cslib/CSDirectory.cc
-		src/cslib/CSEncode.cc
-		src/cslib/CSException.cc
-		src/cslib/CSFile.cc
-		src/cslib/CSHTTPStream.cc
-		src/cslib/CSLog.cc
-		src/cslib/CSMd5.cc
-		src/cslib/CSMemory.cc
-		src/cslib/CSMutex.cc
-		src/cslib/CSObject.cc
-		src/cslib/CSPath.cc
-		src/cslib/CSS3Protocol.cc
-		src/cslib/CSSha1.cc
-		src/cslib/CSSocket.cc
-		src/cslib/CSStorage.cc
-		src/cslib/CSStream.cc
-		src/cslib/CSString.cc
-		src/cslib/CSStrUtil.cc
-		src/cslib/CSThread.cc
-		src/cslib/CSTime.cc
-		src/cslib/CSUTF8.cc
-		src/cslib/CSXML.cc
-		src/cslib/CSSys_unix.cc
-
-headers=src/backup_ms.h
-		src/cloud_ms.h
-		src/compactor_ms.h
-		src/connection_handler_ms.h
-		src/cslib/CSConfig.h
-		src/cslib/CSDefs.h
-		src/cslib/CSDirectory.h
-		src/cslib/CSEncode.h
-		src/cslib/CSException.h
-		src/cslib/CSFile.h
-		src/cslib/CSGlobal.h
-		src/cslib/CSHTTPStream.h
-		src/cslib/CSLog.h
-		src/cslib/CSMd5.h
-		src/cslib/CSMemory.h
-		src/cslib/CSMutex.h
-		src/cslib/CSObject.h
-		src/cslib/CSPath.h
-		src/cslib/CSS3Protocol.h
-		src/cslib/CSSha1.h
-		src/cslib/CSSocket.h
-		src/cslib/CSStorage.h
-		src/cslib/CSStream.h
-		src/cslib/CSString.h
-		src/cslib/CSStrUtil.h
-		src/cslib/CSThread.h
-		src/cslib/CSTime.h
-		src/cslib/CSUTF8.h
-		src/cslib/CSXML.h
-		src/cslib/CSSys.h
-		src/database_ms.h
-		src/defs_ms.h
-		src/discover_ms.h
-		src/engine_ms.h
-		src/events_ms.h
-		src/ha_pbms.h
-		src/metadata_ms.h
-		src/mysql_ms.h
-		src/network_ms.h
-		src/open_table_ms.h
-		src/parameters_ms.h
-		src/pbmsdaemon_ms.h
-		src/pbms.h
-		src/pbmslib.h
-		src/repository_ms.h
-		src/systab_backup_ms.h
-		src/systab_cloud_ms.h
-		src/systab_dump_ms.h
-		src/systab_httpheader_ms.h
-		src/systab_util_ms.h
-		src/systab_variable_ms.h
-		src/system_table_ms.h
-		src/table_ms.h
-		src/temp_log_ms.h
-		src/transaction_ms.h
-		src/trans_cache_ms.h
-		src/trans_log_ms.h
-		src/version_ms.h
+sources=src/plugin/plugin_ms.cc
+	src/cloud/cloud_ms.cc
+	src/daemon/pbmsdaemon_ms.cc
+	src/database/database_ms.cc
+	src/network/connection_handler_ms.cc
+	src/network/network_ms.cc
+	src/plugin/drizzle/events_ms.cc
+	src/plugin/engine_ms.cc
+	src/plugin/ha_pbms.cc
+	src/plugin/parameters_ms.cc
+	src/repository/data/blob_repository_ms.cc
+	src/repository/data/repository_file_ms.cc
+	src/repository/data/repository_ms.cc
+	src/repository/index/repo_index_ms.cc
+	src/repository/logs/temp_log_ms.cc
+	src/repository/references/blob_refs.cc
+	src/repository/references/bloburl.cc
+	src/repository/references/metadata_ms.cc
+	src/repository/references/table_ms.cc
+	src/system_tables/pbms_blob.cc
+	src/system_tables/pbms_cloud.cc
+	src/system_tables/pbms_metadata.cc
+	src/system_tables/pbms_metadata_header.cc
+	src/system_tables/pbms_reference.cc
+	src/system_tables/pbms_repository.cc
+	src/system_tables/pbms_server.cc
+	src/system_tables/systab_util_ms.cc
+	src/system_tables/system_table_ms.cc
+	src/transactions/trans_cache_ms.cc
+	src/transactions/trans_log_ms.cc
+	src/transactions/transaction_ms.cc
+	src/cslib/CSDirectory.cc
+	src/cslib/CSEncode.cc
+	src/cslib/CSException.cc
+	src/cslib/CSFile.cc
+	src/cslib/CSHTTPStream.cc
+	src/cslib/CSLog.cc
+	src/cslib/CSMd5.cc
+	src/cslib/CSMemory.cc
+	src/cslib/CSMutex.cc
+	src/cslib/CSObject.cc
+	src/cslib/CSPath.cc
+	src/cslib/CSS3Protocol.cc
+	src/cslib/CSSha1.cc
+	src/cslib/CSSocket.cc
+	src/cslib/CSStorage.cc
+	src/cslib/CSStream.cc
+	src/cslib/CSString.cc
+	src/cslib/CSStrUtil.cc
+	src/cslib/CSThread.cc
+	src/cslib/CSTime.cc
+	src/cslib/CSUTF8.cc
+	src/cslib/CSXML.cc
+	src/cslib/CSSys_unix.cc
+	src/cslib/CSIdSpace.cc
+
+headers=src/cloud/cloud_ms.h
+	src/cslib/CSConfig.h
+	src/cslib/CSDefs.h
+	src/cslib/CSDirectory.h
+	src/cslib/CSEncode.h
+	src/cslib/CSException.h
+	src/cslib/CSFile.h
+	src/cslib/CSGlobal.h
+	src/cslib/CSHTTPStream.h
+	src/cslib/CSIdSpace.h
+	src/cslib/CSLog.h
+	src/cslib/CSMd5.h
+	src/cslib/CSMemory.h
+	src/cslib/CSMutex.h
+	src/cslib/CSObject.h
+	src/cslib/CSPath.h
+	src/cslib/CSS3Protocol.h
+	src/cslib/CSSha1.h
+	src/cslib/CSSocket.h
+	src/cslib/CSStorage.h
+	src/cslib/CSStream.h
+	src/cslib/CSString.h
+	src/cslib/CSStrUtil.h
+	src/cslib/CSSys.h
+	src/cslib/CSThread.h
+	src/cslib/CSTime.h
+	src/cslib/CSUTF8.h
+	src/cslib/CSXML.h
+	src/daemon/pbmsdaemon_ms.h
+	src/database/database_ms.h
+	src/includes/defs_ms.h
+	src/includes/pbms_config.h
+	src/includes/pbms.h
+	src/includes/version_ms.h
+	src/lib/pbmslib.h
+	src/network/connection_handler_ms.h
+	src/network/network_ms.h
+	src/plugin/drizzle/events_ms.h
+	src/plugin/engine_ms.h
+	src/plugin/ha_pbms.h
+	src/plugin/parameters_ms.h
+	src/repository/data/blob_repository_ms.h
+	src/repository/data/repository_file_ms.h
+	src/repository/data/repository_ms.h
+	src/repository/index/repo_index_ms.h
+	src/repository/logs/temp_log_ms.h
+	src/repository/references/blob_refs.h
+	src/repository/references/bloburl.h
+	src/repository/references/metadata_ms.h
+	src/repository/references/table_ms.h
+	src/system_tables/pbms_blob.h
+	src/system_tables/pbms_cloud.h
+	src/system_tables/pbms_metadata.h
+	src/system_tables/pbms_metadata_header.h
+	src/system_tables/pbms_reference.h
+	src/system_tables/pbms_repository.h
+	src/system_tables/pbms_server.h
+	src/system_tables/systab_util_ms.h
+	src/system_tables/system_table_ms.h
+	src/transactions/trans_cache_ms.h
+	src/transactions/trans_log_ms.h
+	src/transactions/transaction_ms.h
+
+
 		
 		
 extra_dist=AUTHORS
@@ -141,6 +152,4 @@
  ChangeLog
  README
  TODO
- src/api_ms.cc
- src/metadata_ms.cc
  src/cslib/CSSys_win.cc
 
=== removed file 'plugin/pbms/src/TransTest.cc'
--- plugin/pbms/src/TransTest.cc	2010-12-18 04:43:40 +0000
+++ plugin/pbms/src/TransTest.cc	1970-01-01 00:00:00 +0000
@@ -1,953 +0,0 @@
-/* Copyright (C) 2009 PrimeBase Technologies GmbH, Germany
- *
- * PrimeBase Media Stream for MySQL
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Barry Leslie
- *
- * 2009-06-17
- *
- * H&G2JCtL
- *
- * PBMS transaction handling test driver.
- *
- * This is a test driver for the PBMS transaction log. It uses 2 tables in a database and
- * inserts transaction records into 1 while writing them to the transaction log. The transaction
- * log reader thread reads the transactions from the log and writes them to the second table.
- * After a recovery the 2 tables should be identical.
- *
- * Built in crash points can be triggered to test that the recovery works correctly.
- *
- */
- 
-#ifdef UNIT_TEST
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <inttypes.h>
-
-#include "cslib/CSConfig.h"
-#include "cslib/CSGlobal.h"
-#include "cslib/CSThread.h"
-#include "cslib/CSStrUtil.h"
-#include "cslib/CSStorage.h"
-
-#include "trans_cache_ms.h"
-#include "trans_log_ms.h"
-
-#include "mysql.h"
-
-#define CREATE_TABLE_BODY "\
- (\
-  blob_ref INT NOT NULL AUTO_INCREMENT,\
-  tab_id INT NOT NULL,\
-  blob_id BIGINT NOT NULL, \
-  committed BOOLEAN NOT NULL DEFAULT 0, \
-  PRIMARY KEY (blob_ref, tab_id)\
-)\
-ENGINE = INNODB\
-"
-#ifdef LOG_TABLE
-#undef LOG_TABLE
-#endif
-
-#define LOG_TABLE	"translog"
-#define REF_TABLE	"transref_%d"
-#define MAX_THREADS	20
-
-#define A_DB_ID 123
-
-#define TEST_DATABASE_NAME "TransTest"
-static const char *user_name = "root";
-static const char *user_passwd = "";
-static int	port = 3306;
-static const char *host = "localhost";
-static int nap_time = 1000;
-static int max_transaction = 10; // The maximum number of records generated per transaction
-static bool dump_log = false, overflow_crash = false;
-static int crash_site = 0;		// The location to crash at.
-static int num_threads = 1;		// The number of writer threads.
-//static int rate = 1000;			// The maximum transactions per second to allow.
-static time_t timeout = 60;		// How long to run for before crashing or shutting down.
-static bool revover_only = false;
-static bool recreate = false;
-
-static uint32_t cache_size = 0, log_size = 0;
-
-static MSTrans *trans_log;
-
-static CSThreadList *thread_list;
-
-static MYSQL *new_connection(bool check_for_db);
-
-static CSThread *main_thread;
-
-//------------------------------------------------
-class TransTestThread : public CSDaemon {
-public:
-	TransTestThread(): 
-		CSDaemon(thread_list),
-		count(0),
-		myActivity(0),
-		log(NULL),
-		stopit(false),
-		finished(false),
-		mysql(NULL)
-		{}
-
-	 ~TransTestThread()
-	{
-		if (log)
-			log->release();
-			
-		if (mysql)
-			mysql_close(mysql);
-	}
-	 
-	MSTrans *log;
-	MYSQL *mysql;
-	uint32_t count;
-	uint32_t myActivity;
-
-	bool stopit;
-	bool finished;
-	
-	virtual bool doWork() {return true;}	
-};
-
-//------------------------------------------------
-class TransTestWriterThread : public TransTestThread {
-public:
-	TransTestWriterThread():TransTestThread() {}
-	
-	uint32_t tab_id;
-	FILE	*myLog;
-	
-	void generate_records();
-	bool doWork() 
-	{
-		generate_records();
-		finished = true;
-		return true;
-	}
-	
-	static TransTestWriterThread *newTransTestWriterThread(uint32_t id)
-	{
-		TransTestWriterThread *tt;
-		enter_();
-		
-		
-		new_(tt, TransTestWriterThread());
-		
-		char name[32];
-		sprintf(name, "write_%d.log", id);
-		if (recreate)
-			tt->myLog = fopen(name, "w+");
-		else {
-			tt->myLog = fopen(name, "a+");
-			fprintf(tt->myLog, "====================================================\n");
-		}
-		
-		tt->tab_id = id ;
-		tt->mysql = new_connection(false);
-		tt->log = trans_log;
-		trans_log->retain();
-		
-		return_(tt); 
-	}
-	
-	
-};
-
-//------------------------------------------------
-class TransTestReaderThread : public TransTestThread {
-public:
-	TransTestReaderThread():TransTestThread(){}
-	
-	bool recovering;
-	void processTransactionLog();
-	bool doWork() 
-	{
-		processTransactionLog();
-		return true;
-	}
-	
-	static TransTestReaderThread *newTransTestReaderThread(MSTrans *log)
-	{
-		TransTestReaderThread *tt;
-		enter_();
-		
-		new_(tt, TransTestReaderThread());
-		tt->mysql = new_connection(false);
-		tt->log = log;
-		tt->log->retain();
-		
-		tt->log->txn_SetReader(tt); // The reader daemon is passed in unreferenced.
-		tt->recovering = false;
-		return_(tt); 
-	}
-	
-	bool rec_found(uint64_t id, uint32_t tab_id) 
-	{
-		char stmt[100];
-		MYSQL_RES *results = NULL;            
-		bool found;
-		
-		sprintf(stmt, "SELECT blob_ref FROM "LOG_TABLE" WHERE blob_ref = %"PRIu64" AND tab_id = %"PRIu32"", id, tab_id); 
-		if (mysql_query(mysql, stmt)) {
-			printf( "MySQL ERROR: %d \"%s\" line %d\n", mysql_errno(mysql), mysql_error(mysql), __LINE__);
-			printf("%s\n", stmt);
-			exit(1);
-		}
-		
-		
-		results = mysql_store_result(mysql);
-		if (!results){
-			printf( "MySQL ERROR: %d \"%s\" line %d\n", mysql_errno(mysql), mysql_error(mysql), __LINE__);
-			exit(1);
-		}
-
-		found = (mysql_num_rows(results) == 1);		
-		mysql_free_result(results);
-		
-		return found;
-		
-	}
-	
-	
-};
-
-TransTestReaderThread *TransReader;
-//------------------------------------------------
-static void report_mysql_error(MYSQL *mysql, int line, const char *msg)
-{
-	printf( "MySQL ERROR: %d \"%s\" line %d\n", mysql_errno(mysql), mysql_error(mysql), line);
-	if (msg)
-		printf("%s\n", msg);
-	exit(1);
-}
-
-
-//------------------------------------------------
-static MYSQL *new_connection(bool check_for_db)
-{
-	MYSQL *mysql;
-
-	mysql = mysql_init(NULL);
-	if (!mysql) {
-		printf( "mysql_init() failed.\n");
-		exit(1);
-	}
-
-	if (mysql_real_connect(mysql, host, user_name, user_passwd, NULL, port, NULL, 0) == NULL)
-		report_mysql_error(mysql, __LINE__, "mysql_real_connect()");
-
-	if (check_for_db) {
-		MYSQL_RES *results = NULL;            
-		
-		if (mysql_query(mysql, "show databases like \"" TEST_DATABASE_NAME "\""))
-			report_mysql_error(mysql, __LINE__, "show databases like \"" TEST_DATABASE_NAME "\"");
-		
-		results = mysql_store_result(mysql);
-		if (!results)
-			report_mysql_error(mysql, __LINE__, "mysql_store_result()");
-
-
-		if (mysql_num_rows(results) != 1) {
-			if (mysql_query(mysql, "create database " TEST_DATABASE_NAME ))
-				report_mysql_error(mysql, __LINE__, "create database " TEST_DATABASE_NAME );
-		}
-		mysql_free_result(results);
-	}
-	
-	if (mysql_query(mysql, "use " TEST_DATABASE_NAME ))
-		report_mysql_error(mysql, __LINE__, "use " TEST_DATABASE_NAME );
-
-	return mysql;
-}
-
-//------------------------------------------------
-static void init_database(MYSQL *mysql, int cnt)
-{
-	char stmt[1024];
-	
-	unlink("ms-trans-log.dat");
-	mysql_query(mysql, "drop table if exists " LOG_TABLE  ";");
-	
-	if (mysql_query(mysql, "create table " LOG_TABLE  CREATE_TABLE_BODY ";")){
-		printf( "MySQL ERROR: %d \"%s\" line %d\n", mysql_errno(mysql), mysql_error(mysql), __LINE__);
-		exit(1);
-	}
-
-	while (cnt) {
-		sprintf(stmt, "drop table if exists " REF_TABLE  ";", cnt);
-		mysql_query(mysql, stmt);
-		sprintf(stmt, "create table " REF_TABLE  CREATE_TABLE_BODY ";", cnt);
-		if (mysql_query(mysql, stmt)){
-			printf( "MySQL ERROR: %d \"%s\" line %d\n", mysql_errno(mysql), mysql_error(mysql), __LINE__);
-			exit(1);
-		}
-		cnt--;
-	}
-}
-
-
-//------------------------------------------------
-static void display_help(const char *app)
-{
-	printf("\nUsage:\n");
-	printf("%s -help | -r  [-t<num_threads>] | -d | [-n] [-sc <cache_size>] [-sl <log_size>] [-c <crash_site>]  [-t<num_threads>] [<timeout>]\n\n", app);
-	
-	printf("-r: Test recovery after a crash or shutdown.\n");
-	printf("-d: Dump the transaction log.\n");
-	printf("-n: Recreate the tables and recovery log.\n");
-	printf("-c <crash_site>: Crash at this location rather than shutting down. Max = %d\n", MAX_CRASH_POINT+1);
-	printf("-t<num_threads>: The number of writer threads to use, default is %d.\n", num_threads);
-	//printf("-r<rate>: The number af records to be inserted per second, default is %d.\n", rate);
-	printf("<timeout>: The number seconds the test should run before shuttingdown or crashing, default is %d.\n\n", timeout);
-	exit(1);
-}
-
-//---------------------------------	
-static void process_args(int argc, const char * argv[])
-{
-	if (argc < 2)
-		return;
-		
-	for (int i = 1; i < argc; ) {
-		if ( argv[i][0] != '-') { // Must be timeout
-			timeout = atoi(argv[i]);
-			i++;
-			if ((i != argc) || !timeout)
-				display_help(argv[0]);
-		} else {
-			switch (argv[i][1]) {
-				case 'h':
-					display_help(argv[0]);
-					break;
-					
-				case 'r':
-					if (argc > 4 || argv[i][2])
-						display_help(argv[0]);
-					revover_only = true;
-					i++;
-					break;
-					
-				case 'd':
-					if (argc != 2 || argv[i][2])
-						display_help(argv[0]);
-					dump_log = true;
-					i++;
-					break;
-					
-				case 'n':
-					if (argv[i][2])
-						display_help(argv[0]);
-					recreate = true;
-					i++;
-					break;
-					
-				case 'c':
-					if (argv[i][2])
-						display_help(argv[0]);
-					i++;
-					crash_site = atoi(argv[i]);
-					if (crash_site == (MAX_CRASH_POINT + 1))
-						overflow_crash = true;
-					else if ((!crash_site) || (crash_site >  MAX_CRASH_POINT))
-						display_help(argv[0]);
-					i++;
-					break;
-					
-				case 's': {
-						uint32_t size;
-						
-						size = atol(argv[i+1]);
-						if (!size)
-							display_help(argv[0]);
-							
-						if (argv[i][2] == 'c') 
-							cache_size = size;
-						else if (argv[i][2] == 'l')
-							log_size = size;
-						else 
-							display_help(argv[0]);
-						
-						i+=2;
-					}
-					break;
-					
-				case 't':
-					if (argv[i][2])
-						display_help(argv[0]);
-					i++;
-					num_threads = atoi(argv[i]);
-					if (!num_threads)
-						display_help(argv[0]);
-					i++;
-					break;
-/*					
-				case 'r':
-					i++;
-					rate = atoi(argv[i]);
-					if (!rate)
-						display_help(argv[0]);
-					i++;
-					break;
-*/
-				default:
-					display_help(argv[0]);
-			}
-			
-		}
-	}
-}
-
-//---------------------------------	
-static void init_env()
-{
-	cs_init_memory();
-	CSThread::startUp();
-	if (!(main_thread = CSThread::newCSThread())) {
-		CSException::logOSError(CS_CONTEXT, ENOMEM);
-		exit(1);
-	}
-	
-	CSThread::setSelf(main_thread);
-	
-	enter_();
-	try_(a) {
-		trans_log = MSTrans::txn_NewMSTrans("./ms-trans-log.dat", /*dump_log*/ true);
-		new_(thread_list, CSThreadList()); 
-	}
-	catch_(a) {
-		self->logException();
-		CSThread::shutDown();
-		exit(1);
-	}
-	cont_(a);
-	
-}
-//---------------------------------	
-static void deinit_env()
-{
-	if (thread_list) {
-		thread_list->release();
-		thread_list = NULL;
-	}
-	
-	if (trans_log) {
-		trans_log->release();
-		trans_log = NULL;
-	}
-	
-	if (main_thread) {
-		main_thread->release();
-		main_thread = NULL;
-	}
-	
-	CSThread::shutDown();
-	cs_exit_memory();
-}
-//---------------------------------	
-static bool verify_database(MYSQL *mysql)
-{
-	MYSQL_RES **r_results, *l_results = NULL;            
-	MYSQL_ROW r_record, l_record;
-	bool ok = false;
-	int i, log_row_cnt, ref_row_cnt = 0, tab_id;
-	char stmt[1024];
-	
-	r_results = (MYSQL_RES **) malloc(num_threads * sizeof(MYSQL_RES *));
-	
-	if (mysql_query(mysql, "select * from "LOG_TABLE" where committed = 0 order by blob_ref")) 
-		report_mysql_error(mysql, __LINE__, "select * from "LOG_TABLE" order by blob_ref");
-						
-	l_results = mysql_store_result(mysql);
-	if (!l_results)
-		report_mysql_error(mysql, __LINE__, "mysql_store_result()");
-
-	log_row_cnt = mysql_num_rows(l_results);
-	mysql_free_result(l_results);
-	if (log_row_cnt)
-		printf("Uncommitted references: %d\n", log_row_cnt);
-
-	//---------
-	for (i =0; i < num_threads; i++) {
-		sprintf(stmt, "select * from "REF_TABLE" order by blob_ref", i+1);
-		if (mysql_query(mysql, stmt)) 
-			report_mysql_error(mysql, __LINE__, stmt);
-							
-		r_results[i] = mysql_store_result(mysql);
-		if (!r_results)
-			report_mysql_error(mysql, __LINE__, "mysql_store_result()");
-			
-		ref_row_cnt += mysql_num_rows(r_results[i]);
-	}	
-	//---------
-	if (mysql_query(mysql, "select * from "LOG_TABLE" order by blob_ref")) 
-		report_mysql_error(mysql, __LINE__, "select * from "LOG_TABLE" order by blob_ref");
-						
-	l_results = mysql_store_result(mysql);
-	if (!l_results)
-		report_mysql_error(mysql, __LINE__, "mysql_store_result()");
-
-	log_row_cnt = mysql_num_rows(l_results);
-	
-	if (log_row_cnt != ref_row_cnt) {
-		if (ref_row_cnt > log_row_cnt) {
-			printf("verify_database() Failed: row count doesn't match: log_row_cnt(%d) != ref_row_cnt(%d)\n", log_row_cnt,  ref_row_cnt);
-			goto done;
-		}
-		
-		printf("verify_database() Warnning: row count doesn't match: log_row_cnt(%d) != ref_row_cnt(%d)\n", log_row_cnt,  ref_row_cnt);		
-		printf("Possible unreferenced BLOBs\n");
-	}
-	
-	if (log_row_cnt == ref_row_cnt) {
-		for ( i = 0; i < log_row_cnt; i++) {
-			l_record = mysql_fetch_row(l_results);
-			tab_id = atol(l_record[1]);
-			r_record = mysql_fetch_row(r_results[tab_id-1]);		
-			if ((atol(l_record[0]) != atol(r_record[0])) ||
-				(atol(l_record[1]) != atol(r_record[1])) ||
-				(atol(l_record[2]) != atol(r_record[2]))) {
-				
-				printf("verify_database() Failed: in row %d, tab_id %d\n", i+1, tab_id);
-				printf("field 1:  %d =? %d\n", atol(l_record[0]), atol(r_record[0]));
-				printf("field 2:  %d =? %d\n", atol(l_record[1]), atol(r_record[1]));
-				printf("field 3:  %d =? %d\n", atol(l_record[2]), atol(r_record[2]));
-				goto done;
-			}
-				
-		}
-	} else { // The important thing is that there are no BLOBs in the ref tabels that are not in the log table.
-
-		for (i =0; i < num_threads; i++) {
-			mysql_free_result(r_results[i]);
-			
-			sprintf(stmt, "select * from "REF_TABLE" where  blob_ref not in (select blob_ref from TransTest.translog where tab_id = %d)", i+1, i+1);
-			if (mysql_query(mysql, stmt)) 
-				report_mysql_error(mysql, __LINE__, stmt);
-								
-			r_results[i] = mysql_store_result(mysql);
-			if (!r_results)
-				report_mysql_error(mysql, __LINE__, "mysql_store_result()");
-				
-			if (mysql_num_rows(r_results[i])) {
-				printf("verify_database() Failed, Missing BLOBs: %s\n", stmt);
-				goto done;
-			}
-		}	
-	}
-	
-	printf("verify_database() OK.\n");
-	ok = true;
-	
-	done:
-	
-	for (i =0; i < num_threads; i++) {
-		mysql_free_result(r_results[i]);
-	}
-	free(r_results);
-	
-	mysql_free_result(l_results);
-	
-#ifdef DEBUG	
-	if (!ok) {
-		trans_log->txn_DumpLog("trace.log");
-	}
-#endif	
-	return ok;
-}
-
-//------------------------------------------------
-void TransTestReaderThread::processTransactionLog()
-{
-	MSTransRec rec = {0};
-	MS_TxnState state;
-	char stmt[1024];
-	uint32_t last_tid = 0;
-	enter_();
-	
-	// Read in transactions from the log and update
-	// the database table based on them.
-	
-	try_(a) {
-		while (!myMustQuit && !stopit) {
-			// This will sleep while waiting for the next 
-			// completed transaction.
-			log->txn_GetNextTransaction(&rec, &state); 
-			if (myMustQuit)
-				break;
-
-			myActivity++;
-#ifdef CHECK_TIDS
-			if (num_threads == 1) {
-				ASSERT( ((last_tid + 1) == rec.tr_id) || (last_tid  == rec.tr_id) || !last_tid);
-				last_tid = rec.tr_id;
-			}
-#endif			
-			if (!recovering) 
-				count++;
-			
-			switch (TRANS_TYPE(rec.tr_type)) {
-				case MS_ReferenceTxn:
-				case MS_DereferenceTxn:
-				case MS_RollBackTxn:
-				case MS_CommitTxn:
-				case MS_RecoveredTxn:
-				break;
-				default:
-					printf("Unexpected transaction type: %d\n", rec.tr_type);
-					exit(1);							
-			}
-			
-			if (state == MS_Committed){
-				// Dereferences are applied when the transaction is commited.
-				// References are applied imediatly and removed if the transaction is rolled back.
-				if (TRANS_TYPE(rec.tr_type) == MS_DereferenceTxn) {
-					sprintf(stmt, "DELETE FROM "LOG_TABLE" WHERE blob_ref = %"PRIu64" AND tab_id = %d AND blob_id = %"PRIu64"", rec.tr_blob_ref_id, rec.tr_tab_id, rec.tr_blob_id); 
-					if (mysql_query(mysql, stmt))  
-						report_mysql_error(mysql, __LINE__, stmt);
-				} else if (TRANS_TYPE(rec.tr_type) == MS_ReferenceTxn) {
-					sprintf(stmt, "UPDATE "LOG_TABLE" SET committed = 1 WHERE blob_ref = %"PRIu64" AND tab_id = %d AND blob_id = %"PRIu64"", rec.tr_blob_ref_id, rec.tr_tab_id, rec.tr_blob_id); 
-					if (mysql_query(mysql, stmt))  
-						report_mysql_error(mysql, __LINE__, stmt);
-				}
-			} else if (state == MS_RolledBack) { 
-				//printf("ROLLBACK!\n");
-				if (TRANS_TYPE(rec.tr_type) == MS_ReferenceTxn) {
-					sprintf(stmt, "DELETE FROM "LOG_TABLE" WHERE blob_ref = %"PRIu64" AND tab_id = %d AND blob_id = %"PRIu64"", rec.tr_blob_ref_id, rec.tr_tab_id, rec.tr_blob_id); 
-					if (mysql_query(mysql, stmt))  
-						report_mysql_error(mysql, __LINE__, stmt);
-				}
-			} else if (state == MS_Recovered) { 
-				printf("Recovered transaction being ignored:\n");
-				printf("blob_ref = %"PRIu64", tab_id = %d, blob_id = %"PRIu64"\n\n", rec.tr_blob_ref_id, rec.tr_tab_id, rec.tr_blob_id);
-			} else {
-				printf("Unexpected transaction state: %d\n", state);
-				exit(1);							
-			}
-			
-			
-		}
-	}
-	catch_(a) {
-		self->logException();
-		printf("\n\n!!!!!!!! THE TRANSACTION LOG READER DIED! !!!!!!!!!!!\n\n");
-		if (!myMustQuit && !stopit)
-			exit(1);
-	}
-	cont_(a);
-	printf("The transaction log reader shutting down.\n");
-	exit_();
-}
-
-//------------------------------------------------
-void TransTestWriterThread::generate_records()
-{
-
-	MS_Txn	txn_type;		
-	uint64_t	blob_id;	
-	uint64_t	blob_ref_id;	
-	int tsize, i;
-	bool do_delete;
-		
-	char stmt[1024];
-	enter_();
-
-	try_(a) {
-		while (!myMustQuit && !stopit) {
-		
-			myActivity++;
-			usleep(nap_time); // Give up a bit of time
-			if (myMustQuit || stopit)
-				break;
-				
-			tsize = rand() % max_transaction;
-			
-			if (mysql_autocommit(mysql, 0))
-				report_mysql_error(mysql, __LINE__, "mysql_autocommit()");
-				
-			i = 0;
-			do {
-				do_delete = ((rand() %2) == 0);
-				
-				// decide if this is an insert or delete
-				if (do_delete) {
-					MYSQL_RES *results = NULL;            
-					MYSQL_ROW record;
-					int cnt;
-					
-					// If we are deleting then randomly select a record to delete
-					// and delete it. 
-					
-					txn_type = MS_DereferenceTxn;
-
-					sprintf(stmt, "select * from "REF_TABLE, tab_id); 
-					if (mysql_query(mysql, stmt)) 
-						report_mysql_error(mysql, __LINE__, stmt);
-						
-					results = mysql_store_result(mysql);
-					if (!results)
-						report_mysql_error(mysql, __LINE__, "mysql_store_result()");
-						
-					cnt = mysql_num_rows(results);
-					if (!cnt)
-						do_delete = false; // There is nothing to delete
-					else {
-						mysql_data_seek(results, rand()%cnt);
-						record = mysql_fetch_row(results);
-							
-						blob_ref_id = atol(record[0]);
-						blob_id = atol(record[2]);
-						
-						sprintf(stmt, "DELETE FROM "REF_TABLE" WHERE blob_ref = %"PRIu64" AND blob_id = %"PRIu64"", tab_id, blob_ref_id, blob_id); 
-						if (mysql_query(mysql, stmt))  
-							report_mysql_error(mysql, __LINE__, stmt);
-							
-						if (mysql_affected_rows(mysql) == 0)
-							do_delete = false; // Another thread must have deleted the row first.
-						else
-							fprintf(myLog, "DELETE %"PRIu64" %"PRIu64"\n", blob_ref_id, blob_id); 
-					}
-					
-					mysql_free_result(results);
-				} 
-				
-				if (!do_delete) {
-					blob_id = self->myTID; // Assign the tid as the blob id to help with debugging.
-					txn_type = MS_ReferenceTxn;
-					
-					sprintf(stmt, "INSERT INTO "REF_TABLE" VALUES( NULL, %d, %"PRIu64", 0)", tab_id, tab_id, blob_id); 
-					if (mysql_query(mysql, stmt)) 
-						report_mysql_error(mysql, __LINE__, stmt);
-						
-					blob_ref_id = mysql_insert_id(mysql);
-					if (!blob_ref_id)
-						report_mysql_error(mysql, __LINE__, "mysql_insert_id() returned 0");
-					
-					fprintf(myLog, "INSERT %"PRIu64" %"PRIu64"\n", blob_ref_id, blob_id);	
-					// Apply the blob reference now. This will be undone if the transaction is rolled back.
-					sprintf(stmt, "INSERT INTO "LOG_TABLE" VALUES(%"PRIu64", %d, %"PRIu64", 0)", blob_ref_id, tab_id, blob_id); 
-					if (mysql_query(mysql, stmt)) 
-						report_mysql_error(mysql, __LINE__, stmt);
-				}
-
-				i++;
-				count++;
-				if (i >= tsize) { //Commit the database transaction before the log transaction.
-					bool rollback;
-					
-					rollback = ((tsize > 0) && ((rand() % 1000) == 0));
-					if (rollback) {
-						printf("Rollback\n");
-						if (mysql_rollback(mysql)) // commit the staement to the database,
-							report_mysql_error(mysql, __LINE__, "mysql_rollback()");	
-						fprintf(myLog, "Rollback %"PRIu32"\n", self->myTID);	
-						log->txn_LogTransaction(MS_RollBackTxn);
-					} else {
-						if (mysql_commit(mysql)) // commit the staement to the database,
-							report_mysql_error(mysql, __LINE__, "mysql_commit()");	
-						fprintf(myLog, "Commit %"PRIu32"\n", self->myTID);	
-						log->txn_LogTransaction(txn_type, true, A_DB_ID, tab_id, blob_id, blob_ref_id);
-					}
-				} else
-					log->txn_LogTransaction(txn_type, false, A_DB_ID, tab_id, blob_id, blob_ref_id);
-								
-			} while ( i < tsize);
-						
-		}
-	}
-	
-	catch_(a) {
-		self->logException();
-		printf("\n\nA writer thread for table %d died! \n\n", tab_id);
-		if (i == tsize) {
-			printf(" It is possible that the last %d operations on table %d were committed to the database but not to the log.\n", tsize, tab_id);
-		}
-		if (!myMustQuit && !stopit)
-			exit(1);
-	}
-	cont_(a);
-	printf("Writer thread for table %d is shutting down.\n", tab_id);
-	exit_();
-}
-
-// SELECT * FROM TransTest.translog where  blob_ref not in (select blob_ref from TransTest.transref)
-// SELECT * FROM TransTest.transref_1 where  blob_ref not in (select blob_ref from TransTest.translog where tab_id = 1)
-// SELECT * FROM TransTest.translog where  tab_id = 1 AND blob_ref not in (select blob_ref from TransTest.transref_1)
-// select count(*) from TransTest.translog where committed = 1
-//---------------------------------	
-int main (int argc, const char * argv[]) 
-{
-	MYSQL *mysql;
-	TransTestWriterThread **writer = NULL;
-	int rtc = 1;
-	
-	process_args(argc, argv);
-	
-	mysql = new_connection(true);
-	
-	if (recreate)
-		init_database(mysql, num_threads);
-		
-	init_env();
-	enter_();
-	
-	if (dump_log) {
-		printf("LOG dumped\n");
-		exit(1);
-	}
-	
-	TransReader = TransTestReaderThread::newTransTestReaderThread(trans_log);
-	push_(TransReader);
-	TransReader->recovering = true;
-	TransReader->start();
-	
-	// wait until the recovery is complete.
-	while (trans_log->txn_GetNumRecords())
-		usleep(100);
-		
-	TransReader->recovering = false;
-	
-	if (log_size)
-		trans_log->txn_SetLogSize(log_size);
-		
-	if (cache_size)
-		trans_log->txn_SetCacheSize(cache_size);
-		
-	if (revover_only) {
-		TransReader->stopit = true;
-		if (verify_database(mysql))
-			rtc = 0;
-		goto done;
-	}
-	
-	try_(a) {
-		writer = (TransTestWriterThread **) cs_malloc(num_threads * sizeof(TransTestWriterThread *));
-		for (int i = 0; i < num_threads; i++) {
-			TransTestWriterThread *wt = TransTestWriterThread::newTransTestWriterThread(i+1);
-			wt->start();
-			writer[i] = wt;
-		}
-	
-		printf("Timeout: %d seconds\n", timeout); 
-		timeout += time(NULL);
-		int header = 0;
-		while (timeout > time(NULL)) {
-			MSTransStatsRec stats;
-			self->sleep(1000);
-			trans_log->txn_GetStats(&stats);
-			
-			
-			if (!(header%20)) {
-				for (int i = 0; i < num_threads; i++) {				
-					if (writer[i]->myActivity == 0) {
-						printf("Writer thread %d HUNG!!!\n", i);
-					}
-					writer[i]->myActivity = 0;
-				}
-				
-				if (TransReader->myActivity == 0) {
-					printf("Reader thread HUNG!!!\n");
-				}
-				TransReader->myActivity = 0;
-					
-				printf("%s | %s | %s | %s | %s | %s | %s | %s\n", "LogSize", "Full", "MaxSize", "Overflows", "Overflowing", "CacheSize", "Cache Used", "Cache Hit");
-			}
-			header++;
-			//printf("Writes: %d \t\t Reads: %d \t%d \t start: %"PRIu64"\t\t eol:%"PRIu64"\n", count, TransReader->count, count - TransReader->count, trans_log->txn_Start, trans_log->txn_EOL);
-			printf("%7llu | %3d%% | %7llu | %9d | %11s | %9d | %9d%% | %9d%%\n",// | \t\t\t%"PRIu64" \t%"PRIu64"\n", 
-				stats.ts_LogSize,
-				stats.ts_PercentFull,
-				stats.ts_MaxSize,
-				stats.ts_OverflowCount,
-				(stats.ts_IsOverflowing)?"Over Flow": "   ---   ",
-				stats.ts_TransCacheSize,
-				stats.ts_PercentTransCacheUsed,
-				stats.ts_PercentCacheHit//, trans_log->txn_Start, trans_log->txn_EOL
-				);
-				
-				if (stats.ts_IsOverflowing && overflow_crash) {
-					printf("Simulating crash while in overflow\n");
-					exit(1);
-				}
-		}
-
-#ifdef CRASH_TEST		
-		if (crash_site) {
-			printf("Crashing at crash site %d\n", crash_site);
-			trans_test_crash_point = crash_site;
-			// set the crash site and wait to die.
-			while(1)
-				self->sleep(1000);
-		}
-#endif
-		
-		printf("Shutting down the writer threads:\n");
-		for (int i = 0; i < num_threads; i++) {
-			writer[i]->stopit = true;
-		}
-		
-		TransReader->stopit = true;
-		// Give the writers a chance to shutdown by themselves.
-		int cnt = 100;
-		while (cnt) {
-			int i;
-			for (i = 0; i < num_threads && writer[i]->finished; i++);
-			if (i == num_threads && TransReader->finished)
-				break;
-			self->sleep(10);	
-			cnt--;			
-		}
-		
-		for (int i = 0; i < num_threads; i++) {
-			writer[i]->stop();
-		}
-		
-	}
-	rtc = 0;
-	catch_(a) {
-		printf("Main thread abort.\n");
-		self->logException();
-	}
-	cont_(a);
-	if (writer) {
-		for (int i = 0; i < num_threads; i++) {
-			writer[i]->stop();
-			writer[i]->release();
-		}
-		cs_free(writer);
-	}
-		
-done:
-	TransReader->stop();
-	release_(TransReader);
-	
-	outer_();
-	
-	thread_list->stopAllThreads();
-	deinit_env();
-	mysql_close(mysql);
-	exit(rtc);
-}
-
-#endif // UNIT_TEST
 
=== removed file 'plugin/pbms/src/alias_ms.cc'
--- plugin/pbms/src/alias_ms.cc	2010-12-18 04:43:40 +0000
+++ plugin/pbms/src/alias_ms.cc	1970-01-01 00:00:00 +0000
@@ -1,1092 +0,0 @@
-/* Copyright (C) 2008 PrimeBase Technologies GmbH, Germany
- *
- * PrimeBase Media Stream for MySQL
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Barry Leslie
- *
- * 2008-12-30
- *
- * H&G2JCtL
- *
- * BLOB alias index.
- *
- */
-
-#ifdef HAVE_ALIAS_SUPPORT
-#include "cslib/CSConfig.h"
-
-#include "string.h"
-
-#ifdef DRIZZLED
-#include <drizzled/common.h>
-#endif
-
-#include "cslib/CSGlobal.h"
-#include "cslib/CSLog.h"
-#include "cslib/CSStrUtil.h"
-#include "cslib/CSFile.h"
-#include "system_table_ms.h"
-#include "database_ms.h"
-
-#include "alias_ms.h"
-
-
-
-//------------------------
-MSAlias::~MSAlias()
-{
-	enter_();
-	
-	ASSERT(iClosing);
-	ASSERT(iPoolSysTables.getSize() == 0);
-
-	
-	if (iFilePath) {
-	
-		if (iDelete)
-			iFilePath->removeFile();
-			
-		iFilePath->release();
-	}
-	
-	if (iFileShare)
-		iFileShare->release();
-		
-	exit_();
-}
-
-//------------------------
-MSAlias::MSAlias(MSDatabase *db_noref)
-{
-	iClosing = false;
-	iDelete = false;
-	iDatabase_br = db_noref;
-	iFilePath = NULL;
-	iFileShare = NULL;
-}
-
-//------------------------
-void MSAlias::ma_close()
-{
-	enter_();
-	
-	iClosing = true;
-	if (iFileShare)
-		iFileShare->close();
-	iPoolSysTables.clear();
-	exit_();
-}
-
-//------------------------
-// Compress the index bucket chain and free unused buckets.
-void MSAlias::MSAliasCompress(CSFile *fa, CSSortedList	*freeList, MSABucketLinkedList *bucketChain)
-{
-	// For now I will just remove empty buckets. 
-	// Later this function should also compress the records also 
-	// thus making the searches faster and freeing up more space.
-	MSABucketInfo *b_info, *next;
-	
-	b_info = bucketChain->getFront();
-	while (b_info) {
-		next = b_info->getNextLink();
-		if (b_info->getSize() == 0) {
-			bucketChain->remove(RETAIN(b_info));
-			freeList->add(b_info);
-		}		
-		b_info = next;
-	}
-		
-}
-
-//------------------------
-void MSAlias::MSAliasLoad()
-{	
-	CSFile			*fa = NULL;
-	CSSortedList	freeList;
-	off64_t			fileSize;
-
-	enter_();
-	
-	fa = CSFile::newFile(RETAIN(iFilePath));
-	push_(fa);
-
-	MSAliasHeadRec header;
-	uint64_t free_list_offset;
-	fa->open(CSFile::DEFAULT);
-	fa->read(&header, 0, sizeof(header), sizeof(header));
-	
-	/* Check the file header: */
-	if (CS_GET_DISK_4(header.ah_magic_4) != MS_ALIAS_FILE_MAGIC)
-		CSException::throwFileError(CS_CONTEXT, iFilePath->getCString(), CS_ERR_BAD_HEADER_MAGIC);
-	if (CS_GET_DISK_2(header.ah_version_2) != MS_ALIAS_FILE_VERSION)
-		CSException::throwFileError(CS_CONTEXT, iFilePath->getCString(), CS_ERR_VERSION_TOO_NEW);
-		
-	free_list_offset = CS_GET_DISK_8(header.ah_free_list_8);
-	
-	fileSize = CS_GET_DISK_8(header.ah_file_size_8);
-
-	// Do some sanity checks. 
-	if (CS_GET_DISK_2(header.ah_head_size_2) != sizeof(header))
-		CSException::throwFileError(CS_CONTEXT, iFilePath->getCString(), CS_ERR_BAD_FILE_HEADER);
-	
-	if (CS_GET_DISK_2(header.ah_num_buckets_2) != BUCKET_LIST_SIZE)
-		CSException::throwFileError(CS_CONTEXT, iFilePath->getCString(), CS_ERR_BAD_FILE_HEADER);
-	
-	if (CS_GET_DISK_4(header.ah_bucket_size_4) != NUM_RECORDS_PER_BUCKET)
-		CSException::throwFileError(CS_CONTEXT, iFilePath->getCString(), CS_ERR_BAD_FILE_HEADER);
-	
-	if (fileSize != fa->getEOF()) 
-		CSException::throwFileError(CS_CONTEXT, iFilePath->getCString(), CS_ERR_BAD_FILE_HEADER);
-	
-	// Load the bucket headers into RAM
-	MSADiskBucketHeadRec bucketHead = {0};
-	uint64_t offset, start_offset;
-
-	// Fist load the free list:
-	if (free_list_offset) {
-		start_offset = offset = free_list_offset;
-		do {
-			fa->read(&bucketHead, offset, sizeof(MSADiskBucketHeadRec), sizeof(MSADiskBucketHeadRec));
-			freeList.add(MSABucketInfo::newMSABucketInfo(offset));
-			offset = CS_GET_DISK_8(bucketHead.ab_next_bucket_8);					
-		} while (offset != start_offset);
-		
-	}
-	for (uint32_t i = 0; i < BUCKET_LIST_SIZE; i++) {
-		uint64_t used, total_space;
-		MSABucketLinkedList *bucketChain = &(iFileShare->msa_buckets[i]);
-		
-		start_offset = offset = sizeof(header) + i * sizeof(MSADiskBucketRec);
-		used = total_space = 0;
-		do {
-			uint32_t num, end_of_records;
-			
-			fa->read(&bucketHead, offset, sizeof(MSADiskBucketHeadRec), sizeof(MSADiskBucketHeadRec));
-			num = CS_GET_DISK_4(bucketHead.ab_num_recs_4);
-			end_of_records = CS_GET_DISK_4(bucketHead.ab_eor_rec_4);
-			total_space += NUM_RECORDS_PER_BUCKET;
-			used += num;
-			bucketChain->addFront(MSABucketInfo::newMSABucketInfo(offset, num, end_of_records));
-			offset = CS_GET_DISK_8(bucketHead.ab_next_bucket_8);
-			
-		} while (offset != start_offset);
-		
-		// Pack the index if required
-		if (((total_space - used) /  NUM_RECORDS_PER_BUCKET) > 1) 
-			MSAliasCompress(fa, &freeList, bucketChain); 
-			
-	}
-	
-	// If there are free buckets try to free up some disk
-	// space or add them to a free list to be reused later.
-	if (freeList.getSize()) {
-		uint64_t last_bucket = fileSize - sizeof(MSADiskBucketRec);
-		MSABucketInfo *rec;
-		bool reduce = false;
-		
-		// Search for freed buckets at the end of the file
-		// so that they can be released and the file
-		// shrunk.
-		//
-		// The free list has been sorted so that buckets
-		// with the highest file offset are first.
-		do {
-			rec = (MSABucketInfo*) freeList.itemAt(0);
-			if (rec->bi_bucket_offset != last_bucket);
-				break;
-				
-			last_bucket -= sizeof(MSADiskBucketRec);
-			freeList.remove(rec);
-			reduce = true;
-		} while (freeList.getSize());
-		
-		if (reduce) {
-			// The file can be reduced in size.
-			fileSize = last_bucket + sizeof(MSADiskBucketRec);	
-			fa->setEOF(fileSize);
-			CS_SET_DISK_8(header.ah_file_size_8, fileSize);
-			fa->write(&header.ah_file_size_8, offsetof(MSAliasHeadRec,ah_file_size_8) , 8); 
-		}
-		
-		// Add the empty buckets to the index file's empty bucket list.
-		memset(&bucketHead, 0, sizeof(bucketHead));
-		offset = 0;
-		while (freeList.getSize()) { // Add the empty buckets to the empty_bucket list.
-			rec = (MSABucketInfo*) freeList.takeItemAt(0);
-			
-			// buckets are added to the front of the list.
-			fa->write(&offset, rec->bi_bucket_offset + offsetof(MSADiskBucketHeadRec,ab_next_bucket_8) , 8);
-			offset =  rec->bi_bucket_offset;
-			fa->write(&offset, offsetof(MSAliasHeadRec,ah_free_list_8) , 8); 
-			
-			iFileShare->msa_empty_buckets.addFront(rec);
-		}
-	}
-	
-	iFileShare->msa_fileSize = fa->getEOF();
-	
-	release_(fa);
-	exit_();
-}
-
-//------------------------
-void MSAlias::buildAliasIndex()
-{
-	MSBlobHeadRec	blob;
-	MSRepository	*repo;
-	uint64_t			blob_size, fileSize, offset;
-	uint16_t			head_size;
-	MSAliasFile		*afile;
-	MSAliasRec		aliasRec;
-	
-	enter_();
-	
-	afile = getAliasFile();
-	frompool_(afile);
-
-	afile->startLoad();
-
-	CSSyncVector	*repo_list = iDatabase_br->getRepositoryList();
-	
-	// No locking is required since the index is loaded before the database is opened
-	// and the compactor thread is started.
-
-	for (uint32_t repo_index =0; repo_index<repo_list->size(); repo_index++) {
-		if ((repo = (MSRepository *) repo_list->get(repo_index))) {
-			MSRepoFile	*repoFile = repo->openRepoFile();
-			push_(repoFile);
-			fileSize = repo->getRepoFileSize();
-			offset = repo->getRepoHeadSize();
-			
-			aliasRec.repo_id = repoFile->myRepo->getRepoID();
-			
-			while (offset < fileSize) {
-				if (repoFile->read(&blob, offset, sizeof(MSBlobHeadRec), 0) < sizeof(MSBlobHeadRec)) 
-					break;
-					
-				if ((CS_GET_DISK_1(blob.rb_status_1) == MS_BLOB_REFERENCED) && CS_GET_DISK_2(blob.rb_alias_offset_2)) {
-					aliasRec.repo_offset = offset;
-					aliasRec.alias_hash = CS_GET_DISK_4(blob.rb_alias_hash_4);
-					addAlias(afile, &aliasRec);
-				}
-				
-				head_size = CS_GET_DISK_2(blob.rb_head_size_2);
-				blob_size = CS_GET_DISK_6(blob.rb_blob_repo_size_6);
-				offset += head_size + blob_size;
-			}
-			
-			release_(repoFile);
-		}
-	}
-	
-	afile->finishLoad();
-	backtopool_(afile);
-
-	exit_();
-}
-
-//------------------------
-void MSAlias::MSAliasBuild()
-{
-	CSFile *fa;
-	MSAliasHeadRec header = {0};
-	uint64_t offset, size = sizeof(header) + BUCKET_LIST_SIZE * sizeof(MSADiskBucketRec);
-	enter_();
-	
-	fa = CSFile::newFile(RETAIN(iFilePath));
-	push_(fa);
-
-	fa->open(CSFile::CREATE | CSFile::TRUNCATE);
-
-	// Create an empty index with 1 empty bucket in each bucket chain.	
-
-	CS_SET_DISK_4(header.ah_magic_4,  MS_ALIAS_FILE_MAGIC);
-	CS_SET_DISK_2(header.ah_version_2, MS_ALIAS_FILE_VERSION);
-		
-	CS_SET_DISK_2(header.ah_head_size_2, sizeof(header));
-	CS_SET_DISK_8(header.ah_file_size_8, size);
-	
-	CS_SET_DISK_2(header.ah_num_buckets_2, BUCKET_LIST_SIZE);
-	CS_SET_DISK_2(header.ah_bucket_size_4, NUM_RECORDS_PER_BUCKET);
-	
-	fa->setEOF(size); // Grow the file.
-	fa->write(&header, 0, sizeof(header));
-
-	offset = sizeof(header);
-	
-	// Initialize the file bucket chains.
-	MSADiskBucketHeadRec bucketHead = {0};
-	for (uint32_t i = 0; i < BUCKET_LIST_SIZE; i++) {
-		CS_SET_DISK_8(bucketHead.ab_prev_bucket_8, offset);
-		CS_SET_DISK_8(bucketHead.ab_next_bucket_8, offset);
-		fa->write(&bucketHead, offset, sizeof(MSADiskBucketHeadRec));
-		// Add the bucket to the RAM based list.
-		iFileShare->msa_buckets[i].addFront(MSABucketInfo::newMSABucketInfo(offset));
-		offset += sizeof(MSADiskBucketRec); // NOTE: MSADiskBucketRec not MSADiskBucketHeadRec
-	}
-	
-	fa->sync();
-	
-	
-	
-	fa->close();
-	
-	release_(fa);
-	
-	// Scan through all the BLOBs in the repository and add an entry
-	// for each blob alias.
-	buildAliasIndex();
-
-	exit_();
-}
-
-//------------------------
-void MSAlias::ma_open(const char *file_name)
-{
-	bool isdir = false;
-	
-	enter_();
-
-	iFilePath = CSPath::newPath(RETAIN(iDatabase_br->myDatabasePath), file_name);
-	
-retry:
-	new_(iFileShare, MSAliasFileShare(RETAIN(iFilePath)));
-	
-	if (iFilePath->exists(&isdir)) {
-		try_(a) {
-			MSAliasLoad(); 
-		}
-		catch_(a) {
-			// If an error occurs delete the index and rebuild it.
-			self->myException.log(NULL);
-			iFileShare->release();
-			iFilePath->removeFile();
-			goto retry;
-		}
-		cont_(a);
-	} else
-		MSAliasBuild();
-	
-	
-	exit_();
-}
-
-//------------------------
-uint32_t MSAlias::hashAlias(const char *ptr)
-{
-	register uint32_t h = 0, g;
-	
-	while (*ptr) {
-		h = (h << 4) + (uint32_t) toupper(*ptr++);
-		if ((g = (h & 0xF0000000)))
-			h = (h ^ (g >> 24)) ^ g;
-	}
-
-	return (h);
-}
-
-//------------------------
-void MSAlias::addAlias(MSAliasFile *af, MSAliasRec *rec)
-{
-	MSDiskAliasRec diskRec;
-	CS_SET_DISK_4(diskRec.ar_repo_id_4, rec->repo_id);	
-	CS_SET_DISK_8(diskRec.ar_offset_8, rec->repo_offset);	
-	CS_SET_DISK_4(diskRec.ar_hash_4, rec->alias_hash);
-	af->addRec(&diskRec);
-
-}
-
-//------------------------
-uint32_t MSAlias::addAlias(uint32_t repo_id, uint64_t repo_offset, const char *alias)
-{
-	MSDiskAliasRec diskRec;
-	uint32_t hash;
-	uint32_t f_repo_id;
-	uint64_t f_repo_offset;
-	bool referenced = false;
-	enter_();
-	
-	hash = hashAlias(alias);
-	
-	// Use a lock to make sure that the same alias cannot be added at the same time.
-	lock_(this);
-	
-	MSAliasFile *af = getAliasFile();
-	frompool_(af);
-
-	if (findBlobByAlias(RETAIN(af), alias, &referenced, &f_repo_id, &f_repo_offset)) {
-		if ((f_repo_id == repo_id) && (f_repo_offset == repo_offset))
-			goto done; // Do not treat this as an error.
-		if (!referenced) {
-			// If the alias is in use by a non referenced BLOB then delete it.
-			// This can happen because I allow newly created BLOBs to be accessed
-			// by their alias even before a reference to the BLOB has been added to
-			// the database.
-			af->deleteCurrentRec();
-		} else	{
-#ifdef xxDEBUG
-			CSL.log(self, CSLog::Protocol, "Alias: ");
-			CSL.log(self, CSLog::Protocol, alias);
-			CSL.log(self, CSLog::Protocol, "\n");
-#endif
-			CSException::throwException(CS_CONTEXT, MS_ERR_DUPLICATE, "Alias Exists");
-		}
-	}
-		
-	CS_SET_DISK_4(diskRec.ar_repo_id_4, repo_id);	
-	CS_SET_DISK_8(diskRec.ar_offset_8, repo_offset);	
-	CS_SET_DISK_4(diskRec.ar_hash_4, hash);	
-
-	af->addRec(&diskRec);
-done:
-	backtopool_(af);
-
-	unlock_(this);
-	return_(hash);
-}
-
-//------------------------
-void MSAlias::deleteAlias(MSDiskAliasPtr diskRec)
-{
-	enter_();
-	
-	MSAliasFile *af = getAliasFile();
-	frompool_(af);
-	if (af->findRec(diskRec))
-		af->deleteCurrentRec();
-	backtopool_(af);
-
-	exit_();
-}
-
-//------------------------
-void MSAlias::deleteAlias(uint32_t repo_id, uint64_t repo_offset, uint32_t alias_hash)
-{
-	MSDiskAliasRec diskRec;
-	
-	CS_SET_DISK_4(diskRec.ar_repo_id_4, repo_id);	
-	CS_SET_DISK_8(diskRec.ar_offset_8, repo_offset);	
-	CS_SET_DISK_4(diskRec.ar_hash_4, alias_hash);	
-	deleteAlias(&diskRec);
-	
-}
-//------------------------
-void MSAlias::resetAlias(uint32_t old_repo_id, uint64_t old_repo_offset, uint32_t alias_hash, uint32_t new_repo_id, uint64_t new_repo_offset)
-{
-	MSDiskAliasRec diskRec;
-	bool found;
-	enter_();
-	
-	CS_SET_DISK_4(diskRec.ar_repo_id_4, old_repo_id);	
-	CS_SET_DISK_8(diskRec.ar_offset_8, old_repo_offset);	
-	CS_SET_DISK_4(diskRec.ar_hash_4, alias_hash);	
-
-	lock_(this);
-	
-	MSAliasFile *af = getAliasFile();
-	frompool_(af);
-	found = af->findRec(&diskRec);
-	CS_SET_DISK_4(diskRec.ar_repo_id_4, new_repo_id);	
-	CS_SET_DISK_8(diskRec.ar_offset_8, new_repo_offset);	
-
-	if (found) 
-		af->updateCurrentRec(&diskRec);
-	else {
-		CSException::logException(CS_CONTEXT, MS_ERR_NOT_FOUND, "Alias doesn't exists");
-		af->addRec(&diskRec);
-	}
-			
-	backtopool_(af);
-
-	unlock_(this);
-	exit_();
-}
-
-//------------------------
-// Check to see if the blob with the given repo_id
-// and repo_offset has the specified alias.
-bool MSAlias::hasBlobAlias(uint32_t repo_id, uint64_t repo_offset, const char *alias, bool *referenced)
-{
-	bool found = false;
-	MSRepoFile *repoFile;
-	MSBlobHeadRec	blob;
-	uint8_t status;
-	uint64_t offset;
-	uint32_t alias_size = strlen(alias) +1;
-	char blob_alias[BLOB_ALIAS_LENGTH +1];
-	
-	if (alias_size > BLOB_ALIAS_LENGTH)
-		return false;
-
-	enter_();
-	
-	repoFile = iDatabase_br->getRepoFileFromPool(repo_id, false);
-	frompool_(repoFile);
-
-	repoFile->read(&blob, repo_offset, sizeof(MSBlobHeadRec), sizeof(MSBlobHeadRec));
-	status = CS_GET_DISK_1(blob.rb_status_1);
-	if (IN_USE_BLOB_STATUS(status)) {
-		offset = repo_offset + CS_GET_DISK_2(blob.rb_alias_offset_2);
-		
-		blob_alias[BLOB_ALIAS_LENGTH] = 0;
-		if (repoFile->read(blob_alias, offset, alias_size, 0) == alias_size) {
-			found = !my_strcasecmp(&my_charset_utf8_general_ci, blob_alias, alias);
-			if (found)
-				*referenced = (status == MS_BLOB_REFERENCED);
-		}
-	} else {
-		CSException::logException(CS_CONTEXT, MS_ERR_ENGINE, "Deleted BLOB alias found. (Rebuild BLOB alias index.)");
-	}
-	
-		
-	backtopool_(repoFile);	
-
-	return_(found);
-}
-
-//------------------------
-bool MSAlias::findBlobByAlias( MSAliasFile *af, const char *alias, bool *referenced, uint32_t *repo_id, uint64_t *repo_offset)
-{
-	bool found = false;
-	uint32_t hash, l_repo_id, l_repo_offset;
-	MSDiskAliasPtr diskRec;
-	enter_();
-
-	push_(af);
-	
-	hash = hashAlias(alias);
-	diskRec = af->findRec(hash);
-	
-	while (diskRec && !found) {
-		l_repo_id = CS_GET_DISK_4(diskRec->ar_repo_id_4);
-		l_repo_offset = CS_GET_DISK_8(diskRec->ar_offset_8);
-		if (hasBlobAlias(l_repo_id, l_repo_offset, alias, referenced))
-			found = true;
-		else
-			diskRec = af->nextRec();
-	}
-		
-	if (found) {
-		if (repo_id)
-			*repo_id = l_repo_id;
-			
-		if (repo_offset)
-			*repo_offset = l_repo_offset;
-	}
-	
-	release_(af);
-	return_(found);
-}
-//------------------------
-bool MSAlias::findBlobByAlias( const char *alias, bool *referenced, uint32_t *repo_id, uint64_t *repo_offset)
-{
-	bool found;
-	enter_();
-	
-	MSAliasFile *af = getAliasFile();
-	frompool_(af);
-	
-	found = findBlobByAlias(RETAIN(af), alias, referenced, repo_id, repo_offset);
-
-	backtopool_(af);
-	return_(found);
-}
-
-//------------------------
-bool MSAlias::blobAliasExists(uint32_t repo_id, uint64_t repo_offset, uint32_t alias_hash)
-{
-	bool found;
-	MSDiskAliasRec diskRec;
-	
-	CS_SET_DISK_4(diskRec.ar_repo_id_4, repo_id);	
-	CS_SET_DISK_8(diskRec.ar_offset_8, repo_offset);	
-	CS_SET_DISK_4(diskRec.ar_hash_4, alias_hash);	
-
-	enter_();
-	
-	MSAliasFile *af = getAliasFile();
-	frompool_(af);
-	
-	found = af->findRec(&diskRec);
-
-	backtopool_(af);
-	return_(found);
-}
-
-/////////////////////////////////////
-MSSysMeta::MSSysMeta(MSAlias *msa)
-{
-	md_myMSAlias = msa;
-	md_isFileInUse = false;
-	md_NextLink = md_PrevLink = NULL;
-	
-	mtab = MSMetaDataTable::newMSMetaDataTable(RETAIN(msa->iDatabase_br));
-}
-
-//------------------------
-MSSysMeta::~MSSysMeta()
-{
-	if (mtab)
-		mtab->release();
-
-	if (md_myMSAlias)
-		md_myMSAlias->release();
-}
-
-//------------------------
-void MSSysMeta::returnToPool()
-{
-	enter_();
-	push_(this);
-	
-		
-	md_isFileInUse = false;
-		
-	if (!md_myMSAlias->iClosing) {
-		lock_(&md_myMSAlias->iSysTablePoolLock); // It may be better if the pool had it's own lock.
-		md_nextFile = md_myMSAlias->iSysTablePool;
-		md_myMSAlias->iSysTablePool - this;
-		unlock_(&md_myMSAlias->iSysTablePoolLock);
-	}
-		
-	release_(this);
-	exit_();
-}
-//------------------------
-bool MSSysMeta::matchAlias(uint32_t repo_id, uint64_t repo_offset, const char *alias)
-{
-	mtab->seqScanInit(); 
-	return mtab->matchAlias(repo_id, repo_offset, alias); 
-}
-
-/////////////////////////////////////
-/////////////////////////////////////
-MSAliasFile::MSAliasFile(MSAliasFileShare *share)
-{
-	ba_share = share;
-	ba_isFileInUse = false;
-	ba_NextLink = ba_PrevLink = NULL;
-	
-	iCurrentRec = 0;
-	iBucketCache = NULL;
-	iStartBucket = iCurrentBucket = NULL;
-	iBucketChain = NULL;
-	iLoading = false;
-	ba_nextFile = NULL;
-	
-	iFile = CSFile::newFile(RETAIN(ba_share->msa_filePath));	
-	iFile->open(CSFile::DEFAULT);
-	
-	
-}
-
-//------------------------
-MSAliasFile::~MSAliasFile()
-{
-	if (iFile)
-		iFile->release();
-		
-	if (iBucketCache)
-		cs_free(iBucketCache);
-}
-
-//------------------------
-void MSAliasFile::startLoad()
-{
-	enter_();
-	
-	ASSERT(!iLoading);
-	
-//	iBucketCache = (MSADiskBucketRec*) cs_malloc(BUCKET_LIST_SIZE * sizeof(MSADiskBucketRec));
-//	memset(iBucketCache, 0, BUCKET_LIST_SIZE * sizeof(MSADiskBucketRec));
-	iLoading = true;
-	
-	exit_();
-}
-
-//------------------------
-void MSAliasFile::finishLoad()
-{
-	enter_();
-	ASSERT(iLoading);
-	// Write the bucket cache to disk.
-//	for (iCurrentBucket && iCurrentBucket->getSize()) {
-		// To Be implemented.
-//	}
-//	cs_free(iBucketCache);
-	iBucketCache = NULL;
-	iLoading = false;
-	exit_();
-}
-
-//------------------------
-void MSAliasFile::returnToPool()
-{
-	enter_();
-	push_(this);
-	
-	if (iLoading) {
-		// If iLoading is still set then probably an exception has been thrown.
-		try_(a) {
-			finishLoad();
-		}
-		catch_(a) 
-			iLoading = false;
-		cont_(a);
-	}
-
-	ba_isFileInUse = false;
-		
-	if (!ba_share->msa_closing) {
-		lock_(&ba_share->msa_poolLock);
-		ba_nextFile = ba_share->msa_pool;
-		ba_share->msa_pool = this;
-		unlock_(&ba_share->msa_poolLock);
-	}
-		
-	release_(this);
-	exit_();
-}
-
-//------------------------
-// The bucket chain is treated as a circular list.
-bool MSAliasFile::nextBucket(bool with_space)
-{
-	bool have_bucket = false;
-	enter_();
-	
-	while (!have_bucket){
-		if (iCurrentBucket) {
-			iCurrentBucket = iCurrentBucket->getNextLink();
-			if (!iCurrentBucket)
-				iCurrentBucket = iBucketChain->getFront();
-			if (iCurrentBucket == iStartBucket)
-				break;
-		} else {
-			iCurrentBucket = iBucketChain->getFront();
-			iStartBucket = iCurrentBucket;
-		}
-		
-		if ((iCurrentBucket->getSize() && !with_space) || (with_space && (iCurrentBucket->getSize() < NUM_RECORDS_PER_BUCKET))){
-			// Only read the portion of the bucket containing records.
-			iCurrentRec = iCurrentBucket->getEndOfRecords(); // The current record is set just beyond the last valid record.
-			size_t size = iCurrentRec * sizeof(MSDiskAliasRec);		
-			iFile->read(iBucket, iCurrentBucket->bi_records_offset, size, size);			
-			have_bucket = true;
-		}
-	}
-	
-	return_(have_bucket);
-}
-
-//------------------------
-MSDiskAliasPtr MSAliasFile::nextRec()
-{
-	MSDiskAliasPtr rec = NULL;
-	bool have_rec;
-	enter_();
-	
-	while ((!(have_rec = scanBucket())) && nextBucket(false));
-	
-	if (have_rec) 
-		rec = &(iBucket[iCurrentRec]);
-		
-	return_(rec);
-}
-
-//------------------------
-// When starting a search:
-// If a bucket is already loaded and it is in the correct bucket chain
-// then search it first. In this case then the search starts at the current
-// bucket in the chain.
-//
-// Searches are from back to front with the idea that the more recently
-// added objects will be seached for more often and they are more likely
-// to be at the end of the chain.
-MSDiskAliasPtr MSAliasFile::findRec(uint32_t hash)
-{
-	MSDiskAliasPtr rec = NULL;
-	MSABucketLinkedList *list = ba_share->getBucketChain(hash);
-	enter_();
-	
-	CS_SET_DISK_4(iDiskHash_4, hash);
-	if (list == iBucketChain) {
-		// The search is performed back to front.
-		iCurrentRec = iCurrentBucket->getEndOfRecords();  // Position the start just beyond the last valid record.
-		iStartBucket = iCurrentBucket;
-		if (scanBucket()) {
-			rec = &(iBucket[iCurrentRec]);
-			goto done;
-		}
-	} else {
-		iBucketChain = list;
-		iCurrentBucket = NULL;
-		iStartBucket = NULL;
-	}
-
-	if (nextBucket(false))
-		rec = nextRec();
-		
-done:
-	return_(rec);
-}
-
-//------------------------
-bool MSAliasFile::findRec(MSDiskAliasPtr theRec)
-{
-	MSDiskAliasPtr aRec = NULL;
-	bool found = false;
-	enter_();
-	
-	aRec = findRec(CS_GET_DISK_4(theRec->ar_hash_4));
-	while ( aRec && !found) {
-		if (CS_EQ_DISK_4(aRec->ar_repo_id_4, theRec->ar_repo_id_4) && CS_EQ_DISK_8(aRec->ar_offset_8, theRec->ar_offset_8))
-			found = true;
-		else
-			aRec = nextRec();
-	}	
-	return_(found);
-}
-
-//------------------------
-void MSAliasFile::addRec(MSDiskAliasPtr new_rec)
-{
-	MSABucketLinkedList *list = ba_share->getBucketChain(CS_GET_DISK_4(new_rec->ar_hash_4));
-	enter_();
-	lock_(&ba_share->msa_writeLock);
-
-	if (iBucketChain != list) {
-		iBucketChain = list;
-		iCurrentBucket = NULL;
-		iStartBucket = NULL;
-	} else 
-		iStartBucket = iCurrentBucket;
-
-	if ((iCurrentBucket && (iCurrentBucket->getSize() < NUM_RECORDS_PER_BUCKET)) || nextBucket(true)) { // Find a bucket with space in it for a record.
-		uint32_t size = iCurrentBucket->getSize();
-		uint32_t end_of_records = iCurrentBucket->getEndOfRecords();
-
-		if (size == end_of_records) { // No holes in the recored list
-			iCurrentRec = end_of_records;			
-		} else { // Search for the empty record
-			iCurrentRec = end_of_records -2;			
-			while (iCurrentRec && !CS_IS_NULL_DISK_4(iBucket[iCurrentRec].ar_repo_id_4))
-				iCurrentRec--;
-				
-			ASSERT(CS_IS_NULL_DISK_4(iBucket[iCurrentRec].ar_repo_id_4));
-		}
-		
-		memcpy(&iBucket[iCurrentRec], new_rec, sizeof(MSDiskAliasRec)); // Add the record to the cached bucket.
-		
-		iCurrentBucket->recAdded(iFile, iCurrentRec); // update the current bucket header.
-	} else { // A new bucket must be added to the chain.
-		MSADiskBucketHeadRec new_bucket = {0};
-		CSDiskValue8 disk_8_value;
-		uint64_t new_bucket_offset;
-		MSABucketInfo *next, *prev;
-		
-		next = iBucketChain->getFront();
-		prev = iBucketChain->getBack();
-		
-		// Set the next and prev bucket offsets in the new bucket record.
-		CS_SET_DISK_8(new_bucket.ab_prev_bucket_8, prev->bi_bucket_offset);
-		CS_SET_DISK_8(new_bucket.ab_next_bucket_8, next->bi_bucket_offset);
-		
-		if (ba_share->msa_empty_buckets.getSize()) { // Get a bucket from the empty bucket list.
-			MSABucketInfo *empty_bucket = ba_share->msa_empty_buckets.removeFront();
-			
-			new_bucket_offset = empty_bucket->bi_bucket_offset;			
-			empty_bucket->release();
-			
-			// Update the index file's empty bucket list 
-			if (ba_share->msa_empty_buckets.getSize() == 0) 
-				CS_SET_NULL_DISK_8(disk_8_value);
-			else
-				CS_SET_DISK_8(disk_8_value, iBucketChain->getFront()->bi_bucket_offset);
-			
-			iFile->write(&disk_8_value, offsetof(MSAliasHeadRec,ah_free_list_8) , 8); 
-		} else // There are no empty buckets so grow the file.
-			new_bucket_offset = ba_share->msa_fileSize;
-			
-		// Write the new bucket's record header to the file
-		iFile->write(&new_bucket, new_bucket_offset, sizeof(MSADiskBucketHeadRec)); 
-		
-		// Insert the new bucket into the bucket chain on the disk.
-		CS_SET_DISK_8(disk_8_value, new_bucket_offset);
-		iFile->write(&disk_8_value, prev->bi_bucket_offset +  offsetof(MSADiskBucketHeadRec,ab_next_bucket_8), 8); 
-		iFile->write(&disk_8_value, next->bi_bucket_offset +  offsetof(MSADiskBucketHeadRec,ab_prev_bucket_8), 8); 
-		
-		// Update the file size in the file header if required
-		if (ba_share->msa_fileSize == new_bucket_offset) {
-			ba_share->msa_fileSize += sizeof(MSADiskBucketRec); // Note this is MSADiskBucketRec not MSADiskBucketHeadRec
-
-			CS_SET_DISK_8(disk_8_value, ba_share->msa_fileSize);
-			iFile->write(&disk_8_value, offsetof(MSAliasHeadRec,ah_file_size_8) , 8); 
-		}
-		
-		// Add the info rec into the bucket chain in RAM.
-		iCurrentBucket = MSABucketInfo::newMSABucketInfo(new_bucket_offset, 1, 0);
-		iBucketChain->addFront(iCurrentBucket);
-		iCurrentRec = 0;
-	}
-	
-	uint64_t offset;
-	offset = iCurrentBucket->bi_records_offset + iCurrentRec * sizeof(MSDiskAliasRec);
-
-	// Write the new index entry to the index file.
-	iFile->write(new_rec, offset, sizeof(MSDiskAliasRec)); 
-	
-	unlock_(&ba_share->msa_writeLock);
-	
-	exit_();	
-}
-//------------------------
-void MSAliasFile::deleteCurrentRec()
-{
-	MSDiskAliasPtr rec = &(iBucket[iCurrentRec]);
-	uint64_t	offset;
-	enter_();
-	
-	CS_SET_NULL_DISK_4(rec->ar_repo_id_4);
-	offset = iCurrentBucket->bi_records_offset + iCurrentRec * sizeof(MSDiskAliasRec);
-	
-	lock_(&ba_share->msa_writeLock);
-
-	// Update the index file. It is assumed that repo_id is the first 4 bytes of 'rec'.
-	iFile->write(rec, offset, 4); 
-	
-	iCurrentBucket->recRemoved(iFile, iCurrentRec, iBucket);
-	
-	unlock_(&ba_share->msa_writeLock);
-	
-	exit_();	
-}
-
-//------------------------
-void MSAliasFile::updateCurrentRec(MSDiskAliasPtr update_rec)
-{
-	uint64_t	offset;
-	enter_();
-	
-	// ASSERT that the updated rec still belongs to this bucket chain.
-	ASSERT(ba_share->getBucketChain(CS_GET_DISK_4(update_rec->ar_hash_4)) == iBucketChain);
-	ASSERT(!CS_IS_NULL_DISK_4(iBucket[iCurrentRec].ar_repo_id_4)); // We should not be updating a deleted record.
-	
-	lock_(&ba_share->msa_writeLock);
-	offset = iCurrentBucket->bi_records_offset + iCurrentRec * sizeof(MSDiskAliasRec);
-	
-	// Update the record on disk.
-	iFile->write(update_rec, offset, sizeof(MSDiskAliasRec));
-	
-	// Update the record in memory. 
-	CS_COPY_DISK_4(iBucket[iCurrentRec].ar_repo_id_4, update_rec->ar_repo_id_4);	
-	CS_COPY_DISK_8(iBucket[iCurrentRec].ar_offset_8, update_rec->ar_offset_8);	
-
-	unlock_(&ba_share->msa_writeLock);
-	exit_();	
-}
-
-
-//------------------------
-MSABucketInfo *MSABucketInfo::newMSABucketInfo(uint64_t offset, uint32_t num, uint32_t last)
-{
-	MSABucketInfo *bucket;
-	new_(bucket, MSABucketInfo(offset, num, last));
-	return bucket;
-}
-//------------------------
-void MSABucketInfo::recRemoved(CSFile *iFile, uint32_t idx, MSDiskAliasRec bucket[])
-{
-	MSADiskBucketHeadRec head;
-	enter_();
-	
-	ASSERT(idx < bi_end_of_records);
-	
-	bi_num_recs--;
-	if (!bi_num_recs) {
-		// It would be nice to remove this bucket from the 
-		// bucket list and place it on the empty list.
-		// Before this can be done a locking method would
-		// be needed to block anyone from reading this
-		// bucket while it was being moved.
-		//
-		// I haven't done this because I have been trying
-		// to avoid read locks.
-		bi_end_of_records = 0;
-	} else if ((bi_end_of_records -1) == idx) {
-		while (idx && CS_IS_NULL_DISK_4(bucket[idx].ar_repo_id_4))
-			idx--;
-			
-		if ((idx ==0) && CS_IS_NULL_DISK_4(bucket[0].ar_repo_id_4))
-			bi_end_of_records = 0;
-		else
-			bi_end_of_records = idx +1;
-		
-		ASSERT(bi_end_of_records >= bi_num_recs);
-	}
-	
-	// Update the index file.
-	CS_SET_DISK_4(head.ab_num_recs_4, bi_num_recs);
-	CS_SET_DISK_4(head.ab_eor_rec_4, bi_end_of_records);
-	iFile->write(&head.ab_num_recs_4, bi_bucket_offset +  offsetof(MSADiskBucketHeadRec,ab_num_recs_4), 8); 
-	exit_();
-}
-
-//------------------------
-void MSABucketInfo::recAdded(CSFile *iFile, uint32_t idx)
-{
-	MSADiskBucketHeadRec head;
-	enter_();
-	
-	ASSERT(bi_num_recs < NUM_RECORDS_PER_BUCKET);
-	ASSERT(idx < NUM_RECORDS_PER_BUCKET);
-
-	bi_num_recs++;
-	if (idx == bi_end_of_records)
-		bi_end_of_records++;
-		
-	// Update the index file.
-	CS_SET_DISK_4(head.ab_num_recs_4, bi_num_recs);
-	CS_SET_DISK_4(head.ab_eor_rec_4, bi_end_of_records);
-	iFile->write(&head.ab_num_recs_4, bi_bucket_offset +  offsetof(MSADiskBucketHeadRec,ab_num_recs_4), 8); 
-	exit_();	
-}
-
-//////////////////////////////////
-MSAliasFile *MSAliasFileShare::getPoolFile()
-{
-	MSAliasFile *af;
-	enter_();
-	
-	lock_(&msa_poolLock); 
-	if ((af = msa_pool)) {
-		msa_pool = af->ba_nextFile;
-	} else {
-		new_(af, MSAliasFile(this));
-		msa_poolFiles.addFront(af);
-	}
-	unlock_(&msa_poolLock);
-	
-	af->ba_nextFile = NULL;
-	ASSERT(!af->ba_isFileInUse);
-	af->ba_isFileInUse = true;
-	af->retain();
-	
-	return_(af);
-}
-#endif // HAVE_ALIAS_SUPPORT
-
 
=== removed file 'plugin/pbms/src/alias_ms.h'
--- plugin/pbms/src/alias_ms.h	2011-03-14 05:40:28 +0000
+++ plugin/pbms/src/alias_ms.h	1970-01-01 00:00:00 +0000
@@ -1,350 +0,0 @@
-/* Copyright (C) 2008 PrimeBase Technologies GmbH, Germany
- *
- * PrimeBase Media Stream for MySQL
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Barry Leslie
- *
- * 2008-12-30
- *
- * H&G2JCtL
- *
- * BLOB alias index.
- *
- */
-
-
-#pragma once
-#ifndef __ALIAS_MS_H__
-#define __ALIAS_MS_H__
-#include <stddef.h>
-
-#include "defs_ms.h"
-#include "cslib/CSStorage.h"
-
-#define MS_ALIAS_FILE_MAGIC			0x5954228A
-#define MS_ALIAS_FILE_VERSION		1
-#define BLOB_ALIAS_LENGTH			1024
-#define INVALID_ALIAS_HASH			((uint32_t)-1)
-
-#ifdef HAVE_ALIAS_SUPPORT
-class MSOpenTable;
-class MSDatabase;
-class CSHTTPOutputStream;
-class MSMetaDataTable;
-
-#define ACTIVE_ALIAS_INDEX "ms_blob_alias.idx"
-
-#define NUM_RECORDS_PER_BUCKET	254		// 254 = bucket size of 4 K
-#define BUCKET_LIST_SIZE		1024		
-
-typedef struct MSAliasHead {
-	CSDiskValue4			ah_magic_4;							/* Table magic number. */
-	CSDiskValue2			ah_version_2;						/* The header version. */
-	CSDiskValue2			ah_head_size_2;						/* The size of the header. */
-	CSDiskValue8			ah_file_size_8;						/* The size of the file. */	
-	
-	CSDiskValue8			ah_free_list_8;						/* The offset of the first bucket in the free list. */
-	
-	CSDiskValue2			ah_num_buckets_2;					/* The number of bucket chains in the index. (BUCKET_LIST_SIZE when created)*/	
-	CSDiskValue4			ah_bucket_size_4;					/* The size of each bucket. (NUM_RECORDS_PER_BUCKET when created)*/
-
-} MSAliasHeadRec, *MSAliasHeadPtr;
-
-/*
- * When a record is freed  ba_repo_id_4 is set to zero 
-*/
-typedef struct MSDiskAliasRec {
-	CSDiskValue4			ar_repo_id_4;						/* File ID. Not zero when allocated. */
-	CSDiskValue8			ar_offset_8;						/* Offset into the file of the BLOB. */
-	CSDiskValue4			ar_hash_4;							/* The hash value of the alias string. (Is assumed to be at the end of the structure.*/
-} MSDiskAliasRec, *MSDiskAliasPtr;
-
-typedef struct MSADiskBucketHead {
-	CSDiskValue8			ab_prev_bucket_8;					/* The file offset of the previouse bucket in the chain. */
-	CSDiskValue8			ab_next_bucket_8;					/* The file offset of the next bucket in the chain. */
-	CSDiskValue4			ab_num_recs_4;						/* The number of used record in the bucket. */
-	CSDiskValue4			ab_eor_rec_4;						/* (End Of Records) The position of the first free record after all the records in the bucket. */
-} MSADiskBucketHeadRec, *MSADiskBucketHeadPtr;
-
-typedef struct MSADiskBucket {
-	MSADiskBucketHeadRec	ab_heaher;
-	MSDiskAliasRec			ab_records[NUM_RECORDS_PER_BUCKET];	/* The start of the records in the bucket. */
-} MSADiskBucketRec, *MSADiskBucketPtr;
-
-/*
- * MSABucketInfo stores bucket information in RAM.
- */
-class MSABucketInfo: public CSOrderKey  {
-public:
-
-	MSABucketInfo(uint64_t offset, uint32_t num, uint32_t end_of_records): 
-		bi_bucket_offset(offset),
-		bi_records_offset(offset + offsetof(MSADiskBucketRec, ab_records)),
-		bi_num_recs(num),
-		bi_end_of_records(end_of_records),
-		bi_NextLink(NULL),
-		bi_PrevLink(NULL)
-		{}
-		
-	uint64_t			bi_bucket_offset;	/* The file offset of the bucket. */
-
-	uint64_t			bi_records_offset;	/* The file offset of the first record in the bucket. */
-	
-	// Required method for item in a CSLinkedList.
-	virtual MSABucketInfo *getNextLink() { return bi_NextLink; }
-	virtual MSABucketInfo *getPrevLink() { return bi_PrevLink; }
-	virtual void setNextLink(CSObject *link) { bi_NextLink = (MSABucketInfo*)link; }
-	virtual void setPrevLink(CSObject *link) { bi_PrevLink = (MSABucketInfo*)link; }
-
-	virtual CSObject *getKey() { return this;}
-	virtual int compareKey(CSOrderKey *x) {
-		MSABucketInfo	*key = (MSABucketInfo *) x;
-		
-		if (bi_bucket_offset != key->bi_bucket_offset)
-			return 0;
-		
-		return (bi_bucket_offset < key->bi_bucket_offset)? -1: 1;
-	}
-	
-	static MSABucketInfo *newMSABucketInfo(uint64_t offset, uint32_t num = 0, uint32_t last = 0);
-
-	uint32_t			getSize() { return bi_num_recs;}
-	uint32_t			getEndOfRecords() { return bi_end_of_records;}
-	void			recAdded(CSFile *iFile, uint32_t idx);
-	void			recRemoved(CSFile *iFile, uint32_t idx, MSDiskAliasRec bucket[]);
-	
-private:
-	// (bi_end_of_records -1) is the index of the last valid record in the bucket.
-	// free records can actually appear any where in the bucket unless it has
-	// just been compressed.
-	uint32_t			bi_num_recs;		/* The number of records in the bucket. */
-	uint32_t			bi_end_of_records;	/* The index of the start of the free records in the bucket. */
-
-	MSABucketInfo	*bi_NextLink;
-	MSABucketInfo	*bi_PrevLink;
-};
-
-class MSABucketLinkedList: public CSLinkedList {
-public:
-
-	/* Value is returned referenced. */
-	MSABucketInfo *removeBack() { return (MSABucketInfo*) CSLinkedList::removeBack();}
-
-	/* Value is returned NOT referenced. */
-	MSABucketInfo *getBack(){ return (MSABucketInfo*) CSLinkedList::getBack();}
-
-	/* Value is returned NOT referenced. */
-	MSABucketInfo *getFront(){ return (MSABucketInfo*) CSLinkedList::getFront();}
-
-	/* Value is returned referenced. */
-	MSABucketInfo *removeFront(){ return (MSABucketInfo*) CSLinkedList::removeFront();}
-};
-
-typedef struct MSAliasRec {
-	uint32_t			repo_id;	
-	uint64_t			repo_offset;
-	uint32_t			alias_hash;
-} MSAliasRec, *MSAliasPtr;
-
-class MSAliasFile : public CSPooled, public CSRefObject {
-public:
-	class MSAliasFileShare *ba_share;
-	bool			ba_isFileInUse;
-	MSAliasFile		*ba_nextFile;									/* Next file available in the pool */
-
-	MSAliasFile(MSAliasFileShare *share);
-	virtual ~MSAliasFile();
-
-	// Required method for CSPool item.
-	virtual void returnToPool();
-
-	
-	// Required method for item in a CSLinkedList.
-	virtual CSObject *getNextLink() { return ba_NextLink; }
-	virtual CSObject *getPrevLink() { return ba_PrevLink; }
-	virtual void setNextLink(CSObject *link) { ba_NextLink = link; }
-	virtual void setPrevLink(CSObject *link) { ba_PrevLink = link; }
-
-	// Index file operations.
-	MSDiskAliasPtr	findRec(uint32_t hash);
-	MSDiskAliasPtr	nextRec();
-	void			addRec(MSDiskAliasPtr rec); 
-	void			deleteCurrentRec();
-	void			updateCurrentRec(MSDiskAliasPtr rec);
-	bool			findRec(MSDiskAliasPtr rec);
-	
-	/* When a load is inprogress locks are not required and writes are batched. */
-	void			startLoad();
-	void			finishLoad();
-
-
-private:
-	bool			nextBucket(bool with_space);
-		
-	bool	scanBucket() 
-			{
-				while (iCurrentRec) {
-					iCurrentRec--;
-					if ( CS_EQ_DISK_4(iDiskHash_4, iBucket[iCurrentRec].ar_hash_4)
-						&& !CS_IS_NULL_DISK_4(iBucket[iCurrentRec].ar_repo_id_4))
-						return true;
-				}
-				return false;
-			}
-			
-	CSFile				*iFile;			// The index file.
-	
-	bool				iLoading;
-	MSADiskBucketRec	*iBucketCache; // The bucket cache is used during index loading in single thread mode.
-	MSDiskAliasRec		iBucket[NUM_RECORDS_PER_BUCKET];// The current bucket loaded from disk.
-	MSABucketLinkedList	*iBucketChain;	// The bucket list for the current hash value.
-	MSABucketInfo		*iStartBucket;	// The file offset of the bucket the search started at.
-	MSABucketInfo		*iCurrentBucket;// The currnet bucket, NULL if no bucket is loaded.
-	
-	CSDiskValue4		iDiskHash_4;	// The current hash value we are looking for in disk byte order.
-	uint32_t				iCurrentRec;	// The current record position in the current bucket.
-	
-	CSObject			*ba_NextLink;
-	CSObject			*ba_PrevLink;
-
-};
-
-//===========================================
-class MSAliasFileShare: public CSObject  {
-public:
-	MSAliasFileShare(CSPath *path):
-		msa_filePath(path),
-		msa_fileSize(0),
-		msa_pool(NULL),
-		msa_closing(false)
-		{
-			bool isdir = false;
-			if (path->exists(&isdir))
-				msa_fileSize = path->getSize();
-		}
-		
-	~MSAliasFileShare()
-	{
-		msa_poolFiles.clear();
-		if (msa_filePath)
-			msa_filePath->release();
-			
-		for (uint32_t i =0; i < BUCKET_LIST_SIZE; i++)
-			msa_buckets[i].clear();
-			
-		msa_empty_buckets.clear();
-	}
-	
-	void close() { msa_poolFiles.clear();}
-	
-	MSABucketLinkedList *getBucketChain(uint32_t hash) { return msa_buckets + (hash % BUCKET_LIST_SIZE); }
-	MSAliasFile		*getPoolFile();
-	
-	CSLinkedList	msa_poolFiles;		/* A list of all files in this pool */
-	uint64_t			msa_fileSize;
-	CSPath			*msa_filePath;
-	CSLock			msa_writeLock;	
-	MSAliasFile		*msa_pool;			/* A list of files currently not in use. */
-	
-	CSLock			msa_poolLock;	
-	bool			msa_closing;
-	MSABucketLinkedList	msa_empty_buckets;		/* A list of unused buckets. */
-	
-	MSABucketLinkedList	msa_buckets[BUCKET_LIST_SIZE];	/* An array of bucket chains. */
-};
-
-//===========================================
-class MSSysMeta : public CSRefObject, public CSPooled {
-public:
-	class MSAlias	*md_myMSAlias;
-	bool			md_isFileInUse;
-	MSSysMeta		*md_nextFile;									/* Next file available in the pool */
-
-	MSSysMeta(MSAlias *msa);
-	virtual ~MSSysMeta();
-
-	virtual void returnToPool();
-
-	virtual CSObject *getNextLink() { return md_NextLink; }
-	virtual CSObject *getPrevLink() { return md_PrevLink; }
-	virtual void setNextLink(CSObject *link) { md_NextLink = link; }
-	virtual void setPrevLink(CSObject *link) { md_PrevLink = link; }
-
-	bool matchAlias(uint32_t repo_id, uint64_t repo_offset, const char *alias);
-
-private:
-	MSMetaDataTable	*mtab;
-	CSObject		*md_NextLink;
-	CSObject		*md_PrevLink;
-
-};
-
-//===========================================
-class MSAlias  : public CSSharedRefObject  {
-public:
-
-	MSAlias(MSDatabase *db_noref);
-	~MSAlias();
-
-	void ma_open(const char *file_name = ACTIVE_ALIAS_INDEX);
-	void ma_close();
-	void ma_delete() {iDelete = true;}
-
-	uint32_t addAlias(uint32_t repo_id, uint64_t repo_offset, const char *alias);
-private:
-	void addAlias(MSAliasFile *af, MSAliasRec *rec);
-public:
-	void deleteAlias(MSDiskAliasPtr diskRec);
-	void deleteAlias(uint32_t repo_id, uint64_t repo_offset, uint32_t alias_hash);
-	void resetAlias(uint32_t old_repo_id, uint64_t old_repo_offset, uint32_t alias_hash, uint32_t new_repo_id, uint64_t new_repo_offset);
-
-	bool findBlobByAlias(const char *alias, bool *referenced, uint32_t *repo_id = NULL, uint64_t *repo_offset = NULL);
-	bool blobAliasExists(uint32_t repo_id, uint64_t repo_offset, uint32_t alias_hash);
-private:
-	bool findBlobByAlias(MSAliasFile *af, const char *alias, bool *referenced, uint32_t *repo_id = NULL, uint64_t *repo_offset = NULL);
-public:
-	static uint32_t	hashAlias(const char *ptr);
-	
-	void MSAliasBuild();
-	
-	friend class MSAliasFile;
-	friend class MSSysMeta;
-
-private:
-	MSDatabase		*iDatabase_br; // This is a back reference so this reference is not counted. 
-	CSPath			*iFilePath;
-	
-	bool			iClosing;
-	bool			iDelete;			// true when the alias index file should be deleted.
-	
-	MSAliasFileShare *iFileShare;	// File information shared between all files in the pool.
-	
-	CSLock			iSysTablePoolLock;
-	MSSysMeta		*iSysTablePool;									/* A list of files currently not in use. */
-	CSLinkedList	iPoolSysTables;									/* A list of all files in this pool */
-	
-	MSAliasFile *getAliasFile() { return iFileShare->getPoolFile();}
-	void		buildAliasIndex();
-	void		MSAliasCompress(CSFile *fa, CSSortedList *freeList, MSABucketLinkedList *bucketChain);
-	void		MSAliasLoad();
-	bool		hasBlobAlias(uint32_t repo_id, uint64_t repo_offset, const char *alias, bool *referenced);
-};
-
-
-#endif //HAVE_ALIAS_SUPPORT
-
-#endif // __ALIAS_MS_H__
 
=== removed file 'plugin/pbms/src/api_ms.cc'
--- plugin/pbms/src/api_ms.cc	2010-12-18 04:43:40 +0000
+++ plugin/pbms/src/api_ms.cc	1970-01-01 00:00:00 +0000
@@ -1,270 +0,0 @@
-#ifdef NOT_USED_IN_ANY_THING
-
-/* Copyright (C) 2008 PrimeBase Technologies GmbH, Germany
- *
- * PrimeBase Media Stream for MySQL
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Barry Leslie
- *
- * 2007-11-25
- *
- * H&G2JCtL
- *
- */
-
-#include "cslib/CSConfig.h"
-#include "cslib/CSGlobal.h"
-#include "cslib/CSLog.h"
-#include "cslib/CSStrUtil.h"
-#include "cslib/CSHTTPStream.h"
-#include "cslib/CSStream.h"
-
-#include "repository_ms.h"
-#include "open_table_ms.h"
-#include "mysql_ms.h"
-
-//-----------------------------------------------------------------------------------------------
-void PBMSGetError(void *v_bs_thread, PBMSResultPtr result)
-{
-	CSThread *ms_thread = (CSThread*)v_bs_thread;
-	
-	ASSERT(ms_thread);
-	memset(result, 0, sizeof(PBMSResultRec));
-	
-	result->mr_code =  ms_thread->myException.getErrorCode();
-	cs_strcpy(MS_RESULT_MESSAGE_SIZE, result->mr_message,  ms_thread->myException.getMessage());
-}
-
-//-----------------------------------------------------------------------------------------------
-void *PBMSInitBlobStreamingThread(char *thread_name, PBMSResultPtr result)
-{
-	CSThread *ms_thread =  new CSThread( NULL);
-	
-	if (!ms_thread) {
-		memset(result, 0, sizeof(PBMSResultRec));
-		result->mr_code = ENOMEM;
-		cs_strcpy(MS_RESULT_MESSAGE_SIZE, result->mr_message, "CSThread::newThread() failed.");
-		return NULL; 
-	}
-	
-	ms_thread->pbms_api_owner = true;
-	if (!CSThread::attach(ms_thread)) {
-		memset(result, 0, sizeof(PBMSResultRec));
-		result->mr_code =  ms_thread->myException.getErrorCode();
-		cs_strcpy(MS_RESULT_MESSAGE_SIZE, result->mr_message,  ms_thread->myException.getMessage());
-		ms_thread->release();
-		ms_thread = NULL;
-	} else
-		ms_thread->threadName = CSString::newString(thread_name);
-	
-	return ms_thread;
-}
-
-
-//-----------------------------------------------------------------------------------------------
-void PBMSDeinitBlobStreamingThread(void *v_bs_thread)
-{
-	CSThread *ms_thread = (CSThread*)v_bs_thread;
-	
-	ASSERT(ms_thread);
-
-	CSThread::detach(ms_thread);
-	// ms_thread->release(); Don't do this. Ownership of the thread is passed to the attach call so the thread is released when it is detached.
-}
-
-//-----------------------------------------------------------------------------------------------
-bool PBMSCreateBlob(PBMSBlobIDPtr blob_id, char *database_name, uint64_t size)
-{
-	MSOpenTable *otab = NULL;
-	CSString *iTableURI =  NULL;
-	CSString *CSContenttype = NULL;
-	bool done_ok = true;
-
-	enter_();
-
-	try_(a) {
-		otab = MSTableList::getOpenTableForDB(MSDatabase::getDatabaseID(database_name, false));
-		
-		otab->createBlob(blob_id, size, NULL, 0);
-	}
-	
-	catch_(a) {
-		done_ok = false;
-	}
-	cont_(a);
-
-	exit:
-	if (otab)
-		otab->returnToPool();
-	
-	if (CSContenttype)
-		CSContenttype->release();
-		
-	if (iTableURI)
-		iTableURI->release();
-		
-	return_(done_ok);
-}
-
-//-----------------------------------------------------------------------------------------------
-bool PBMSWriteBlob(PBMSBlobIDPtr blob_id, char *data, size_t size, size_t offset)
-{
-	MSOpenTable *otab;
-	MSRepoFile	*repo_file;
-	bool done_ok = true;
-
-	enter_();
-
-	try_(a) {
-		if (!(otab = MSTableList::getOpenTableForDB(blob_id->bi_db_id))) {
-			char buffer[CS_EXC_MESSAGE_SIZE];
-			char id_str[12];
-			
-			snprintf(id_str, 12, "%"PRIu32"", blob_id->bi_db_id);
-
-			cs_strcpy(CS_EXC_MESSAGE_SIZE, buffer, "Unknown database id #  ");
-			cs_strcat(CS_EXC_MESSAGE_SIZE, buffer, id_str);
-			CSException::throwException(CS_CONTEXT, MS_ERR_UNKNOWN_DB, buffer);
-		}
-		frompool_(otab);
-		repo_file = otab->getDB()->getRepoFileFromPool( blob_id->bi_tab_id, false);
-		frompool_(repo_file);
-		// It is assumed that at this point the blob is a repository blob and so the 
-		// blob_id->bi_blob_id is actually the repository blob offset. 
-		repo_file->writeBlobChunk(blob_id, blob_id->bi_blob_id, offset, size, data);
-		backtopool_(repo_file);
-		backtopool_(otab);
-
-	}
-	catch_(a) {
-		done_ok = false;
-	}
-	
-	cont_(a);
-		
-	return_(done_ok);
-}
-
-//-----------------------------------------------------------------------------------------------
-bool PBMSReadBlob(PBMSBlobIDPtr blob_id, char *buffer, size_t *size, size_t offset)
-{
-	MSOpenTable *otab;
-	MSRepoFile	*repo_file;
-	bool done_ok = true, is_repository_blob;
-
-	enter_();
-
-	is_repository_blob = (blob_id->bi_blob_type == MS_URL_TYPE_REPO);
-	try_(a) {
-		if (!(otab = MSTableList::getOpenTableByID(blob_id->bi_db_id, blob_id->bi_tab_id))) {
-			char buffer[CS_EXC_MESSAGE_SIZE];
-			char id_str[12];
-			
-	
-			cs_strcpy(CS_EXC_MESSAGE_SIZE, buffer, "Unknown database: ID # ");
-			snprintf(id_str, 12, "%"PRIu32"", blob_id->bi_db_id);
-			cs_strcat(CS_EXC_MESSAGE_SIZE, buffer, id_str);
-			cs_strcpy(CS_EXC_MESSAGE_SIZE, buffer, " or table: ID #");
-			snprintf(id_str, 12, "%"PRIu32"", blob_id->bi_tab_id);
-			cs_strcat(CS_EXC_MESSAGE_SIZE, buffer, id_str);
-			CSException::throwException(CS_CONTEXT, MS_ERR_UNKNOWN_DB, buffer);
-		}
-		uint32_t repo_id;
-		uint64_t rep_offset;
-
-		
-		frompool_(otab);
-		if (is_repository_blob) {
-			repo_id = blob_id->bi_tab_id;
-			rep_offset = blob_id->bi_blob_id;
-		} else {
-			uint64_t blob_size;
-			uint16_t header_size; 
-			otab->getDBTable()->readBlobHandle(otab, blob_id->bi_blob_id, &(blob_id->bi_auth_code), &repo_id, &rep_offset, &blob_size, &header_size, true);
-		}
-		
-		repo_file = otab->getDB()->getRepoFileFromPool( repo_id, false);
-		frompool_(repo_file);
-		*size = repo_file->readBlobChunk(blob_id, rep_offset, offset, *size, buffer);
-		backtopool_(repo_file);
-		backtopool_(otab);
-
-	}
-	catch_(a) {
-		done_ok = false;
-	}
-	
-	cont_(a);
-		
-	return_(done_ok);
-}
-
-//-----------------------------------------------------------------------------------------------
-bool PBMSIDToURL(PBMSBlobIDPtr blob_id, PBMSBlobURLPtr url)
-{	
-	MSBlobURL ms_blob;
-
-	ms_blob.bu_db_id = blob_id->bi_db_id;
-	ms_blob.bu_blob_id = blob_id->bi_blob_id;
-	ms_blob.bu_blob_ref_id = blob_id->bi_blob_ref_id;
-	ms_blob.bu_tab_id = blob_id->bi_tab_id;
-	ms_blob.bu_auth_code = blob_id->bi_auth_code;
-	ms_blob.bu_type = blob_id->bi_blob_type;
-	ms_blob.bu_blob_size = blob_id->bi_blob_size; 
-	ms_blob.bu_server_id = ms_my_get_server_id();
-	
-	PBMSBlobURLTools::buildBlobURL(&ms_blob, url);
-	return true;
-}
-
-//-----------------------------------------------------------------------------------------------
-bool PBMSURLToID(char *url, PBMSBlobIDPtr blob_id)
-{	
-	MSBlobURL ms_blob;
-	bool done_ok = true;
-	enter_();
-
-	try_(a) {
-	
-		if (!PBMSBlobURLTools::couldBeURL(url, &ms_blob)){
-			char buffer[CS_EXC_MESSAGE_SIZE];
-
-			cs_strcpy(CS_EXC_MESSAGE_SIZE, buffer, "Incorrect URL: ");
-			cs_strcat(CS_EXC_MESSAGE_SIZE, buffer, url);
-			CSException::throwException(CS_CONTEXT, MS_ERR_INCORRECT_URL, buffer);
-		}
-		
-		blob_id->bi_db_id = ms_blob.bu_db_id;
-		blob_id->bi_blob_id = ms_blob.bu_blob_id;
-		blob_id->bi_blob_ref_id = ms_blob.bu_blob_ref_id;
-		blob_id->bi_tab_id = ms_blob.bu_tab_id;
-		blob_id->bi_auth_code = ms_blob.bu_auth_code;
-		blob_id->bi_blob_type = ms_blob.bu_type;
-		blob_id->bi_blob_size = ms_blob.bu_blob_size; 
-		
-	}
-	catch_(a) {
-		done_ok = false;
-	}
-	
-	cont_(a);
-	
-	return_(done_ok);
-}
-
-
-#endif // NOT_USED_IN_ANY_THING
 
=== removed file 'plugin/pbms/src/backup_ms.cc'
--- plugin/pbms/src/backup_ms.cc	2011-04-20 22:18:30 +0000
+++ plugin/pbms/src/backup_ms.cc	1970-01-01 00:00:00 +0000
@@ -1,733 +0,0 @@
-/* Copyright (C) 2009 PrimeBase Technologies GmbH, Germany
- *
- * PrimeBase Media Stream for MySQL
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Barry Leslie
- *
- * 2009-05-29
- *
- * H&G2JCtL
- *
- * Repository backup.
- *
- * The backup is done by creating a new database with the same name and ID in the 
- * backup location. Then the pbms_dump table in the source database is initialized
- * for a sequential scan for backup. This has the effect of locking all current repository
- * files. Then the equvalent of  'insert into dst_db.pbms_dump (select * from src_db.pbms_dump);'
- * is performed. 
- *
- */
-
-#ifdef DRIZZLED
-#include <config.h>
-#include <drizzled/common.h>
-#include <drizzled/session.h>
-#include <drizzled/table.h>
-#include <drizzled/message/table.pb.h>
-#include <drizzled/charset.h>
-#include <drizzled/table_proto.h>
-#include <drizzled/field.h>
-#include <drizzled/field/varstring.h>
-#endif
-
-#include "cslib/CSConfig.h"
-
-#include <sys/types.h>
-#include <inttypes.h>
-
-#include "cslib/CSGlobal.h"
-#include "cslib/CSStrUtil.h"
-#include "cslib/CSStorage.h"
-
-#include "defs_ms.h"
-#include "system_table_ms.h"
-#include "open_table_ms.h"
-#include "table_ms.h"
-#include "database_ms.h"
-#include "repository_ms.h"
-#include "backup_ms.h"
-#include "transaction_ms.h"
-#include "systab_variable_ms.h"
-#include "systab_backup_ms.h"
-
-uint32_t MSBackupInfo::gMaxInfoRef;
-CSSyncSparseArray *MSBackupInfo::gBackupInfo;
-
-//==========================================
-MSBackupInfo::MSBackupInfo(	uint32_t id, 
-							const char *name, 
-							uint32_t db_id_arg, 
-							time_t start, 
-							time_t end, 
-							bool _isDump, 
-							const char *location, 
-							uint32_t cloudRef_arg, 
-							uint32_t cloudBackupNo_arg ):
-	backupRefId(id),
-	db_name(NULL),
-	db_id(db_id_arg),
-	startTime(start),
-	completionTime(end),
-	dump(_isDump),
-	isRunning(false),
-	backupLocation(NULL),
-	cloudRef(cloudRef_arg),
-	cloudBackupNo(cloudBackupNo_arg)
-{
-	db_name = CSString::newString(name);
-	if (location && *location)		
-		backupLocation = CSString::newString(location);		
-}
-
-//-------------------------------
-MSBackupInfo::~MSBackupInfo()
-{
-	if (db_name)
-		db_name->release();
-	
-	if (backupLocation)
-		backupLocation->release();
-}
-
-//-------------------------------
-void MSBackupInfo::startBackup(MSDatabase *pbms_db)
-{
-	MSDatabase *src_db;
-	
-	enter_();
-	push_(pbms_db);
-	
-	src_db = MSDatabase::getDatabase(db_id);
-	push_(src_db);
-	
-	startTime = time(NULL);
-	
-	src_db->startBackup(RETAIN(this));
-	release_(src_db);
-	
-	isRunning = true;
-	
-	pop_(pbms_db);
-	MSBackupTable::saveTable(pbms_db);
-	exit_();
-}
-
-//-------------------------------
-class StartDumpCleanUp : public CSRefObject {
-	bool do_cleanup;
-	uint32_t ref_id;
-
-	public:
-	
-	StartDumpCleanUp(): CSRefObject(),
-		do_cleanup(false){}
-		
-	~StartDumpCleanUp() 
-	{
-		if (do_cleanup) {
-			MSBackupInfo::gBackupInfo->remove(ref_id);
-		}
-	}
-	
-	void setCleanUp(uint32_t id)
-	{
-		ref_id = id;
-		do_cleanup = true;
-	}
-	
-	void cancelCleanUp()
-	{
-		do_cleanup = false;
-	}
-	
-};
-
-MSBackupInfo *MSBackupInfo::startDump(MSDatabase *db, uint32_t cloud_ref, uint32_t backup_no)
-{
-	MSBackupInfo *info;
-	uint32_t ref_id;
-	StartDumpCleanUp *cleanup;
-	
-	enter_();
-	push_(db);
-	lock_(gBackupInfo);
-	
-	ref_id = gMaxInfoRef++;
-	new_(info, MSBackupInfo(ref_id, db->myDatabaseName->getCString(), db->myDatabaseID, time(NULL), 0, true, NULL, cloud_ref, backup_no));
-	push_(info);
-	
-	gBackupInfo->set(ref_id, RETAIN(info));
-	
-	info->isRunning = true;
-
-	pop_(info);
-	unlock_(gBackupInfo);
-	push_(info);
-	
-	// Create a cleanup object to handle cleanup
-	// after a possible exception.
-	new_(cleanup, StartDumpCleanUp());
-	push_(cleanup);
-	cleanup->setCleanUp(ref_id);
-	
-	MSBackupTable::saveTable(RETAIN(db));
-	
-	cleanup->cancelCleanUp();
-	release_(cleanup);
-	
-	pop_(info);
-	release_(db);
-
-	return_(info);
-}
-//-------------------------------
-void MSBackupInfo::backupCompleted(MSDatabase *db)
-{
-	completionTime = time(NULL);	
-	isRunning = false;
-	MSBackupTable::saveTable(db);
-}
-
-//-------------------------------
-void MSBackupInfo::backupTerminated(MSDatabase *db)
-{
-	enter_();
-	push_(db);
-	lock_(gBackupInfo);
-	
-	gBackupInfo->remove(backupRefId);
-	unlock_(gBackupInfo);
-	
-	pop_(db);
-	MSBackupTable::saveTable(db);
-	exit_();
-}
-
-//==========================================
-MSBackup::MSBackup():
-CSDaemon(NULL),
-bu_info(NULL),
-bu_BackupList(NULL),
-bu_Compactor(NULL),
-bu_BackupRunning(false),
-bu_State(BU_COMPLETED),
-bu_SourceDatabase(NULL),
-bu_Database(NULL),
-bu_dst_dump(NULL),
-bu_src_dump(NULL),
-bu_size(0),
-bu_completed(0),
-bu_ID(0),
-bu_start_time(0),
-bu_TransactionManagerSuspended(false)
-{
-}
-
-MSBackup *MSBackup::newMSBackup(MSBackupInfo *info)
-{
-	MSBackup *bu;
-	enter_();
-	
-	push_(info);
-	
-	new_(bu, MSBackup());
-	push_(bu);
-	bu->bu_Database = MSDatabase::getBackupDatabase(RETAIN(info->backupLocation), RETAIN(info->db_name), info->db_id, true);
-	pop_(bu);
-	
-	bu->bu_info = info;
-	pop_(info);
-
-	return_(bu);
-}
-
-//-------------------------------
-class StartBackupCleanUp : public CSRefObject {
-	bool do_cleanup;
-	MSBackup *backup;
-
-	public:
-	
-	StartBackupCleanUp(): CSRefObject(),
-		do_cleanup(false){}
-		
-	~StartBackupCleanUp() 
-	{
-		if (do_cleanup) {
-			backup->completeBackup();
-		}
-	}
-	
-	void setCleanUp(MSBackup *bup)
-	{
-		backup = bup;
-		do_cleanup = true;
-	}
-	
-	void cancelCleanUp()
-	{
-		do_cleanup = false;
-	}
-	
-};
-
-void MSBackup::startBackup(MSDatabase *src_db)
-{
-	CSSyncVector	*repo_list;
-	bool			compacting = false;
-	MSRepository	*repo;
-	StartBackupCleanUp *cleanup;
-	enter_();
-
-	// Create a cleanup object to handle cleanup
-	// after a possible exception.
-	new_(cleanup, StartBackupCleanUp());
-	push_(cleanup);
-	cleanup->setCleanUp(this);
-
-	bu_SourceDatabase = src_db;
-	repo_list = bu_SourceDatabase->getRepositoryList();
-	// Suspend the compactor before locking the list.
-	bu_Compactor = bu_SourceDatabase->getCompactorThread();
-	if (bu_Compactor) {
-		bu_Compactor->retain();
-		bu_Compactor->suspend();
-	}
-
-	// Build the list of repositories to be backed up.
-	lock_(repo_list);
-
-	new_(bu_BackupList, CSVector(repo_list->size()));
-	for (uint32_t i = 0; i<repo_list->size(); i++) {
-		if ((repo = (MSRepository *) repo_list->get(i))) {
-			if (!repo->isRemovingFP && !repo->mustBeDeleted) {
-				bu_BackupList->add(RETAIN(repo));
-				if (repo->initBackup() == REPO_COMPACTING) 
-					compacting = true; 
-				
-				if (!repo->myRepoHeadSize) {
-					/* The file has not yet been opened, so the
-					 * garbage count will not be known!
-					 */
-					MSRepoFile *repo_file;
-
-					//repo->retain();
-					//unlock_(myRepostoryList);
-					//push_(repo);
-					repo_file = repo->openRepoFile();
-					repo_file->release();
-					//release_(repo);
-					//lock_(myRepostoryList);
-					//goto retry;
-				}
-				
-				bu_size += repo->myRepoFileSize; 
-
-			}
-		}
-	}
-	
-	// Copy the table list to the backup database:
-	uint32_t		next_tab = 0;
-	MSTable		*tab;
-	while ((tab = bu_SourceDatabase->getNextTable(&next_tab))) {
-		push_(tab);
-		bu_Database->addTable(tab->myTableID, tab->myTableName->getCString(), 0, false);
-		release_(tab);
-	}
-	unlock_(repo_list);
-	
-	// Copy over any physical PBMS system tables.
-	PBMSSystemTables::transferSystemTables(RETAIN(bu_Database), RETAIN(bu_SourceDatabase));
-
-	// Load the system tables into the backup database. This will
-	// initialize the database for cloud storage if required.
-	PBMSSystemTables::loadSystemTables(RETAIN(bu_Database));
-	
-	// Set the cloud backup info.
-	bu_Database->myBlobCloud->cl_setBackupInfo(RETAIN(bu_info));
-	
-	
-	// Set the backup number in the pbms_variable tabe. (This is a hidden value.)
-	// This value is used in case a drag and drop restore was done. When a data base is
-	// first loaded this value is checked and if it is not zero then the backup record
-	// will be read and any used to recover any BLOBs.
-	// 
-	char value[20];
-	snprintf(value, 20, "%"PRIu32"", bu_info->getBackupRefId());
-	MSVariableTable::setVariable(RETAIN(bu_Database), BACKUP_NUMBER_VAR, value);
-	
-	// Once the repositories are locked the compactor can be restarted
-	// unless it is in the process of compacting a repository that is
-	// being backed up.
-	if (bu_Compactor && !compacting) {	
-		bu_Compactor->resume();		
-		bu_Compactor->release();		
-		bu_Compactor = NULL;		
-	}
-	
-	// Suspend the transaction writer while the backup is running.
-	MSTransactionManager::suspend(true);
-	bu_TransactionManagerSuspended = true;
-	
-	// Start the backup daemon thread.
-	bu_ID = bu_start_time = time(NULL);
-	start();
-	
-	cleanup->cancelCleanUp();
-	release_(cleanup);
-
-	exit_();
-}
-
-void MSBackup::completeBackup()
-{
-	if (bu_TransactionManagerSuspended) {	
-		MSTransactionManager::resume();
-		bu_TransactionManagerSuspended = false;
-	}
-
-	if (bu_BackupList) {
-		MSRepository *repo;		
-		
-		while (bu_BackupList->size()) {
-			repo = (MSRepository *) bu_BackupList->take(0);
-			if (repo) {				
-				repo->backupCompleted();
-				repo->release();				
-			}
-		}
-		bu_BackupList->release();
-		bu_BackupList = NULL;
-	}
-		
-	if (bu_Compactor) {
-		bu_Compactor->resume();
-		bu_Compactor->release();
-		bu_Compactor = NULL;
-	}
-	
-	if (bu_Database) {
-		if (bu_State == BU_COMPLETED)
-			bu_Database->releaseBackupDatabase();
-		else 
-			MSDatabase::dropDatabase(bu_Database);
-			
-		bu_Database = NULL;
-	}
-
-	if (bu_SourceDatabase){
-		if (bu_State == BU_COMPLETED) 
-			bu_info->backupCompleted(bu_SourceDatabase);
-		else 
-			bu_info->backupTerminated(bu_SourceDatabase);
-		
-		bu_SourceDatabase = NULL;
-		bu_info->release();
-		bu_info = NULL;
-	}
-	
-	bu_BackupRunning = false;
-}
-
-bool MSBackup::doWork()
-{
-	enter_();
-	try_(a) {
-		CSMutex				*my_lock;
-		MSRepository		*src_repo, *dst_repo;
-		MSRepoFile			*src_file, *dst_file;
-		off64_t				src_offset, prev_offset;
-		uint16_t				head_size;
-		uint64_t				blob_size, blob_data_size;
-		CSStringBuffer		*head;
-		MSRepoPointersRec	ptr;
-		uint32_t				table_ref_count;
-		uint32_t				blob_ref_count;
-		int					ref_count;
-		size_t				ref_size;
-		uint32_t				auth_code;
-		uint32_t				tab_id;
-		uint64_t				blob_id;
-		MSOpenTable			*otab;
-		uint32_t				src_repo_id;
-		uint8_t				status;
-		uint8_t				blob_storage_type;
-		uint16_t				tab_index;
-		uint32_t				mod_time;
-		char				*transferBuffer;
-		CloudKeyRec			cloud_key;
-
-	
-		bu_BackupRunning = true;
-		bu_State = BU_RUNNING; 
-
-	/*
-		// For testing:
-		{
-			int blockit = 0;
-			myWaitTime = 5 * 1000;  // Time in milli-seconds
-			while (blockit)
-				return_(true);
-		}
-	*/
-	
-		transferBuffer = (char*) cs_malloc(MS_BACKUP_BUFFER_SIZE);
-		push_ptr_(transferBuffer);
-		
-		new_(head, CSStringBuffer(100));
-		push_(head);
-
-		src_repo = (MSRepository*)bu_BackupList->get(0);
-		while (src_repo && !myMustQuit) {
-			src_offset = 0;
-			src_file = src_repo->openRepoFile();
-			push_(src_file);
-
-			dst_repo = bu_Database->lockRepo(src_repo->myRepoFileSize - src_repo->myGarbageCount);
-			frompool_(dst_repo);
-			dst_file = dst_repo->openRepoFile();
-			push_(dst_file);
-			
-			src_repo_id = src_repo->myRepoID;
-			src_offset = src_repo->myRepoHeadSize;
-			prev_offset = 0;
-			while (src_offset < src_repo->myRepoFileSize) {	
-	retry_read:
-					
-				bu_completed += src_offset - prev_offset;
-				prev_offset = src_offset;
-				suspended();
-
-				if (myMustQuit)
-					break;
-				
-				// A lock is required here because references and dereferences to the
-				// BLOBs can result in the repository record being updated while 
-				// it is being copied.
-				my_lock = &src_repo->myRepoLock[src_offset % CS_REPO_REC_LOCK_COUNT];
-				lock_(my_lock);
-				head->setLength(src_repo->myRepoBlobHeadSize);
-				if (src_file->read(head->getBuffer(0), src_offset, src_repo->myRepoBlobHeadSize, 0) < src_repo->myRepoBlobHeadSize) { 
-					unlock_(my_lock);
-					break;
-				}
-					
-				ptr.rp_chars = head->getBuffer(0);
-				ref_size = CS_GET_DISK_1(ptr.rp_head->rb_ref_size_1);
-				ref_count = CS_GET_DISK_2(ptr.rp_head->rb_ref_count_2);
-				head_size = CS_GET_DISK_2(ptr.rp_head->rb_head_size_2);
-				blob_size = CS_GET_DISK_6(ptr.rp_head->rb_blob_repo_size_6);
-				blob_data_size = CS_GET_DISK_6(ptr.rp_head->rb_blob_data_size_6);
-				auth_code = CS_GET_DISK_4(ptr.rp_head->rb_auth_code_4);
-				status = CS_GET_DISK_1(ptr.rp_head->rb_status_1);
-				mod_time = CS_GET_DISK_4(ptr.rp_head->rb_mod_time_4);
-				
-				blob_storage_type = CS_GET_DISK_1(ptr.rp_head->rb_storage_type_1);
-				if (blob_storage_type == MS_CLOUD_STORAGE) {
-					MSRepoFile::getBlobKey(ptr.rp_head, &cloud_key);
-				}
-
-				// If the BLOB was modified after the start of the backup
-				// then set the mod time to the backup time to ensure that
-				// a backup for update will work correctly.
-				if (mod_time > bu_start_time)
-					CS_SET_DISK_4(ptr.rp_head->rb_mod_time_4, bu_start_time);
-					
-				// If the BLOB was moved during the time of this backup then copy
-				// it to the backup location as a referenced BLOB.
-				if ((status == MS_BLOB_MOVED)  && (bu_ID == (uint32_t) CS_GET_DISK_4(ptr.rp_head->rb_backup_id_4))) {
-					status = MS_BLOB_REFERENCED;
-					CS_SET_DISK_1(ptr.rp_head->rb_status_1, status);
-				}
-				
-				// sanity check
-				if ((blob_data_size == 0) || ref_count <= 0 || ref_size == 0 ||
-					head_size < src_repo->myRepoBlobHeadSize + ref_count * ref_size ||
-					!VALID_BLOB_STATUS(status)) {
-					/* Can't be true. Assume this is garbage! */
-					src_offset++;
-					unlock_(my_lock);
-					continue;
-				}
-				
-				
-				if ((status == MS_BLOB_REFERENCED) || (status == MS_BLOB_MOVED)) {
-					head->setLength(head_size);
-					if (src_file->read(head->getBuffer(0) + src_repo->myRepoBlobHeadSize, src_offset + src_repo->myRepoBlobHeadSize, head_size  - src_repo->myRepoBlobHeadSize, 0) != (head_size- src_repo->myRepoBlobHeadSize)) {
-						unlock_(my_lock);
-						break;
-					}
-
-					table_ref_count = 0;
-					blob_ref_count = 0;
-					
-					// Loop through all the references removing temporary references 
-					// and counting table and blob references.
-					
-					ptr.rp_chars = head->getBuffer(0) + src_repo->myRepoBlobHeadSize;
-					for (int count = 0; count < ref_count; count++) {
-						switch (CS_GET_DISK_2(ptr.rp_ref->rr_type_2)) {
-							case MS_BLOB_FREE_REF:
-								break;
-							case MS_BLOB_TABLE_REF:
-								// Unlike the compactor, table refs are not checked because
-								// they do not yet exist in the backup database.
-								table_ref_count++;
-								break;
-							case MS_BLOB_DELETE_REF:
-								// These are temporary references from the TempLog file. 
-								// They are not copied to the backup. 
-								CS_SET_DISK_2(ptr.rp_ref->rr_type_2, MS_BLOB_FREE_REF);
-								break;
-							default:
-								// Must be a BLOB reference
-								
-								tab_index = CS_GET_DISK_2(ptr.rp_blob_ref->er_table_2);
-								if (tab_index && (tab_index <= ref_count)) {
-									// Only committed references are backed up.
-									if (IS_COMMITTED(CS_GET_DISK_8(ptr.rp_blob_ref->er_blob_ref_id_8))) {
-										MSRepoTableRefPtr	tab_ref;
-										tab_ref = (MSRepoTableRefPtr) (head->getBuffer(0) + src_repo->myRepoBlobHeadSize + (tab_index-1) * ref_size);
-										if (CS_GET_DISK_2(tab_ref->rr_type_2) == MS_BLOB_TABLE_REF)
-											blob_ref_count++;
-									} else {
-										CS_SET_DISK_2(ptr.rp_ref->rr_type_2, MS_BLOB_FREE_REF);
-									}
-								
-								} else {
-									/* Can't be true. Assume this is garbage! */
-									src_offset++;
-									unlock_(my_lock);
-									goto retry_read;
-								}
-								break;
-						}
-						ptr.rp_chars += ref_size;
-					}
-
-
-					// If there are still blob references then the record needs to be backed up.
-					if (table_ref_count && blob_ref_count) {
-
-						off64_t dst_offset;
-
-						dst_offset = dst_repo->myRepoFileSize;
-						
-						/* Write the header. */
-						dst_file->write(head->getBuffer(0), dst_offset, head_size);
-
-						/* Copy the BLOB over: */
-						if (blob_storage_type == MS_CLOUD_STORAGE) { 
-							bu_Database->myBlobCloud->cl_backupBLOB(&cloud_key);
-						} else
-							CSFile::transfer(RETAIN(dst_file), dst_offset + head_size, RETAIN(src_file), src_offset + head_size, blob_size, transferBuffer, MS_BACKUP_BUFFER_SIZE);
-					
-						/* Update the references: */
-						ptr.rp_chars = head->getBuffer(0) + src_repo->myRepoBlobHeadSize;
-						for (int count = 0; count < ref_count; count++) {
-							switch (CS_GET_DISK_2(ptr.rp_ref->rr_type_2)) {
-								case MS_BLOB_FREE_REF:
-								case MS_BLOB_DELETE_REF:
-									break;
-								case MS_BLOB_TABLE_REF:
-									tab_id = CS_GET_DISK_4(ptr.rp_tab_ref->tr_table_id_4);
-									blob_id = CS_GET_DISK_6(ptr.rp_tab_ref->tr_blob_id_6);
-
-									if ((otab = MSTableList::getOpenTableByID(bu_Database->myDatabaseID, tab_id))) {
-										frompool_(otab);
-										otab->getDBTable()->setBlobHandle(otab, blob_id, dst_repo->myRepoID, dst_offset, blob_size, head_size, auth_code);
-//CSException::throwException(CS_CONTEXT, MS_ERR_NOT_IMPLEMENTED, "What if an error ocurred here!");
-
-										backtopool_(otab);
-									}
-									break;
-								default:
-									break;
-							}
-							ptr.rp_chars += ref_size;
-						}
-
-						dst_repo->myRepoFileSize += head_size + blob_size;
-					}
-				}
-				unlock_(my_lock);
-				src_offset += head_size + blob_size;
-			}
-			bu_completed += src_offset - prev_offset;
-			
-			// close the destination repository and cleanup.
-			release_(dst_file);
-			backtopool_(dst_repo);
-			release_(src_file);
-			
-			// release the source repository and get the next one in the list.
-			src_repo->backupCompleted();
-			bu_BackupList->remove(0);
-			
-			src_repo = (MSRepository*)bu_BackupList->get(0);
-		}
-				
-		release_(head);
-		release_(transferBuffer);
-		if (myMustQuit)
-			bu_State = BU_TERMINATED; 
-		else
-			bu_State = BU_COMPLETED; 
-			
-	}	
-	
-	catch_(a) {
-		logException();
-	}
-	
-	cont_(a);	
-	completeBackup();
-	myMustQuit = true;
-	return_(true);
-}
-
-void *MSBackup::completeWork()
-{
-	if (bu_SourceDatabase || bu_BackupList || bu_Compactor || bu_info) {
-		// We shouldn't be here
-		CSException::throwException(CS_CONTEXT, CS_ERR_GENERIC_ERROR, "MSBackup::completeBackup() not called");
-		if (bu_SourceDatabase) {
-			 bu_SourceDatabase->release();
-			 bu_SourceDatabase = NULL;
-		}
-			
-		if (bu_BackupList) {
-			 bu_BackupList->release();
-			 bu_BackupList = NULL;
-		}
-
-			
-		if (bu_Compactor) {
-			 bu_Compactor->release();
-			 bu_Compactor = NULL;
-		}
-
-			
-		if (bu_info) {
-			 bu_info->release();
-			 bu_info = NULL;
-		}
-
-	}
-	return NULL;
-}
 
=== removed file 'plugin/pbms/src/backup_ms.h'
--- plugin/pbms/src/backup_ms.h	2011-03-14 05:40:28 +0000
+++ plugin/pbms/src/backup_ms.h	1970-01-01 00:00:00 +0000
@@ -1,186 +0,0 @@
-/* Copyright (C) 2009 PrimeBase Technologies GmbH, Germany
- *
- * PrimeBase Media Stream for MySQL
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Barry Leslie
- *
- * 2009-05-29
- *
- * H&G2JCtL
- *
- * Repository backup.
- *
- */
-
-#pragma once
-#ifndef _BACKUP_MS_H_
-#define _BACKUP_MS_H_
-
-#include <inttypes.h>
-
-class MSDatabase;
-
-class MSBackupInfo : public CSRefObject {
-	friend class StartDumpCleanUp;
-	friend class InsertRowCleanUp;
-	
-	private:
-	static uint32_t	gMaxInfoRef;
-	static CSSyncSparseArray *gBackupInfo;
-
-	friend class MSBackupTable;
-	friend class MSBackup;
-	
-	private:	
-	uint32_t			backupRefId;
-	CSString		*db_name;
-	uint32_t			db_id;
-	time_t			startTime;
-	time_t			completionTime;
-	bool			dump;
-	bool			isRunning;
-	CSString		*backupLocation;
-	uint32_t			cloudRef;
-	uint32_t			cloudBackupNo;
-	
-public:
-
-	static void startUp()
-	{
-		new_(gBackupInfo, CSSyncSparseArray(5));
-		gMaxInfoRef = 0;
-	}
-	
-	static void shutDown()
-	{
-		if (gBackupInfo) {
-			gBackupInfo->clear();
-			gBackupInfo->release();
-			gBackupInfo = NULL;
-		}	
-	}
-
-
-	static MSBackupInfo *findBackupInfo(uint32_t in_backupRefId)
-	{
-		MSBackupInfo *info;
-		enter_();
-		
-		lock_(gBackupInfo);
-		
-		info = (MSBackupInfo *) gBackupInfo->get(in_backupRefId);
-		if (info) 
-			info->retain();
-		unlock_(gBackupInfo);
-		return_(info);
-	}
-	
-	static MSBackupInfo *getBackupInfo(uint32_t in_backupRefId)
-	{
-		MSBackupInfo *info = findBackupInfo(in_backupRefId);
-		if (!info) {
-			enter_();
-			char msg[80];
-			snprintf(msg, 80, "Backup info with reference ID %"PRIu32" not found", in_backupRefId);
-			CSException::throwException(CS_CONTEXT, CS_ERR_GENERIC_ERROR, msg);
-			outer_();
-		}
-		return info;
-	}
-	
-	
-	MSBackupInfo(uint32_t id, const char *name, uint32_t db_id, time_t start, time_t end, bool isDump, const char *location, uint32_t cloudRef_arg, uint32_t cloudBackupNo_arg );
-	~MSBackupInfo();
-	
-	uint32_t getBackupRefId() { return backupRefId;}
-	
-	const char *getName(){ return db_name->getCString(); }
-	
-	uint32_t getDatabaseId() { return db_id;}
-	
-	time_t getStart(){ return startTime;}
-	
-	time_t getEnd(){ return completionTime;}
-	
-	bool isDump(){ return dump;}
-	
-	bool isBackupRunning(){ return isRunning;}
-
-	const char *getLocation() { return (backupLocation)?backupLocation->getCString():NULL; }
-		
-	uint32_t getcloudRef(){ return cloudRef;}
-	void setcloudRef(uint32_t no){ cloudRef = no;}
-
-	uint32_t getcloudBackupNo(){ return cloudBackupNo;}
-	void setcloudBackupNo(uint32_t no){ cloudBackupNo = no;}
-	
-	static MSBackupInfo *startDump(MSDatabase *db, uint32_t cloud_ref, uint32_t backup_no);
-
-	void startBackup(MSDatabase *pbms_db);
-	void backupCompleted(MSDatabase *db);
-	void backupTerminated(MSDatabase *db);
-};
-
-
-class MSDatabase;
-class MSOpenSystemTable;
-
-class MSBackup :public CSDaemon {
-
-public:
-
-	MSBackup();
-	~MSBackup(){} // Do nothing here because 'self' will no longer be valid, use completeWork().
-	
-	virtual bool doWork();
-
-	virtual void *completeWork();
-	
-	void startBackup(MSDatabase *src_db);
-	uint64_t getBackupSize() { return bu_size;}
-	uint64_t getBackupCompletedSize() { return bu_completed;}
-	bool	isRunning() { return bu_BackupRunning;}
-	int		getStatus() { return (bu_BackupRunning)?0:bu_State;}
-	uint32_t backupID() { return bu_ID;}
-	
-	static MSBackup* newMSBackup(MSBackupInfo *backup_info);
-
-	friend class StartBackupCleanUp;
-private:
-	void completeBackup();
-	
-	MSBackupInfo *bu_info;
-
-	CSVector	*bu_BackupList;
-	CSDaemon	*bu_Compactor;
-	bool		bu_BackupRunning;
-	enum		{BU_RUNNING = -1, BU_COMPLETED = 0, BU_TERMINATED = 1}	bu_State; 
-	
-	MSDatabase	*bu_SourceDatabase;	// The source database.
-	MSDatabase	*bu_Database;		// The destination database.
-	MSOpenSystemTable *bu_dst_dump;	// The source database's pbms_dump.
-	MSOpenSystemTable *bu_src_dump;	// The source database's pbms_dump.
-	uint64_t		bu_size;			// The total size of the data to be backed up.
-	uint64_t		bu_completed;		// The amount of data that has been backed up so far.
-	
-	uint32_t		bu_ID;
-	uint32_t		bu_start_time;
-	
-	bool		bu_TransactionManagerSuspended;
-};
-
-#endif // _BACKUP_MS_H_
 
=== added directory 'plugin/pbms/src/cloud'
=== renamed file 'plugin/pbms/src/cloud_ms.cc' => 'plugin/pbms/src/cloud/cloud_ms.cc'
--- plugin/pbms/src/cloud_ms.cc	2011-04-20 22:18:30 +0000
+++ plugin/pbms/src/cloud/cloud_ms.cc	2011-06-01 23:57:43 +0000
@@ -20,15 +20,13 @@
  *
  */
  
+#include "includes/pbms_config.h"
+
 #ifdef DRIZZLED
-#include <config.h>
-#include <drizzled/common.h>
-#include <drizzled/session.h>
 #include <drizzled/table.h>
 #include <drizzled/message/table.pb.h>
 #include <drizzled/charset.h>
 #include <drizzled/table_proto.h>
-#include <drizzled/session.h>
 #include <drizzled/field.h>
 #endif
 
@@ -49,14 +47,11 @@
 #include "cslib/CSEncode.h"
 #include "cslib/CSS3Protocol.h"
 
-#include "backup_ms.h"
 #include "cloud_ms.h"
 
-CSSyncSparseArray	*MSCloudInfo::gCloudInfo;
-uint32_t			MSCloudInfo::gMaxInfoRef;
+#include "lib/pbmslib.h" // Needed for MS_CLOUD_STORAGE
+#include "database/database_ms.h"
 
-uint32_t			CloudDB::gKeyIndex;
-CSMutex			CloudDB::gCloudKeyLock;
 
 //==============================
 MSCloudInfo::MSCloudInfo(uint32_t id,
@@ -94,24 +89,50 @@
 }
 
 //-------------------------------
+void MSCloudInfo::setServer(const char *server) 
+{ 
+	s3Prot->s3_setServer(server);
+}
+
+//-------------------------------
 const char *MSCloudInfo::getBucket() 
 { 
 	return bucket->getCString();
 }
 
 //-------------------------------
+void MSCloudInfo::setBucket(const char *bucket_arg) 
+{ 
+	if (bucket)
+		bucket->release();
+	bucket = CSString::newString(bucket_arg);
+}
+
+//-------------------------------
 const char *MSCloudInfo::getPublicKey() 
 { 
 	return s3Prot->s3_getPublicKey();
 }
 
 //-------------------------------
+void MSCloudInfo::setPublicKey(const char *key) 
+{ 
+	s3Prot->s3_setPublicKey(key);
+}
+
+//-------------------------------
 const char *MSCloudInfo::getPrivateKey() 
 { 
 	return s3Prot->s3_getPrivateKey();
 }
 
 //-------------------------------
+void MSCloudInfo::setPrivateKey(const char *key) 
+{ 
+	s3Prot->s3_setPrivateKey(key);
+}
+
+//-------------------------------
 CSString *MSCloudInfo::getSignature(const char *key, const char *content_type, uint32_t *s3AuthorizationTime)
 {
 	return s3Prot->s3_getAuthorization(bucket->getCString(), key, content_type, s3AuthorizationTime);
@@ -183,20 +204,18 @@
 }
 
 //==============================
-CloudDB::CloudDB(uint32_t db_id):
+CloudDB::CloudDB(MSDatabase *db_backref):
 	dfltCloudRefId(0),
 	keep_alive(5 * 60),// default URL keep alive in seconds.
-	blob_recovery_no(0),
-	blob_db_id(db_id),
-	isBackup(false),
-	backupInfo(NULL),
-	backupCloud(NULL),
 	clObjectKey(NULL)
 {
 	enter_();
 
+	cl_db = db_backref; 
 	new_(clObjectKey, CSStringBuffer());
-	clObjectKey->setLength(base_key_size);
+	clObjectKey->setLength(CloudObjectKey::base_key_size);
+	
+	new_(clCloudInfo, CSSyncSparseArray(5));
 		
 	exit_();
 }
@@ -205,234 +224,120 @@
 CloudDB::~CloudDB()
 {
 	
-	if (backupInfo)
-		backupInfo->release();
-		
-	if (backupCloud)
-		backupCloud->release();
-		
 	if (clObjectKey)
 		clObjectKey->release();
 		
-}
-//-------------------------------
-MSBackupInfo *CloudDB::cl_getBackupInfo()
+	if (clCloudInfo) {
+		clCloudInfo->clear();
+		clCloudInfo->release();
+	}
+	
+}
+
+//-------------------------------
+MSCloudInfo *CloudDB::getCloudInfo(uint32_t in_cloudRefId)
+{
+	MSCloudInfo *info;
+	enter_();
+	
+	lock_(this);
+	
+	info = (MSCloudInfo *) clCloudInfo->get(in_cloudRefId);
+	if (!info) {
+		char msg[80];
+		snprintf(msg, 80, "Cloud info with reference ID %"PRIu32" not found", in_cloudRefId);
+		CSException::throwException(CS_CONTEXT, CS_ERR_GENERIC_ERROR, msg);
+	}
+	info->retain();
+	unlock_(this);
+	return_(info);
+}
+
+//-------------------------------
+void CloudDB::setDefaultCloudRef(uint32_t dflt) 
 { 
-	if (backupInfo)
-		backupInfo->retain();
-		
-	return backupInfo;
-}
-
-//-------------------------------
-void CloudDB::cl_clearBackupInfo(){ backupInfo->release(); backupInfo = NULL;}
-
-//-------------------------------
-void CloudDB::cl_createDB()
+	dfltCloudRefId = dflt;
+	cl_db->setBlobType((dflt)?MS_CLOUD_STORAGE:MS_STANDARD_STORAGE);
+}
+
+//-------------------------------
+uint32_t CloudDB::newCloudInfo(uint32_t id, const char *server, const char *bucket, const char *publicKey, const char *privateKey, bool isDefault )
+{
+	MSCloudInfo *info;
+	enter_();
+	
+	if (id == 0) 
+		id = clCloudInfo->maxIndex() + 1;
+	
+	new_(info, MSCloudInfo(id, server, bucket, publicKey, privateKey));
+	
+	push_(info);
+	lock_(this);
+	clCloudInfo->set(id, info);
+	unlock_(this);
+	pop_(info);
+	
+	if (isDefault) 
+		setDefaultCloudRef(id);
+
+	return_(id);
+}
+
+//-------------------------------
+void CloudDB::deleteCloudInfo(uint32_t id)
+{
+	enter_();
+	lock_(this);
+	if (id == dfltCloudRefId) 
+		setDefaultCloudRef(0);
+	
+	MSCloudInfo *info = (MSCloudInfo*) clCloudInfo->take(id);
+	if (info) info->release();
+	unlock_(this);
+	exit_();
+}
+
+//-------------------------------
+void CloudDB::getNewKey(CloudKeyPtr key)
+{
+	enter_();
+	lock_(this);	
+	
+	key->creation_time = time(NULL);
+	if (keyIndex == 0) keyIndex++;
+	key->ref_index = keyIndex++;
+	key->cloud_ref = dfltCloudRefId;
+	
+	unlock_(this);	
+	exit_();
+}
+
+//-------------------------------
+CSString *CloudDB::getObjectKey(CloudKeyPtr key)
+{
+	CloudObjectKey *objectKey;
+	enter_();
+	
+	new_(objectKey, CloudObjectKey(cl_db->getDatabaseID()));
+	push_(objectKey);
+	
+	objectKey->setObjectKey(key);
+	
+	CSString *str = CSString::newString(objectKey->getCString());
+	release_(objectKey);
+	
+	return_(str);
+}
+
+//-------------------------------
+void CloudDB::createDB()
 {
 // This is a no-op. 
 }
 
 //-------------------------------
-// Restore all the 
-void CloudDB::cl_restoreDB()
-{
-	CSVector *list = NULL;
-	CSString *key = NULL;
-	CloudObjectKey *src_objectKey = NULL, *dst_objectKey = NULL;
-	CloudKeyRec		cloudKey;
-	uint32_t		src_cloudRef, dst_cloudRef = 0;
-	MSBackupInfo	*backup_info = NULL;
-	MSCloudInfo		*src_cloud = NULL, *dst_cloud = NULL;
-	enter_();
-
-	if (!blob_recovery_no)
-		exit_(); // nothing to do.
- 
-	backup_info = MSBackupInfo::getBackupInfo(blob_recovery_no);
-	push_(backup_info);
-	
-	src_cloudRef = backup_info->getcloudRef();
-	src_cloud = MSCloudInfo::getCloudInfo(src_cloudRef);
-	push_(src_cloud);
-	
-	new_(dst_objectKey, CloudObjectKey(blob_db_id));
-	push_(dst_objectKey);
-	
-	// Get the key for the backup BLOB
-	new_(src_objectKey, CloudObjectKey(blob_db_id));
-	push_(src_objectKey);
-	src_objectKey->setObjectKey(NULL, backup_info->getcloudBackupNo(), backup_info->getDatabaseId()); 
-
-	// Get a list of all the BLOBs that were backed up.
-	list = src_cloud->list(src_objectKey->getCString());
-	release_(src_objectKey);
-	push_(list);
-	
-	
-	// Go through the list copying the keys.
-	dst_cloudRef = src_cloudRef;
-	dst_cloud = src_cloud;
-	dst_cloud->retain();
-	
-	push_ref_(dst_cloud); // Push a reference to dst_cloud so that what ever it references will be released.
-
-	while ((key = (CSString*)(list->take(0))) ) {
-		push_(key);
-
-		// The source key name must be parsed to get its
-		// destination cloud reference. The destination for
-		// the BLOBs may not all be in the same cloud. 
-		CloudObjectKey::parseObjectKey(key->getCString(), &cloudKey);
-		
-		// Reset the destination cloud if required.
-		if (cloudKey.cloud_ref != dst_cloudRef) {
-			if (dst_cloud) {
-				dst_cloud->release();
-				dst_cloud = NULL;
-			}
-			dst_cloudRef = 	cloudKey.cloud_ref;
-			dst_cloud = MSCloudInfo::getCloudInfo(dst_cloudRef);
-		}
-
-		// Copy the BLOB to the recovered database.
-		dst_objectKey->setObjectKey(&cloudKey);
-		src_cloud->copy(RETAIN(dst_cloud), dst_objectKey->getCString(), key->getCString());
-		release_(key);
-		
-	}
-	
-	release_(dst_cloud);
-	
-	blob_recovery_no = 0;
-	release_(list);
-	release_(dst_objectKey);	
-	release_(src_cloud);
-	release_(backup_info);
-	exit_();	
-}
-
-//-------------------------------
-uint32_t CloudDB::cl_getNextBackupNumber(uint32_t cloud_ref)
-{
-	CloudObjectKey *objectKey;
-	CSVector *list;
-	uint32_t backup_no = 0, size = 1;
-	MSCloudInfo *s3Cloud;
-	enter_();
-
-	s3Cloud = MSCloudInfo::getCloudInfo((cloud_ref)?cloud_ref:dfltCloudRefId);
-	push_(s3Cloud);
-	
-	new_(objectKey, CloudObjectKey(blob_db_id));
-	push_(objectKey);
-
-	// Find the next available backup number
-	while (size) {
-		backup_no++;
-		objectKey->setObjectKey(NULL, backup_no); // use the key prefix with the backup number for listing.
-		list = s3Cloud->list(objectKey->getCString(), 1);
-		size = list->size();
-		list->release();
-	}
-	
-	release_(objectKey);
-	release_(s3Cloud);
-
-	return_(backup_no);
-}
-
-//-------------------------------
-void CloudDB::cl_backupBLOB(CloudKeyPtr key)
-{
-	CloudObjectKey *src_objectKey, *dst_objectKey;
-	uint32_t cloudRef, backupNo;
-	MSCloudInfo *src_cloud = NULL, *dst_cloud = NULL;
-	enter_();
-
-	ASSERT(backupInfo);
-	
-	if ((cloudRef = backupInfo->getcloudRef()) == 0) {
-		backupInfo->setcloudRef(dfltCloudRefId);
-		cloudRef = dfltCloudRefId;
-	}
-		
-	if ((backupNo = backupInfo->getcloudBackupNo()) == 0) {		
-		backupNo = cl_getNextBackupNumber(cloudRef);
-		backupInfo->setcloudBackupNo(backupNo);
-	}
-	
-	// Set the source object's key
-	new_(src_objectKey, CloudObjectKey(blob_db_id));
-	push_(src_objectKey);
-	src_objectKey->setObjectKey(key);
-
-	// Set the destination object's key
-	new_(dst_objectKey, CloudObjectKey(blob_db_id));
-	push_(dst_objectKey);
-	dst_objectKey->setObjectKey(key, backupNo);
-
-	// Get the source cloud
-	src_cloud = MSCloudInfo::getCloudInfo((key->cloud_ref)?key->cloud_ref:dfltCloudRefId);
-	push_(src_cloud);
-	
-	// Copy the object to the destination cloud
-	dst_cloud = MSCloudInfo::getCloudInfo(cloudRef);
-	src_cloud->copy(dst_cloud, dst_objectKey->getCString(), src_objectKey->getCString());
-
-	release_(src_cloud);
-	release_(dst_objectKey);
-	release_(src_objectKey);
-	exit_();
-}
-
-//-------------------------------
-void CloudDB::cl_restoreBLOB(CloudKeyPtr key, uint32_t backup_db_id)
-{
-	CloudObjectKey *src_objectKey, *dst_objectKey;
-	uint32_t cloudRef, backupNo;
-	MSCloudInfo *src_cloud = NULL, *dst_cloud = NULL;
-	enter_();
-
-	ASSERT(backupInfo);
-	
-	if ((cloudRef = backupInfo->getcloudRef()) == 0) {
-		backupInfo->setcloudRef(dfltCloudRefId);
-		cloudRef = dfltCloudRefId;
-	}
-		
-	if ((backupNo = backupInfo->getcloudBackupNo()) == 0) {		
-		backupNo = cl_getNextBackupNumber(cloudRef);
-		backupInfo->setcloudBackupNo(backupNo);
-	}
-	
-	// Set the source object's key
-	new_(src_objectKey, CloudObjectKey(backup_db_id));
-	push_(src_objectKey);
-	src_objectKey->setObjectKey(key, backupNo);
-
-	// Set the destination object's key
-	new_(dst_objectKey, CloudObjectKey(blob_db_id));
-	push_(dst_objectKey);
-	dst_objectKey->setObjectKey(key);
-
-	// Get the source cloud
-	src_cloud = MSCloudInfo::getCloudInfo(cloudRef);
-	push_(src_cloud);
-	
-	// Copy the object to the destination cloud
-	dst_cloud = MSCloudInfo::getCloudInfo((key->cloud_ref)?key->cloud_ref:dfltCloudRefId);
-	src_cloud->copy(dst_cloud, dst_objectKey->getCString(), src_objectKey->getCString());
-
-	release_(src_cloud);
-	release_(dst_objectKey);
-	release_(src_objectKey);
-	exit_();
-}
-
-//-------------------------------
 // Drop database deletes all objects with the database key prefix
-void CloudDB::cl_dropDB()
+void CloudDB::dropDB()
 {
 	CSVector *list;
 	CSString *key;
@@ -442,30 +347,20 @@
 	const char *key_str;
 	
 	enter_();
-	new_(objectKey, CloudObjectKey(blob_db_id));
+	new_(objectKey, CloudObjectKey(cl_db->getDatabaseID()));
 	push_(objectKey);
 	
-	lock_(MSCloudInfo::gCloudInfo);
+	lock_(this);
 
-	if (isBackup) {
-		uint32_t backup_no;
-		if (backupInfo && (backup_no = backupInfo->getcloudBackupNo())) {
-			objectKey->setObjectKey(NULL, backup_no); // use the key prefix for the backup for listing.
-			if ((s3Cloud = MSCloudInfo::getCloudInfo(backupInfo->getcloudRef())))
-				push_(s3Cloud);
-		}
-	} else {
-		objectKey->setObjectKey(); // use the key prefix for listing.
-		i = 0;
-		s3Cloud = (MSCloudInfo*)MSCloudInfo::gCloudInfo->itemAt(i++); // <-- unreferenced object 
-	}
-		
+	objectKey->setObjectKey(); // use the key prefix for listing.
 	key_str = objectKey->getCString();
 
 	// For non backup BLOBs all known clouds must be searched 
 	// for possible BLOBs and deleted. The BLOBs belonging to a backup
 	// will ever only be in one cloud storage location.
-	while (s3Cloud) {
+	i = 0;
+	while ((s3Cloud = getCloudInfoAt(i++))) {
+		push_(s3Cloud);
 		list = s3Cloud->list(key_str);
 		push_(list);
 		
@@ -477,20 +372,16 @@
 		}
 		
 		release_(list);
-		if (isBackup) {
-			release_(s3Cloud); // Only the backup s3Cloud needs to be released.
-			s3Cloud = NULL;
-		} else
-			s3Cloud = (MSCloudInfo*)MSCloudInfo::gCloudInfo->itemAt(i++);// <-- unreferenced object
+		release_(s3Cloud);
 	}
 	
-	unlock_(MSCloudInfo::gCloudInfo);
+	unlock_(this);
 	release_(objectKey);
 	exit_();
 }
 
 //-------------------------------
-void CloudDB::cl_putData(CloudKeyPtr key, CSInputStream *stream, off64_t size)
+void CloudDB::putData(CloudKeyPtr key, CSInputStream *stream, off64_t size)
 {
 	CloudObjectKey *objectKey;
 	MSCloudInfo *s3Cloud;
@@ -499,12 +390,12 @@
 	
 	push_(stream);
 	
-	new_(objectKey, CloudObjectKey(blob_db_id));
+	new_(objectKey, CloudObjectKey(cl_db->getDatabaseID()));
 	push_(objectKey);
 	
 	objectKey->setObjectKey(key);
 	
-	s3Cloud = MSCloudInfo::getCloudInfo((key->cloud_ref)?key->cloud_ref:dfltCloudRefId);
+	s3Cloud = getCloudInfo((key->cloud_ref)?key->cloud_ref:dfltCloudRefId);
 	push_(s3Cloud);
 	s3Cloud->send(RETAIN(stream), objectKey->getCString(), size);
 	release_(s3Cloud);
@@ -516,17 +407,17 @@
 }
 
 //-------------------------------
-off64_t CloudDB::cl_getData(CloudKeyPtr key,  char *buffer, off64_t size)
+off64_t CloudDB::getData(CloudKeyPtr key,  char *buffer, off64_t size)
 {	
 	CloudObjectKey *objectKey;
 	CSStaticMemoryOutputStream *output;
 	MSCloudInfo *s3Cloud;
 	enter_();
 	
-	new_(objectKey, CloudObjectKey(blob_db_id));
+	new_(objectKey, CloudObjectKey(cl_db->getDatabaseID()));
 	push_(objectKey);
 	
-	s3Cloud = MSCloudInfo::getCloudInfo(key->cloud_ref);
+	s3Cloud = getCloudInfo(key->cloud_ref);
 	push_(s3Cloud);
 
 	new_(output, CSStaticMemoryOutputStream((u_char *)buffer, size));
@@ -544,16 +435,16 @@
 }
 
 //-------------------------------
-void CloudDB::cl_deleteData(CloudKeyPtr key)
+void CloudDB::deleteData(CloudKeyPtr key)
 {
 	MSCloudInfo *s3Cloud;
 	CloudObjectKey *objectKey;
 	enter_();
 	
-	new_(objectKey, CloudObjectKey(blob_db_id));
+	new_(objectKey, CloudObjectKey(cl_db->getDatabaseID()));
 	push_(objectKey);
 	
-	s3Cloud = MSCloudInfo::getCloudInfo(key->cloud_ref);
+	s3Cloud = getCloudInfo(key->cloud_ref);
 	push_(s3Cloud);
 
 	objectKey->setObjectKey(key);
@@ -567,19 +458,19 @@
 }
 
 //-------------------------------
-CSString *CloudDB::cl_getDataURL(CloudKeyPtr key)
+CSString *CloudDB::getDataURL(CloudKeyPtr key)
 {
 	CloudObjectKey *objectKey;
 	CSString *url;
 	MSCloudInfo *s3Cloud;
 	enter_();
 	
-	new_(objectKey, CloudObjectKey(blob_db_id));
+	new_(objectKey, CloudObjectKey(cl_db->getDatabaseID()));
 	push_(objectKey);
 	
 	objectKey->setObjectKey(key);
 	
-	s3Cloud = MSCloudInfo::getCloudInfo(key->cloud_ref);  
+	s3Cloud = getCloudInfo(key->cloud_ref);  
 	push_(s3Cloud);
 		
 	url = s3Cloud->getDataURL(objectKey->getCString(), keep_alive);
@@ -591,7 +482,7 @@
 }
 
 //-------------------------------
-CSString *CloudDB::cl_getSignature(CloudKeyPtr key, CSString *content_type_arg, uint32_t *s3AuthorizationTime)
+CSString *CloudDB::getSignature(CloudKeyPtr key, CSString *content_type_arg, uint32_t *s3AuthorizationTime)
 {
 	CSString *signature;
 	CloudObjectKey *objectKey;
@@ -599,7 +490,7 @@
 	MSCloudInfo *s3Cloud;
 	enter_();
 	
-	new_(objectKey, CloudObjectKey(blob_db_id));
+	new_(objectKey, CloudObjectKey(cl_db->getDatabaseID()));
 	push_(objectKey);
 	
 	if (content_type_arg) {
@@ -608,7 +499,7 @@
 	}
 	
 	objectKey->setObjectKey(key);
-	s3Cloud = MSCloudInfo::getCloudInfo(key->cloud_ref);  
+	s3Cloud = getCloudInfo(key->cloud_ref);  
 	push_(s3Cloud);
 	
 	signature = s3Cloud->getSignature(objectKey->getCString(), content_type, s3AuthorizationTime);
 
=== renamed file 'plugin/pbms/src/cloud_ms.h' => 'plugin/pbms/src/cloud/cloud_ms.h'
--- plugin/pbms/src/cloud_ms.h	2011-03-14 05:40:28 +0000
+++ plugin/pbms/src/cloud/cloud_ms.h	2011-06-01 23:57:43 +0000
@@ -25,79 +25,47 @@
 #include "cslib/CSMd5.h"
 #include <inttypes.h>
 
-
 /* NOTES:
  *
- * - TODO: If cl_deleteData() fails then the BLOB deletion must fail and be rescheduled to try again
+ * - TODO: If deleteData() fails then the BLOB deletion must fail and be rescheduled to try again
  *			later.
  * - TODO: Copying of BLOBs from one database to another needs to be handled. Look for copyBlob() and 
  *			resetBlobHead(). There are 3 cases to handle depending on if the databases involved use
- *			cload storage.
+ *			cloud storage.
  */
  
 //===============================
 class CSS3Protocol;	
 class MSCloudInfo : public CSRefObject {
 	private:
-	static uint32_t	gMaxInfoRef;
-	static CSSyncSparseArray *gCloudInfo;
 
 	friend class MSCloudTable;
 	friend class CloudDB;
 	
 	private:	
-	uint32_t			cloudRefId;
+	uint32_t		cloudRefId;
 	CSString		*bucket;
 	CSS3Protocol	*s3Prot;
+	bool			defaultCloudRef;
 	
 public:
 
-	static void startUp()
-	{
-		new_(gCloudInfo, CSSyncSparseArray(5));
-		gMaxInfoRef = 0;
-	}
-	
-	static void shutDown()
-	{
-		if (gCloudInfo) {
-			gCloudInfo->clear();
-			gCloudInfo->release();
-			gCloudInfo = NULL;
-		}	
-	}
-
-
-	static MSCloudInfo *getCloudInfo(uint32_t in_cloudRefId)
-	{
-		MSCloudInfo *info;
-		enter_();
-		
-		lock_(gCloudInfo);
-		
-		info = (MSCloudInfo *) gCloudInfo->get(in_cloudRefId);
-		if (!info) {
-			char msg[80];
-			snprintf(msg, 80, "Cloud info with reference ID %"PRIu32" not found", in_cloudRefId);
-			CSException::throwException(CS_CONTEXT, CS_ERR_GENERIC_ERROR, msg);
-		}
-		info->retain();
-		unlock_(gCloudInfo);
-		return_(info);
-	}
-	
-	MSCloudInfo(uint32_t id, const char *server, const char *bucket, const char *publicKey, const char *privateKey );
+	MSCloudInfo(uint32_t id, const char *server, const char *bucket, const char *publicKey, const char *privateKey);
 	~MSCloudInfo();
 	
 	uint32_t getCloudRefId() { return cloudRefId;}
 	
 	const char *getServer();
+	void setServer(const char *server);
 	
 	const char *getBucket();
+	void setBucket(const char *bucket);
 	
 	const char *getPublicKey();
+	void setPublicKey(const char *key);
 	
 	const char *getPrivateKey();
+	void setPrivateKey(const char *key);
 
 	CSString *getSignature(const char *key, const char *content_type, uint32_t *s3AuthorizationTime);
 	
@@ -124,13 +92,13 @@
 //===============================
 class CloudObjectKey : public CSStringBuffer
 {
-	uint32_t default_db_id;
-	
+	uint16_t default_db_id;
+
 	public:
-	CloudObjectKey(uint32_t id): CSStringBuffer(), default_db_id(id){ }
+	CloudObjectKey(uint16_t id): CSStringBuffer(), default_db_id(id){ }
 	~CloudObjectKey(){}
 	
-	static const uint32_t base_key_size = 64; // enough space for <db_id>/<backup_id>/<creation_time>/<ref_index>
+	static const uint32_t base_key_size = 64; // enough space for <db_id>/<creation_time>/<ref_index>
 
 	void setObjectKey(const char *object_key)
 	{
@@ -139,129 +107,83 @@
 		snprintf(getBuffer(0), length(), "%"PRIu32"/0/%s",default_db_id,  object_key);
 	}
 	
-	void setObjectKey(CloudKeyPtr key = NULL, uint32_t backup_id = 0, uint32_t db_id = 0)
+	void setObjectKey(CloudKeyPtr key = NULL, uint32_t db_id = 0)
 	{
 		if (!db_id) db_id = default_db_id;
 		setLength(base_key_size);
 		
 		if (key)
-			snprintf(getBuffer(0), length(), "%"PRIu32"/%"PRIu32"/%"PRIu32".%"PRIu32".%"PRIu32"", db_id, backup_id, key->cloud_ref, key->creation_time, key->ref_index);
+			snprintf(getBuffer(0), length(), "%"PRIu32"/%"PRIu32".%"PRIu32".%"PRIu32"", db_id, key->cloud_ref, key->creation_time, key->ref_index);
 		else 
-			snprintf(getBuffer(0), length(), "%"PRIu32"/%"PRIu32"s/", db_id, backup_id);
+			snprintf(getBuffer(0), length(), "%"PRIu32"/", db_id);
 			
 	}
 	
-	static void parseObjectKey(const char *object_key, CloudKeyPtr key, uint32_t *backup_id = NULL, uint32_t *db_id = NULL)
+	static void parseObjectKey(const char *object_key, CloudKeyPtr key, uint32_t *db_id = NULL)
 	{
 		uint32_t v1;
 		
-		if (!backup_id) backup_id = &v1;
 		if (!db_id) db_id = &v1;
 		
-		sscanf(object_key, "%"PRIu32"/%"PRIu32"/%"PRIu32".%"PRIu32".%"PRIu32"", db_id, backup_id, &(key->cloud_ref), &(key->creation_time), &(key->ref_index));
+		sscanf(object_key, "%"PRIu32"/%"PRIu32".%"PRIu32".%"PRIu32"", db_id, &(key->cloud_ref), &(key->creation_time), &(key->ref_index));
 	}
 };
 
 //===============================
-class MSBackupInfo;
-class CloudDB: public CSRefObject {
+class MSDatabase;
+class CloudDB: public CSSharedRefObject {
 	
 private:
-	static uint32_t	gKeyIndex;
-	static CSMutex	gCloudKeyLock;
+	CSSyncSparseArray 	*clCloudInfo;
 	
+	uint32_t 	keyIndex;	
 	uint32_t	dfltCloudRefId;
 	
 	uint32_t	keep_alive; // The length of time a redirect URL will remain valid. In seconds.
-	uint32_t	blob_recovery_no; // This is the backup number from which the recovery should be done.
-	uint32_t	blob_db_id;
-	
-	bool isBackup;
-	MSBackupInfo *backupInfo;
-	MSCloudInfo	*backupCloud;
-	
-	static const uint32_t base_key_size = 64; // enough space for <db_id>/<backup_id>/<creation_time>/<ref_index>
-
+	MSDatabase *cl_db; 		// A back reference to the database that this object belongs to.
+	
 public:
 	CSStringBuffer		*clObjectKey;
 	
-	CloudDB(uint32_t db_id);
+	CloudDB(MSDatabase *db_backref);
 	~CloudDB();
 	
-	void cl_setDefaultCloudRef(uint32_t dflt) { dfltCloudRefId = dflt;}
-	uint32_t cl_getDefaultCloudRef() { return dfltCloudRefId;}
-
-	MSCloudInfo *cl_getCloudInfo(uint32_t cloudRefId = 0)
-	{
-		return MSCloudInfo::getCloudInfo((cloudRefId)?cloudRefId:dfltCloudRefId);
-	}
-	
-	void cl_getNewKey(CloudKeyPtr key)
-	{
-		enter_();
-		lock_(&gCloudKeyLock);	
-		
-		key->creation_time = time(NULL);
-		key->ref_index = gKeyIndex++;
-		key->cloud_ref = dfltCloudRefId;
-		
-		unlock_(&gCloudKeyLock);	
-		exit_();
-	}
-
-	bool cl_mustRecoverBlobs() { return (blob_recovery_no != 0);}
-	
-	void cl_setRecoveryNumber(const char *number)
-	{
-		blob_recovery_no = atol(number);
-	}
-
-	const char *cl_getRecoveryNumber()
-	{
-		static char number[20];
-		
-		snprintf(number, 20, "%"PRIu32"", blob_recovery_no);
-		return number;
-	}
-
-	CSString *cl_getObjectKey(CloudKeyPtr key)
-	{
-		CloudObjectKey *objectKey;
-		enter_();
-		
-		new_(objectKey, CloudObjectKey(blob_db_id));
-		push_(objectKey);
-		
-		objectKey->setObjectKey(key);
-		
-		CSString *str = CSString::newString(objectKey->getCString());
-		release_(objectKey);
-		
-		return_(str);
-	}
-	
-	void cl_setKeepAlive(uint32_t keep_alive_arg) {keep_alive = keep_alive_arg;}
-	
-	void cl_createDB();
-	void cl_dropDB();
-	void cl_restoreDB();
-	uint32_t cl_getNextBackupNumber(uint32_t cloud_ref = 0);
-	bool cl_dbExists();
-	
-	// setting backup_blob_no to -1 ensures that if the database is dropped no BLOBs will be deleted.
-	void cl_setCloudIsBackup(){ isBackup = true;}
-	void cl_setBackupInfo(MSBackupInfo *info){ backupInfo = info;}
-	MSBackupInfo *cl_getBackupInfo();
-	void cl_clearBackupInfo();
-	
-	void cl_backupBLOB(CloudKeyPtr key);
-	void cl_restoreBLOB(CloudKeyPtr key, uint32_t backup_db_id);
-
-	void cl_putData( CloudKeyPtr key, CSInputStream *stream, off64_t size);
-	off64_t cl_getData(CloudKeyPtr key, char *data, off64_t size);
-	CSString *cl_getDataURL(CloudKeyPtr key);
-	void cl_deleteData(CloudKeyPtr key);
-	CSString *cl_getSignature(CloudKeyPtr key, CSString *content_type, uint32_t *s3AuthorizationTime);
+	bool isLoaded() { return (clCloudInfo->size() > 0); }
+	bool isValidID(uint32_t info_id) { return (clCloudInfo->get(info_id) != NULL); }
+	
+	uint32_t getCloudInfoIndexForID(uint32_t id) { return clCloudInfo->getIndex(id);}
+	
+	MSCloudInfo *getCloudInfoAt(uint32_t index) 
+	{ 
+		MSCloudInfo *info = (MSCloudInfo *)clCloudInfo->itemAt(index);
+		if (!info)
+			return NULL;
+		return  RETAIN(info);
+	}
+	
+	MSCloudInfo *getCloudInfo(uint32_t in_cloudRefId);
+	MSCloudInfo *getDefaultCloudInfo() { return getCloudInfo(dfltCloudRefId); }
+
+	uint32_t newCloudInfo(uint32_t id, const char *server, const char *bucket, const char *publicKey, const char *privateKey, bool isDefault );
+	
+
+	void deleteCloudInfo(uint32_t id);	
+	void setDefaultCloudRef(uint32_t dflt);
+	uint32_t getDefaultCloudRef() { return dfltCloudRefId;}
+
+	void getNewKey(CloudKeyPtr key);
+	CSString *getObjectKey(CloudKeyPtr key);	
+	void setKeepAlive(uint32_t keep_alive_arg) {keep_alive = keep_alive_arg;}
+	
+	void createDB();
+	void dropDB();
+	bool dbExists();
+	
+	void putData( CloudKeyPtr key, CSInputStream *stream, off64_t size);
+	off64_t getData(CloudKeyPtr key, char *data, off64_t size);
+	CSString *getDataURL(CloudKeyPtr key);
+	void deleteData(CloudKeyPtr key);
+	CSString *getSignature(CloudKeyPtr key, CSString *content_type, uint32_t *s3AuthorizationTime);
 	
 };
 
 
=== removed file 'plugin/pbms/src/compactor_ms.cc'
--- plugin/pbms/src/compactor_ms.cc	2010-12-18 04:43:40 +0000
+++ plugin/pbms/src/compactor_ms.cc	1970-01-01 00:00:00 +0000
@@ -1,343 +0,0 @@
-/* Copyright (C) 2008 PrimeBase Technologies GmbH, Germany
- *
- * PrimeBase Media Stream for MySQL
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Original author: Paul McCullagh
- * Continued development: Barry Leslie
- *
- * 2007-07-10
- *
- * H&G2JCtL
- *
- * Network interface.
- *
- */
-
-#include "cslib/CSConfig.h"
-
-#include "defs_ms.h"
-
-#include "cslib/CSGlobal.h"
-#include "cslib/CSStrUtil.h"
-#include "cslib/CSStorage.h"
-
-#include "compactor_ms.h"
-#include "open_table_ms.h"
-#include "repository_ms.h"
-#include "parameters_ms.h"
-
-/*
- * ---------------------------------------------------------------
- * COMPACTOR THREAD
- */
-
-MSCompactorThread::MSCompactorThread(time_t wait_time, MSDatabase *db):
-CSDaemon(wait_time, NULL),
-iCompactorDatabase(db)
-{
-}
-
-void MSCompactorThread::close()
-{
-}
-
-bool MSCompactorThread::doWork()
-{
-	bool				complete;
-	MSRepository		*src_repo, *dst_repo;
-	MSRepoFile			*src_file, *dst_file;
-	uint32_t			src_repo_id;
-	MSBlobHeadRec		blob;
-	off64_t				src_offset;
-	uint16_t			head_size;
-	uint64_t			blob_size, blob_data_size;
-	CSStringBuffer		*head;
-	MSRepoPointersRec	ptr;
-	uint32_t				table_ref_count;
-	uint32_t				blob_ref_count;
-	int					ref_count;
-	size_t				ref_size;
-	CSMutex				*mylock;
-	uint32_t			tab_id;
-	uint64_t			blob_id;
-	MSOpenTable			*otab;
-	uint32_t			repo_id;
-	uint64_t			repo_offset;
-	uint64_t			repo_blob_size;
-	uint16_t			repo_head_size;
-	uint16_t			tab_index;
-	uint8_t				status;
-
-	enter_();
-	retry:
-	
-#ifdef MS_COMPACTOR_POLLS
-	if (!(src_repo = iCompactorDatabase->getRepoFullOfTrash(NULL)))
-		return_(true);
-#else
-	myWaitTime = MS_DEFAULT_COMPACTOR_WAIT * 1000;  // Time in milli-seconds
-	if (!(src_repo = iCompactorDatabase->getRepoFullOfTrash(&myWaitTime)))
-		return_(true);
-#endif
-	frompool_(src_repo);
-	src_file = src_repo->openRepoFile();
-	push_(src_file);
-
-	dst_repo = iCompactorDatabase->lockRepo(src_repo->myRepoFileSize - src_repo->myGarbageCount);
-	frompool_(dst_repo);
-	dst_file = dst_repo->openRepoFile();
-	push_(dst_file);
-
-	new_(head, CSStringBuffer(100));
-	push_(head);
-
-	complete = false;
-	src_repo_id = src_repo->myRepoID;
-	src_offset = src_repo->myRepoHeadSize;
-	//printf("\nCompacting repo %"PRId32"\n\n", src_repo_id);
-	// For testing:
-	{
-		int blockit = 0;
-		if (blockit) {
-			release_(head);
-			release_(dst_file);
-			backtopool_(dst_repo);
-			release_(src_file);
-			backtopool_(src_repo);
-
-			myWaitTime = 5 * 1000;  // Time in milli-seconds
-			return_(true);
-		}
-	}
-	while (src_offset < src_repo->myRepoFileSize) {			
-		retry_loop:
-		suspended();
-
-		if (myMustQuit)
-			goto quit;
-		retry_read:
-		
-		// A lock is required here because references and dereferences to the
-		// BLOBs can result in the repository record being updated while 
-		// it is being copied.
-		mylock = &src_repo->myRepoLock[src_offset % CS_REPO_REC_LOCK_COUNT];
-		lock_(mylock);
-		if (src_file->read(&blob, src_offset, src_repo->myRepoBlobHeadSize, 0) < src_repo->myRepoBlobHeadSize) {
-			unlock_(mylock);
-			break;
-		}
-		ref_size = CS_GET_DISK_1(blob.rb_ref_size_1);
-		ref_count = CS_GET_DISK_2(blob.rb_ref_count_2);
-		head_size = CS_GET_DISK_2(blob.rb_head_size_2);
-		blob_size = CS_GET_DISK_6(blob.rb_blob_repo_size_6);
-		blob_data_size = CS_GET_DISK_6(blob.rb_blob_data_size_6);
-		status = CS_GET_DISK_1(blob.rb_status_1);
-		if ((blob_data_size == 0) || ref_count <= 0 || ref_size == 0 ||
-			head_size < src_repo->myRepoBlobHeadSize + ref_count * ref_size ||
-			!VALID_BLOB_STATUS(status)) {
-			/* Can't be true. Assume this is garbage! */
-			unlock_(mylock);
-			src_offset++;
-			goto retry_read;
-		}
-		if (IN_USE_BLOB_STATUS(status)) {
-			head->setLength(head_size);
-			if (src_file->read(head->getBuffer(0), src_offset, head_size, 0) != head_size) {
-				unlock_(mylock);
-				break;
-			}
-
-			table_ref_count = 0;
-			blob_ref_count = 0;
-			
-			ptr.rp_chars = head->getBuffer(0) + src_repo->myRepoBlobHeadSize;
-			for (int count = 0; count < ref_count; count++) {
-				switch (CS_GET_DISK_2(ptr.rp_ref->rr_type_2)) {
-					case MS_BLOB_FREE_REF:
-						break;
-					case MS_BLOB_TABLE_REF:
-						/* Check the reference: */
-						tab_id = CS_GET_DISK_4(ptr.rp_tab_ref->tr_table_id_4);
-						blob_id = CS_GET_DISK_6(ptr.rp_tab_ref->tr_blob_id_6);
-
-						otab = MSTableList::getOpenTableByID(iCompactorDatabase->myDatabaseID, tab_id);
-						if (otab) {
-							frompool_(otab);
-							/* Ignore the return value (it will fail because auth_code is wrong!)!! */
-							uint32_t auth_code = 0;
-							otab->getDBTable()->readBlobHandle(otab, blob_id, &auth_code, &repo_id, &repo_offset, &repo_blob_size, &repo_head_size, false);
-							backtopool_(otab);
-							if (repo_id == src_repo_id &&
-								repo_offset == src_offset &&
-								repo_blob_size == blob_data_size &&
-								repo_head_size == head_size)
-								table_ref_count++;
-							else
-								/* Remove the reference: */
-								CS_SET_DISK_2(ptr.rp_ref->rr_type_2, MS_BLOB_FREE_REF);
-						}
-						else
-							CS_SET_DISK_2(ptr.rp_ref->rr_type_2, MS_BLOB_FREE_REF);
-						break;
-					case MS_BLOB_DELETE_REF:
-						/* These are temporary references from the TempLog file. */
-						/* We try to prevent this from happening, but it can! */
-						uint32_t			temp_log_id;