libtransport.git Changeset - 12a207a3a393

Changeset - 12a207a3a393

Parent rev.

Child rev.

[Not reviewed]

0 5 0

HanzZ - 14 years ago 2011-09-11 12:09:07
hanzz.k@gmail.com

setUserOnline implemented in sqlite3/mysql backend

5 files changed with 22 insertions and 2 deletions:

include/transport/mysqlbackend.h

include/transport/sqlite3backend.h

src/mysqlbackend.cpp

src/rostermanager.cpp

src/sqlite3backend.cpp

0 comments (0 inline, 0 general)

include/transport/mysqlbackend.h

➞

Show inline comments

@@ @@ -125,29 +125,30 @@ class MySQLBackend : public StorageBackend @@
 				int m_error;
 				std::string m_string;
 		};
 		MYSQL m_conn;
 		Config *m_config;
 		std::string m_prefix;
 		// statements
 // 		MYSQL_STMT *m_setUser;
 		Statement *m_setUser;
 		Statement *m_getUser;
 		Statement *m_getUserSetting;
 		Statement *m_setUserSetting;
 		Statement *m_updateUserSetting;
 		Statement *m_removeUser;
 		Statement *m_removeUserBuddies;
 		Statement *m_removeUserSettings;
 		Statement *m_removeUserBuddiesSettings;
 		Statement *m_addBuddy;
 		Statement *m_updateBuddy;
 		Statement *m_updateBuddySetting;
 		Statement *m_getBuddies;
 		Statement *m_getBuddiesSettings;
 		Statement *m_setUserOnline;
 };
+}
 #endif

include/transport/sqlite3backend.h

➞

Show inline comments

@@ @@ -93,29 +93,30 @@ class SQLite3Backend : public StorageBackend @@
 		void commitTransaction();
 	private:
 		bool exec(const std::string &query);
 		sqlite3 *m_db;
 		Config *m_config;
 		std::string m_prefix;
 		// statements
 		sqlite3_stmt *m_setUser;
 		sqlite3_stmt *m_getUser;
 		sqlite3_stmt *m_getUserSetting;
 		sqlite3_stmt *m_setUserSetting;
 		sqlite3_stmt *m_updateUserSetting;
 		sqlite3_stmt *m_removeUser;
 		sqlite3_stmt *m_removeUserBuddies;
 		sqlite3_stmt *m_removeUserSettings;
 		sqlite3_stmt *m_removeUserBuddiesSettings;
 		sqlite3_stmt *m_addBuddy;
 		sqlite3_stmt *m_updateBuddy;
 		sqlite3_stmt *m_updateBuddySetting;
 		sqlite3_stmt *m_getBuddies;
 		sqlite3_stmt *m_getBuddiesSettings;
 		sqlite3_stmt *m_setUserOnline;
 };
+}
 #endif

src/mysqlbackend.cpp

➞

Show inline comments

 	return *this;
