You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2007/04/27 11:41:01 UTC
svn commit: r533038 - in /webservices/sandesha/trunk/c:
config/sqlite_schema.sh src/storage/mysql/permanent_bean_mgr.c
src/storage/sqlite/permanent_bean_mgr.c
Author: damitha
Date: Fri Apr 27 02:41:00 2007
New Revision: 533038
URL: http://svn.apache.org/viewvc?view=rev&rev=533038
Log:
Improved database access code for sqlite
Modified:
webservices/sandesha/trunk/c/config/sqlite_schema.sh
webservices/sandesha/trunk/c/src/storage/mysql/permanent_bean_mgr.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
Modified: webservices/sandesha/trunk/c/config/sqlite_schema.sh
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/sqlite_schema.sh?view=diff&rev=533038&r1=533037&r2=533038
==============================================================================
--- webservices/sandesha/trunk/c/config/sqlite_schema.sh (original)
+++ webservices/sandesha/trunk/c/config/sqlite_schema.sh Fri Apr 27 02:41:00 2007
@@ -16,7 +16,7 @@
seq_id varchar(200), wsrm_anon_uri varchar(100), to_address varchar(100))"
sqlite sandesha2_svr_db "create table next_msg(seq_id varchar(200) primary key,
ref_msg_key varchar(100), polling_mode boolean, msg_no long)"
-sqlite sandesha2_svr_db "create table seq_property(id varchar(200) primary key,
+sqlite sandesha2_svr_db "create table seq_property(id varchar(200) ,
seq_id varchar(200), name varchar(200), value varchar(200))"
sqlite sandesha2_svr_db "create table msg(stored_key varchar(200) primary key,
msg_id varchar(200), soap_env_str text, soap_version int, transport_out varchar(100),
@@ -43,7 +43,7 @@
seq_id varchar(200), wsrm_anon_uri varchar(100), to_address varchar(100))"
sqlite sandesha2_client_db "create table next_msg(seq_id varchar(200) primary key,
ref_msg_key varchar(100), polling_mode boolean, msg_no long)"
-sqlite sandesha2_client_db "create table seq_property(id varchar(200) primary key,
+sqlite sandesha2_client_db "create table seq_property(id varchar(200) ,
seq_id varchar(200), name varchar(200), value varchar(200))"
sqlite sandesha2_client_db "create table msg(stored_key varchar(200) primary key,
msg_id varchar(200), soap_env_str text, soap_version int, transport_out varchar(100),
Modified: webservices/sandesha/trunk/c/src/storage/mysql/permanent_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/mysql/permanent_bean_mgr.c?view=diff&rev=533038&r1=533037&r2=533038
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/mysql/permanent_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/mysql/permanent_bean_mgr.c Fri Apr 27 02:41:00 2007
@@ -203,19 +203,17 @@
axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
return AXIS2_FALSE;
}
+ rc = mysql_query(dbconn, sql_stmt_insert);
+ if(rc)
{
- rc = mysql_query(dbconn, sql_stmt_insert);
- if(rc)
- {
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql stmt: %s. sql error: %s",
- sql_stmt_insert, mysql_error(dbconn));
- printf("sql_stmt_insert:%s\n", sql_stmt_insert);
- printf("insert error_msg:%s\n", mysql_error(dbconn));
- mysql_close(dbconn);
- axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
- return AXIS2_FALSE;
- }
+ AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql stmt: %s. sql error: %s",
+ sql_stmt_insert, mysql_error(dbconn));
+ printf("sql_stmt_insert:%s\n", sql_stmt_insert);
+ printf("insert error_msg:%s\n", mysql_error(dbconn));
+ mysql_close(dbconn);
+ axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
+ return AXIS2_FALSE;
}
axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
return AXIS2_TRUE;
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c?view=diff&rev=533038&r1=533037&r2=533038
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_bean_mgr.c Fri Apr 27 02:41:00 2007
@@ -243,64 +243,16 @@
axis2_char_t *error_msg = NULL;
int rc = -1;
sqlite3 *dbconn = NULL;
- sandesha2_rm_bean_t *retrieve_bean = NULL;
- sandesha2_bean_mgr_args_t *args = NULL;
sandesha2_permanent_bean_mgr_impl_t *bean_mgr_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
-
+
sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, bean);
axutil_thread_mutex_lock(bean_mgr_impl->mutex);
- args = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_bean_mgr_args_t));
- args->env = env;
- args->data = NULL;
dbconn = (sqlite3 *) sandesha2_permanent_storage_mgr_get_dbconn(
bean_mgr_impl->storage_mgr, env);
if(!dbconn)
return AXIS2_FALSE;
- rc = sqlite3_exec(dbconn, sql_stmt_retrieve, retrieve_func, args,
- &error_msg);
- if(rc == SQLITE_BUSY)
- rc = sandesha2_permanent_bean_mgr_busy_handler(dbconn, sql_stmt_retrieve,
- retrieve_func, args, &error_msg, rc);
- if(rc != SQLITE_OK )
- {
- axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql stmt:%s. sql error: %s",
- sql_stmt_retrieve, error_msg);
- printf("sql_stmt_retrieve:%s\n", sql_stmt_retrieve);
- printf("retrieve error_msg:%s\n", error_msg);
- sqlite3_free(error_msg);
- return AXIS2_FALSE;
- }
- if(args->data)
- retrieve_bean = (sandesha2_rm_bean_t *) args->data;
- if(args)
- AXIS2_FREE(env->allocator, args);
- if(retrieve_bean)
- {
- rc = sqlite3_exec(dbconn, sql_stmt_update, 0, 0, &error_msg);
- if(rc == SQLITE_BUSY)
- rc = sandesha2_permanent_bean_mgr_busy_handler(dbconn, sql_stmt_update,
- 0, 0, &error_msg, rc);
- if( rc != SQLITE_OK )
- {
- axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR,
- AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql stmt: %s.sql error: %s",
- sql_stmt_update, error_msg);
- printf("sql_stmt_update:%s\n", sql_stmt_update);
- printf("update error_msg:%s\n", error_msg);
- sqlite3_free(error_msg);
- return AXIS2_FALSE;
- }
- axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
- return AXIS2_TRUE;
- }
- axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
- axutil_thread_mutex_lock(bean_mgr_impl->mutex);
rc = sqlite3_exec(dbconn, sql_stmt_insert, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(dbconn, sql_stmt_insert,
@@ -475,12 +427,9 @@
axis2_char_t *sql_stmt_update)
{
sandesha2_permanent_bean_mgr_impl_t *bean_mgr_impl = NULL;
- sandesha2_bean_mgr_args_t *args = NULL;
sqlite3 *dbconn = NULL;
- sandesha2_rm_bean_t *old_bean = NULL;
axis2_char_t *error_msg = NULL;
int rc = -1;
- axis2_char_t *key = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
bean_mgr_impl = SANDESHA2_INTF_TO_IMPL(bean_mgr);
if(bean)
@@ -490,27 +439,6 @@
bean_mgr_impl->storage_mgr, env);
if(!dbconn)
return AXIS2_FALSE;
- args = AXIS2_MALLOC(env->allocator, sizeof(sandesha2_bean_mgr_args_t));
- args->env = (axutil_env_t*)env;
- args->data = NULL;
- rc = sqlite3_exec(dbconn, sql_stmt_retrieve_old_bean,
- retrieve_func, args, &error_msg);
- if(rc == SQLITE_BUSY)
- rc = sandesha2_permanent_bean_mgr_busy_handler(dbconn, sql_stmt_retrieve_old_bean,
- retrieve_func, args, &error_msg, rc);
- if(rc != SQLITE_OK )
- {
- axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
- if(args)
- AXIS2_FREE(env->allocator, args);
- AXIS2_ERROR_SET(env->error, SANDESHA2_ERROR_SQL_ERROR, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s",
- error_msg);
- printf("sql_stmt_retrieve_old_bean:%s\n", sql_stmt_retrieve_old_bean);
- printf("retrieve error_msg:%s\n", error_msg);
- sqlite3_free(error_msg);
- return AXIS2_FALSE;
- }
rc = sqlite3_exec(dbconn, sql_stmt_update, 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(dbconn, sql_stmt_update,
@@ -527,15 +455,6 @@
return AXIS2_FALSE;
}
axutil_thread_mutex_unlock(bean_mgr_impl->mutex);
- if(args->data)
- old_bean = (sandesha2_rm_bean_t *) args->data;
- if(old_bean)
- key = sandesha2_rm_bean_get_key(old_bean, env);
- if(!key)
- return AXIS2_FALSE;
- sandesha2_storage_mgr_enlist_bean(bean_mgr_impl->storage_mgr, env, old_bean);
- if(args)
- AXIS2_FREE(env->allocator, args);
return AXIS2_TRUE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org