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/11/21 07:52:46 UTC
svn commit: r596961 - in /webservices/sandesha/trunk/c: Makefile.am
config/mysql_schema.sh src/storage/mysql/permanent_transaction.c
src/storage/sqlite/permanent_transaction.c
Author: damitha
Date: Tue Nov 20 22:52:43 2007
New Revision: 596961
URL: http://svn.apache.org/viewvc?rev=596961&view=rev
Log:
Now in mysql there are no separate database for server and client side
Modified:
webservices/sandesha/trunk/c/Makefile.am
webservices/sandesha/trunk/c/config/mysql_schema.sh
webservices/sandesha/trunk/c/src/storage/mysql/permanent_transaction.c
webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c
Modified: webservices/sandesha/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/Makefile.am?rev=596961&r1=596960&r2=596961&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/Makefile.am (original)
+++ webservices/sandesha/trunk/c/Makefile.am Tue Nov 20 22:52:43 2007
@@ -10,7 +10,7 @@
docs_DATA=
-sysconf_DATA=config/axis2.xml
+sysconf_DATA=config/axis2.xml config/init_mysql.sh config/mysql_schema.sh
install-data-hook:
cp -rf xdocs/docs/* $(docsdir)
Modified: webservices/sandesha/trunk/c/config/mysql_schema.sh
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/config/mysql_schema.sh?rev=596961&r1=596960&r2=596961&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/config/mysql_schema.sh (original)
+++ webservices/sandesha/trunk/c/config/mysql_schema.sh Tue Nov 20 22:52:43 2007
@@ -1,31 +1,8 @@
#!/bin/bash
-drop database IF EXISTS sandesha2_svr_db;
-drop database IF EXISTS sandesha2_client_db;
-create database sandesha2_svr_db;
-create database sandesha2_client_db;
+drop database IF EXISTS sandesha2_db;
+create database sandesha2_db;
-connect sandesha2_svr_db;
-create table create_seq(create_seq_msg_id varchar(100) primary key,
- internal_seq_id varchar(200), seq_id varchar(200), create_seq_msg_store_key varchar(100),
- ref_msg_store_key varchar(100)) engine=InnoDB;
-create table invoker(msg_ctx_ref_key varchar(100) primary key,
- msg_no long, seq_id varchar(200), is_invoked boolean) engine=InnoDB;
-create table sender(msg_id varchar(100) primary key,
- msg_ctx_ref_key varchar(100), internal_seq_id varchar(200), sent_count int,
- msg_no long, send boolean, resend boolean, time_to_send long, msg_type int,
- seq_id varchar(200), wsrm_anon_uri varchar(100), to_address varchar(100)) engine=InnoDB;
-create table next_msg(seq_id varchar(200) primary key,
- ref_msg_key varchar(100), polling_mode boolean, msg_no long) engine=InnoDB;
-create table seq_property(id varchar(200) ,
- seq_id varchar(200), name varchar(200), value varchar(200)) engine=InnoDB;
-create table msg(stored_key varchar(200) primary key,
- msg_id varchar(200), soap_env_str text, soap_version int, transport_out varchar(100),
- op varchar(100), svc varchar(100), svc_grp varchar(100), op_mep varchar(100), to_url varchar(200),
- reply_to varchar(200), transport_to varchar(200), execution_chain_str varchar(200), flow int,
- msg_recv_str varchar(200), svr_side boolean, in_msg_store_key varchar(200), prop_str varchar(8192),
- action varchar(200)) engine=InnoDB;
-
-connect sandesha2_client_db;
+connect sandesha2_db;
create table create_seq(create_seq_msg_id varchar(100) primary key,
internal_seq_id varchar(200), seq_id varchar(200), create_seq_msg_store_key varchar(100),
ref_msg_store_key varchar(100)) engine=InnoDB;
Modified: webservices/sandesha/trunk/c/src/storage/mysql/permanent_transaction.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/mysql/permanent_transaction.c?rev=596961&r1=596960&r2=596961&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/mysql/permanent_transaction.c (original)
+++ webservices/sandesha/trunk/c/src/storage/mysql/permanent_transaction.c Tue Nov 20 22:52:43 2007
@@ -99,13 +99,10 @@
axis2_char_t *user = NULL;
axis2_char_t *password = NULL;
axis2_char_t *path = NULL;
- axis2_char_t *db_name = NULL;
- int rc = -1;
+ /*int rc = -1;*/
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
sandesha2_property_bean_t *prop_bean = NULL;
- axis2_ctx_t *conf_ctx_base = NULL;
- axutil_property_t *property = NULL;
axis2_module_desc_t *module_desc = NULL;
axutil_qname_t *qname = NULL;
@@ -162,24 +159,9 @@
}
}
axutil_qname_free(qname, env);
- conf_ctx_base = axis2_conf_ctx_get_base(conf_ctx, env);
- property = axis2_ctx_get_property(conf_ctx_base, env,
- SANDESHA2_IS_SVR_SIDE);
- if(!property)
- {
- /*db_name = axutil_strcat(env, path, AXIS2_PATH_SEP_STR,
- "sandesha2_svr_db", NULL);*/
- db_name = "sandesha2_svr_db";
- }
- else
- {
- /*db_name = axutil_strcat(env, path, AXIS2_PATH_SEP_STR,
- "sandesha2_client_db", NULL);*/
- db_name = "sandesha2_svr_db";
- }
trans_impl->dbconn = mysql_init(trans_impl->dbconn);
if (!mysql_real_connect(trans_impl->dbconn, server,
- user, password, db_name, 0, NULL, 0))
+ user, password, SANDESHA2_DB, 0, NULL, 0))
{
mysql_close(trans_impl->dbconn);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Can't open database: %s\n",
@@ -188,7 +170,7 @@
AXIS2_FAILURE);
return NULL;
}
- rc = mysql_autocommit(trans_impl->dbconn, 0);
+ /*rc = mysql_autocommit(trans_impl->dbconn, 0);
if(rc )
{
mysql_close(trans_impl->dbconn);
@@ -198,7 +180,7 @@
printf("transaction begin error_msg:%s\n", mysql_error(trans_impl->dbconn));
sandesha2_transaction_free(&(trans_impl->trans), env);
return NULL;
- }
+ }*/
trans_impl->is_active = AXIS2_TRUE;
return &(trans_impl->trans);
}
@@ -262,12 +244,12 @@
sandesha2_transaction_t *trans,
const axutil_env_t *env)
{
- int rc = -1;
+ /*int rc = -1;*/
sandesha2_permanent_transaction_impl_t *trans_impl = NULL;
trans_impl = SANDESHA2_INTF_TO_IMPL(trans);
axutil_thread_mutex_lock(trans_impl->mutex);
- rc = mysql_commit(trans_impl->dbconn);
+ /*rc = mysql_commit(trans_impl->dbconn);
if(rc )
{
mysql_close(trans_impl->dbconn);
@@ -276,7 +258,7 @@
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "sql error %s",
mysql_error(trans_impl->dbconn));
printf("commit error_msg:%s\n", mysql_error(trans_impl->dbconn));
- }
+ }*/
trans_impl->is_active = AXIS2_FALSE;
sandesha2_permanent_transaction_release_locks(trans, env);
mysql_close(trans_impl->dbconn);
@@ -288,11 +270,11 @@
sandesha2_transaction_t *trans,
const axutil_env_t *env)
{
- int rc = -1;
+ /*int rc = -1;*/
sandesha2_permanent_transaction_impl_t *trans_impl = NULL;
trans_impl = SANDESHA2_INTF_TO_IMPL(trans);
axutil_thread_mutex_lock(trans_impl->mutex);
- rc = mysql_rollback(trans_impl->dbconn);
+ /*rc = mysql_rollback(trans_impl->dbconn);
if(rc )
{
mysql_close(trans_impl->dbconn);
@@ -302,7 +284,7 @@
mysql_error(trans_impl->dbconn));
printf("sql_stmt_rollback:%s\n", "rollback;");
printf("rollback error_msg:%s\n", mysql_error(trans_impl->dbconn));
- }
+ }*/
trans_impl->is_active = AXIS2_FALSE;
sandesha2_permanent_transaction_release_locks(trans, env);
mysql_close(trans_impl->dbconn);
Modified: webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c?rev=596961&r1=596960&r2=596961&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c (original)
+++ webservices/sandesha/trunk/c/src/storage/sqlite/permanent_transaction.c Tue Nov 20 22:52:43 2007
@@ -95,7 +95,7 @@
unsigned long int thread_id)
{
sandesha2_permanent_transaction_impl_t *trans_impl = NULL;
- axis2_char_t *error_msg = NULL;
+ /*axis2_char_t *error_msg = NULL;*/
axis2_char_t *path = "./";
axis2_char_t *db_name = NULL;
int rc = -1;
@@ -148,7 +148,7 @@
return NULL;
}
axutil_thread_mutex_lock(trans_impl->mutex);
- rc = sqlite3_exec(trans_impl->dbconn, "BEGIN DEFERRED TRANSACTION;", 0, 0,
+ /*rc = sqlite3_exec(trans_impl->dbconn, "BEGIN DEFERRED TRANSACTION;", 0, 0,
&error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(trans_impl->dbconn,
@@ -163,7 +163,7 @@
sqlite3_free(error_msg);
sandesha2_transaction_free(&(trans_impl->trans), env);
return NULL;
- }
+ }*/
axutil_thread_mutex_unlock(trans_impl->mutex);
trans_impl->is_active = AXIS2_TRUE;
@@ -229,13 +229,13 @@
sandesha2_transaction_t *trans,
const axutil_env_t *env)
{
- axis2_char_t *error_msg = NULL;
- int rc = -1;
+ /*axis2_char_t *error_msg = NULL;
+ int rc = -1;*/
sandesha2_permanent_transaction_impl_t *trans_impl = NULL;
trans_impl = SANDESHA2_INTF_TO_IMPL(trans);
axutil_thread_mutex_lock(trans_impl->mutex);
- rc = sqlite3_exec(trans_impl->dbconn, "COMMIT TRANSACTION;", 0, 0, &error_msg);
+ /*rc = sqlite3_exec(trans_impl->dbconn, "COMMIT TRANSACTION;", 0, 0, &error_msg);
if(rc == SQLITE_BUSY)
{
rc = sandesha2_permanent_bean_mgr_busy_handler(trans_impl->dbconn,
@@ -249,7 +249,7 @@
error_msg);
printf("commit error_msg:%s\n", error_msg);
sqlite3_free(error_msg);
- }
+ }*/
sqlite3_close(trans_impl->dbconn);
trans_impl->is_active = AXIS2_FALSE;
sandesha2_permanent_transaction_release_locks(trans, env);
@@ -261,12 +261,12 @@
sandesha2_transaction_t *trans,
const axutil_env_t *env)
{
- axis2_char_t *error_msg = NULL;
- int rc = -1;
+ /*axis2_char_t *error_msg = NULL;
+ int rc = -1;*/
sandesha2_permanent_transaction_impl_t *trans_impl = NULL;
trans_impl = SANDESHA2_INTF_TO_IMPL(trans);
axutil_thread_mutex_lock(trans_impl->mutex);
- rc = sqlite3_exec(trans_impl->dbconn, "ROLLBACK TRANSACTION;", 0, 0,
+ /*rc = sqlite3_exec(trans_impl->dbconn, "ROLLBACK TRANSACTION;", 0, 0,
&error_msg);
if(rc == SQLITE_BUSY)
rc = sandesha2_permanent_bean_mgr_busy_handler(trans_impl->dbconn,
@@ -280,7 +280,7 @@
printf("sql_stmt_rollback:%s\n", "ROLLBACK TRANSACTION;");
printf("rollback error_msg:%s\n", error_msg);
sqlite3_free(error_msg);
- }
+ }*/
sqlite3_close(trans_impl->dbconn);
trans_impl->is_active = AXIS2_FALSE;
sandesha2_permanent_transaction_release_locks(trans, env);
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org