+}
 MySQLBackend::MySQLBackend(Config *config) {
 	m_config = config;
 	mysql_init(&m_conn);
 	m_prefix = CONFIG_STRING(m_config, "database.prefix");
+}
 MySQLBackend::~MySQLBackend(){
 	delete m_setUser;
 	delete m_getUser;
 	delete m_removeUser;
 	delete m_removeUserBuddies;
 	delete m_removeUserSettings;
 	delete m_removeUserBuddiesSettings;
 	delete m_addBuddy;
 	delete m_updateBuddy;
 	delete m_getBuddies;
 	delete m_getBuddiesSettings;
 	delete m_getUserSetting;
 	delete m_setUserSetting;
 	delete m_updateUserSetting;
 	delete m_updateBuddySetting;
 	delete m_setUserOnline;
 	mysql_close(&m_conn);
+}
 bool MySQLBackend::connect() {
 	LOG4CXX_INFO(logger, "Connecting MySQL server " << CONFIG_STRING(m_config, "database.server") << ", user " <<
 		CONFIG_STRING(m_config, "database.user") << ", database " << CONFIG_STRING(m_config, "database.database") <<
 		", port " << CONFIG_INT(m_config, "database.port")
 	);
 	if (!mysql_real_connect(&m_conn, CONFIG_STRING(m_config, "database.server").c_str(),
 					   CONFIG_STRING(m_config, "database.user").c_str(),
 					   CONFIG_STRING(m_config, "database.password").c_str(),
 					   CONFIG_STRING(m_config, "database.database").c_str(),
 					   CONFIG_INT(m_config, "database.port"), NULL, 0)) {
 		LOG4CXX_ERROR(logger, "Can't connect database: " << mysql_error(&m_conn));
 		return false;
+	}
 	createDatabase();
 	m_setUser = new Statement(&m_conn, "sssssb", "INSERT INTO " + m_prefix + "users (jid, uin, password, language, encoding, last_login, vip) VALUES (?, ?, ?, ?, ?, NOW(), ?)");
 	m_getUser = new Statement(&m_conn, "s|isssssb", "SELECT id, jid, uin, password, encoding, language, vip FROM " + m_prefix + "users WHERE jid=?");
 	m_removeUser = new Statement(&m_conn, "i", "DELETE FROM " + m_prefix + "users WHERE id=?");
 	m_removeUserBuddies = new Statement(&m_conn, "i", "DELETE FROM " + m_prefix + "buddies WHERE user_id=?");
 	m_removeUserSettings = new Statement(&m_conn, "i", "DELETE FROM " + m_prefix + "users_settings WHERE user_id=?");
 	m_removeUserBuddiesSettings = new Statement(&m_conn, "i", "DELETE FROM " + m_prefix + "buddies_settings WHERE user_id=?");
 	m_addBuddy = new Statement(&m_conn, "issssi", "INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)");
 	m_updateBuddy = new Statement(&m_conn, "ssisis", "UPDATE " + m_prefix + "buddies SET groups=?, nickname=?, flags=?, subscription=? WHERE user_id=? AND uin=?");
 	m_getBuddies = new Statement(&m_conn, "i|issssi", "SELECT id, uin, subscription, nickname, groups, flags FROM " + m_prefix + "buddies WHERE user_id=? ORDER BY id ASC");
 	m_getBuddiesSettings = new Statement(&m_conn, "i|iiss", "SELECT buddy_id, type, var, value FROM " + m_prefix + "buddies_settings WHERE user_id=? ORDER BY buddy_id ASC");
 	m_updateBuddySetting = new Statement(&m_conn, "iisiss", "INSERT INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE value=?");
 	m_getUserSetting = new Statement(&m_conn, "is|is", "SELECT type, value FROM " + m_prefix + "users_settings WHERE user_id=? AND var=?");
 	m_setUserSetting = new Statement(&m_conn, "isis", "INSERT INTO " + m_prefix + "users_settings (user_id, var, type, value) VALUES (?,?,?,?)");
 	m_updateUserSetting = new Statement(&m_conn, "sis", "UPDATE " + m_prefix + "users_settings SET value=? WHERE user_id=? AND var=?");
 	m_setUserOnline = new Statement(&m_conn, "bi", "UPDATE " + m_prefix + "users SET online=?, last_login=NOW()  WHERE id=?");
 	return true;
+}
 bool MySQLBackend::createDatabase() {
 	int not_exist = exec("CREATE TABLE IF NOT EXISTS `" + m_prefix + "buddies` ("
 							"`id` int(10) unsigned NOT NULL auto_increment,"
 							"`user_id` int(10) unsigned NOT NULL,"
 							"`uin` varchar(255) collate utf8_bin NOT NULL,"
 							"`subscription` enum('to','from','both','ask','none') collate utf8_bin NOT NULL,"
 							"`nickname` varchar(255) collate utf8_bin NOT NULL,"
 							"`groups` varchar(255) collate utf8_bin NOT NULL,"
 							"`flags` smallint(4) NOT NULL DEFAULT '0',"
 							"PRIMARY KEY (`id`),"
 							"UNIQUE KEY `user_id` (`user_id`,`uin`)"
 						") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;");
 	if (not_exist) {
 		exec("CREATE TABLE IF NOT EXISTS `" + m_prefix + "buddies_settings` ("
 				"`user_id` int(10) unsigned NOT NULL,"
 				"`buddy_id` int(10) unsigned NOT NULL,"
 				"`var` varchar(50) collate utf8_bin NOT NULL,"
 				"`type` smallint(4) unsigned NOT NULL,"
 				"`value` varchar(255) collate utf8_bin NOT NULL,"
 				"PRIMARY KEY (`buddy_id`,`var`),"
@@ @@ -381,49 +384,50 @@ bool MySQLBackend::exec(const std::string &query) { @@
+	}
 	return true;
+}
 void MySQLBackend::setUser(const UserInfo &user) {
 	*m_setUser << user.jid << user.uin << user.password << user.language << user.encoding << user.vip;
 	m_setUser->execute();
+}
 bool MySQLBackend::getUser(const std::string &barejid, UserInfo &user) {
 	*m_getUser << barejid;
 	if (!m_getUser->execute())
 		return false;
 	int ret = false;
 	while (m_getUser->fetch() == 0) {
 		ret = true;
 		*m_getUser >> user.id >> user.jid >> user.uin >> user.password >> user.encoding >> user.language >> user.vip;
+	}
 	return ret;
+}
 void MySQLBackend::setUserOnline(long id, bool online) {
 	*m_setUserOnline << online << id;
 	m_setUserOnline->execute();
+}
 long MySQLBackend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 // 	"INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)"
 	*m_addBuddy << userId << buddyInfo.legacyName << buddyInfo.subscription;
 	*m_addBuddy << (buddyInfo.groups.size() == 0 ? "" : buddyInfo.groups[0]);
 	*m_addBuddy << buddyInfo.alias << buddyInfo.flags;
 	m_addBuddy->execute();
 	long id = (long) mysql_insert_id(&m_conn);
 // 	INSERT OR REPLACE INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES (?, ?, ?, ?, ?)
 	if (!buddyInfo.settings.find("icon_hash")->second.s.empty()) {
 		*m_updateBuddySetting << userId << id << buddyInfo.settings.find("icon_hash")->first << (int) TYPE_STRING << buddyInfo.settings.find("icon_hash")->second.s << buddyInfo.settings.find("icon_hash")->second.s;
 		m_updateBuddySetting->execute();
+	}
 	return id;
+}
 void MySQLBackend::updateBuddy(long userId, const BuddyInfo &buddyInfo) {
 // 	"UPDATE " + m_prefix + "buddies SET groups=?, nickname=?, flags=?, subscription=? WHERE user_id=? AND uin=?"
 	*m_updateBuddy << (buddyInfo.groups.size() == 0 ? "" : buddyInfo.groups[0]);

src/rostermanager.cpp

➞

Show inline comments

+		}
+	}
 	else {
 		Swift::Presence::ref response = Swift::Presence::create();
 		response->setTo(to);
 		response->setFrom(from);
 		response->setType(Swift::Presence::Unavailable);
 		m_component->getStanzaChannel()->sendPresence(response);
+	}
+}
 void RosterManager::sendUnavailablePresences(const Swift::JID &to) {
 	for (std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		Swift::Presence::ref presence = buddy->generatePresenceStanza(255);
 		if (presence) {
 			presence->setTo(to);
 			presence->setType(Swift::Presence::Unavailable);
 			m_component->getStanzaChannel()->sendPresence(presence);
+		}
+	}
 	// in gateway mode, we have to send unavailable presence for transport
 	// contact
 	Swift::Presence::ref response = Swift::Presence::create();
 	response->setTo(to);
 	response->setFrom(m_component->getJID());
 	response->setType(Swift::Presence::Unavailable);
 	m_component->getStanzaChannel()->sendPresence(response);
+}
+}

src/sqlite3backend.cpp

➞

Show inline comments

@@ @@ -76,80 +76,83 @@ SQLite3Backend::~SQLite3Backend(){ @@
 	if (m_db) {
 		// Would be nice to use this:
 		//
 		//   sqlite3_stmt *pStmt;
 		//   while((pStmt = sqlite3_next_stmt(db, 0)) != 0 ) {
 		//    sqlite3_finalize(pStmt);
 		//   }
 		//
 		// But requires SQLite3 >= 3.6.0 beta
 		FINALIZE_STMT(m_setUser);
 		FINALIZE_STMT(m_getUser);
 		FINALIZE_STMT(m_removeUser);
 		FINALIZE_STMT(m_removeUserBuddies);
 		FINALIZE_STMT(m_removeUserSettings);
 		FINALIZE_STMT(m_removeUserBuddiesSettings);
 		FINALIZE_STMT(m_addBuddy);
 		FINALIZE_STMT(m_updateBuddy);
 		FINALIZE_STMT(m_getBuddies);
 		FINALIZE_STMT(m_getBuddiesSettings);
 		FINALIZE_STMT(m_getUserSetting);
 		FINALIZE_STMT(m_setUserSetting);
 		FINALIZE_STMT(m_updateUserSetting);
 		FINALIZE_STMT(m_updateBuddySetting);
 		FINALIZE_STMT(m_setUserOnline);
 		sqlite3_close(m_db);
+	}
+}
 bool SQLite3Backend::connect() {
 	LOG4CXX_INFO(logger, "Opening database " << CONFIG_STRING(m_config, "database.database"));
 	if (sqlite3_open(CONFIG_STRING(m_config, "database.database").c_str(), &m_db)) {
 		sqlite3_close(m_db);
 		return false;
+	}
 	if (createDatabase() == false)
 		return false;
 	PREP_STMT(m_setUser, "INSERT INTO " + m_prefix + "users (jid, uin, password, language, encoding, last_login, vip) VALUES (?, ?, ?, ?, ?, DATETIME('NOW'), ?)");
 	PREP_STMT(m_getUser, "SELECT id, jid, uin, password, encoding, language, vip FROM " + m_prefix + "users WHERE jid=?");
 	PREP_STMT(m_removeUser, "DELETE FROM " + m_prefix + "users WHERE id=?");
 	PREP_STMT(m_removeUserBuddies, "DELETE FROM " + m_prefix + "buddies WHERE user_id=?");
 	PREP_STMT(m_removeUserSettings, "DELETE FROM " + m_prefix + "users_settings WHERE user_id=?");
 	PREP_STMT(m_removeUserBuddiesSettings, "DELETE FROM " + m_prefix + "buddies_settings WHERE user_id=?");
 	PREP_STMT(m_addBuddy, "INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)");
 	PREP_STMT(m_updateBuddy, "UPDATE " + m_prefix + "buddies SET groups=?, nickname=?, flags=?, subscription=? WHERE user_id=? AND uin=?");
 	PREP_STMT(m_getBuddies, "SELECT id, uin, subscription, nickname, groups, flags FROM " + m_prefix + "buddies WHERE user_id=? ORDER BY id ASC");
 	PREP_STMT(m_getBuddiesSettings, "SELECT buddy_id, type, var, value FROM " + m_prefix + "buddies_settings WHERE user_id=? ORDER BY buddy_id ASC");
 	PREP_STMT(m_updateBuddySetting, "INSERT OR REPLACE INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES (?, ?, ?, ?, ?)");
 	PREP_STMT(m_getUserSetting, "SELECT type, value FROM " + m_prefix + "users_settings WHERE user_id=? AND var=?");
 	PREP_STMT(m_setUserSetting, "INSERT INTO " + m_prefix + "users_settings (user_id, var, type, value) VALUES (?,?,?,?)");
 	PREP_STMT(m_updateUserSetting, "UPDATE " + m_prefix + "users_settings SET value=? WHERE user_id=? AND var=?");
 	PREP_STMT(m_setUserOnline, "UPDATE " + m_prefix + "users SET online=?, last_login=DATETIME('NOW') WHERE id=?");
 	return true;
+}
 bool SQLite3Backend::createDatabase() {
 	int not_exist = exec("CREATE TABLE " + m_prefix + "buddies ("
 				"  id INTEGER PRIMARY KEY NOT NULL,"
 				"  user_id int(10) NOT NULL,"
 				"  uin varchar(255) NOT NULL,"
 				"  subscription varchar(20) NOT NULL,"
 				"  nickname varchar(255) NOT NULL,"
 				"  groups varchar(255) NOT NULL,"
 				"  flags int(4) NOT NULL DEFAULT '0'"
 				");");
 	if (not_exist) {
 		exec("CREATE UNIQUE INDEX IF NOT EXISTS user_id ON " + m_prefix + "buddies (user_id, uin);");
 		exec("CREATE TABLE IF NOT EXISTS " + m_prefix + "buddies_settings ("
 					"  user_id int(10) NOT NULL,"
 					"  buddy_id int(10) NOT NULL,"
 					"  var varchar(50) NOT NULL,"
 					"  type int(4) NOT NULL,"
 					"  value varchar(255) NOT NULL,"
 					"  PRIMARY KEY (buddy_id, var)"
 // 	SELECT id, jid, uin, password, encoding, language, vip FROM " + m_prefix + "users WHERE jid=?
 	sqlite3_reset(m_getUser);
 	sqlite3_bind_text(m_getUser, 1, barejid.c_str(), -1, SQLITE_TRANSIENT);
 	int ret;
 	while((ret = sqlite3_step(m_getUser)) == SQLITE_ROW) {
 		user.id = sqlite3_column_int(m_getUser, 0);
 		user.jid = (const char *) sqlite3_column_text(m_getUser, 1);
 		user.uin = (const char *) sqlite3_column_text(m_getUser, 2);
 		user.password = (const char *) sqlite3_column_text(m_getUser, 3);
 		user.encoding = (const char *) sqlite3_column_text(m_getUser, 4);
 		user.language = (const char *) sqlite3_column_text(m_getUser, 5);
 		user.vip = sqlite3_column_int(m_getUser, 6) != 0;
 		return true;
+	}
 	if (ret != SQLITE_DONE) {
 		LOG4CXX_ERROR(logger, "getUser query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
+	}
 	return false;
+}
 void SQLite3Backend::setUserOnline(long id, bool online) {
 	BEGIN(m_setUserOnline);
 	BIND_INT(m_setUserOnline, (int)online);
 	BIND_INT(m_setUserOnline, id);
 	EXECUTE_STATEMENT(m_setUserOnline, "setUserOnline query");
+}
 long SQLite3Backend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 // 	"INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)"
 	BEGIN(m_addBuddy);
 	BIND_INT(m_addBuddy, userId);
 	BIND_STR(m_addBuddy, buddyInfo.legacyName);
 	BIND_STR(m_addBuddy, buddyInfo.subscription);
 	BIND_STR(m_addBuddy, buddyInfo.groups.size() == 0 ? "" : buddyInfo.groups[0]); // TODO: serialize groups
 	BIND_STR(m_addBuddy, buddyInfo.alias);
 	BIND_INT(m_addBuddy, buddyInfo.flags);
 	if(sqlite3_step(m_addBuddy) != SQLITE_DONE) {
 		LOG4CXX_ERROR(logger, "addBuddy query"<< (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
 		return -1;
+	}
 	long id = (long) sqlite3_last_insert_rowid(m_db);
 // 	INSERT OR REPLACE INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES (?, ?, ?, ?, ?)
 	BEGIN(m_updateBuddySetting);
 	BIND_INT(m_updateBuddySetting, userId);
 	BIND_INT(m_updateBuddySetting, id);
 	BIND_STR(m_updateBuddySetting, buddyInfo.settings.find("icon_hash")->first);

0 comments (0 inline, 0 general)