Date: Thursday, December 8, 2005 @ 14:59:08
Author: csaba
Path: /cvsroot/carob/libmysequoia/config
Added: virtualdatabase/mysql-db1.xml (1.1)
virtualdatabase/mysql-db2.xml (1.1)
Modified: controller/controller-mysql.xml (1.1 -> 1.2) createtbl.sh (1.1
-> 1.2)
Removed: virtualdatabase/mysql.xml (1.1)
Updated the config files (2 databases and 2 virtual users)
---------------------------------+
controller/controller-mysql.xml | 3 +
createtbl.sh | 6 +++
virtualdatabase/mysql-db1.xml | 63 ++++++++++++++++++++++++++++++++++++++
virtualdatabase/mysql-db2.xml | 63 ++++++++++++++++++++++++++++++++++++++
virtualdatabase/mysql.xml | 59 -----------------------------------
5 files changed, 133 insertions(+), 61 deletions(-)
Index: libmysequoia/config/controller/controller-mysql.xml
diff -u libmysequoia/config/controller/controller-mysql.xml:1.1
libmysequoia/config/controller/controller-mysql.xml:1.2
--- libmysequoia/config/controller/controller-mysql.xml:1.1 Mon Nov 28
10:20:40 2005
+++ libmysequoia/config/controller/controller-mysql.xml Thu Dec 8 14:59:08 2005
@@ -6,6 +6,7 @@
<JmxSettings>
<RmiJmxAdaptor/>
</JmxSettings>
- <VirtualDatabase configFile="mysql.xml" virtualDatabaseName="db"
autoEnableBackends="force"/>
+ <VirtualDatabase configFile="mysql-db1.xml" virtualDatabaseName="db1"
autoEnableBackends="force"/>
+ <VirtualDatabase configFile="mysql-db2.xml" virtualDatabaseName="db2"
autoEnableBackends="force"/>
</Controller>
</SEQUOIA-CONTROLLER>
Index: libmysequoia/config/createtbl.sh
diff -u libmysequoia/config/createtbl.sh:1.1
libmysequoia/config/createtbl.sh:1.2
--- libmysequoia/config/createtbl.sh:1.1 Mon Nov 28 10:27:06 2005
+++ libmysequoia/config/createtbl.sh Thu Dec 8 14:59:08 2005
@@ -3,5 +3,9 @@
mysql -uroot -prootpass <<EOF
USE test;
CREATE table t1 (a int(11) NOT NULL auto_increment, b int(11) default NULL,
PRIMARY KEY (a)) ENGINE=InnoDB;
-INSERT INTO t1 (b) VALUES (1),(2),(3)
+INSERT INTO t1 (b) VALUES (1),(2),(3);
+
+CREATE DATABASE test2;
+USE test2;
+CREATE TABLE t1 as SELECT * FROM test.t1;
EOF
Index: libmysequoia/config/virtualdatabase/mysql-db1.xml
diff -u /dev/null libmysequoia/config/virtualdatabase/mysql-db1.xml:1.1
--- /dev/null Thu Dec 8 14:59:08 2005
+++ libmysequoia/config/virtualdatabase/mysql-db1.xml Thu Dec 8 14:59:08 2005
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF8"?>
+<!DOCTYPE SEQUOIA PUBLIC "-//Continuent//DTD SEQUOIA 2.3//EN"
"http://sequoia.continuent.org/dtds/sequoia-2.3.dtd";>
+
+<SEQUOIA>
+
+ <VirtualDatabase name="db1">
+
+ <AuthenticationManager>
+ <Admin>
+ <User username="admin" password="adminpass"/>
+ </Admin>
+ <VirtualUsers>
+ <VirtualLogin vLogin="user1" vPassword="userpass1"/>
+ <VirtualLogin vLogin="user2" vPassword="userpass2"/>
+ </VirtualUsers>
+ </AuthenticationManager>
+
+ <DatabaseBackend name="csaba1" driver="com.mysql.jdbc.Driver"
url="jdbc:mysql://localhost/test" connectionTestStatement="select 1">
+ <ConnectionManager vLogin="user1" rLogin="root" rPassword="rootpass">
+ <VariablePoolConnectionManager initPoolSize="10" minPoolSize="5"
maxPoolSize="50" idleTimeout="30" waitTimeout="10"/>
+ </ConnectionManager>
+ <ConnectionManager vLogin="user2" rLogin="root" rPassword="rootpass">
+ <VariablePoolConnectionManager initPoolSize="10" minPoolSize="5"
maxPoolSize="50" idleTimeout="30" waitTimeout="10"/>
+ </ConnectionManager>
+ </DatabaseBackend>
+
+ <RequestManager>
+ <RequestScheduler>
+ <RAIDb-1Scheduler level="passThrough"/>
+ </RequestScheduler>
+
+ <LoadBalancer>
+ <RAIDb-1>
+ <WaitForCompletion policy="first"/>
+ <RAIDb-1-LeastPendingRequestsFirst/>
+ </RAIDb-1>
+ </LoadBalancer>
+
+ <RecoveryLog driver="org.hsqldb.jdbcDriver"
+ url="jdbc:hsqldb:hsql://localhost:9003" login="TEST" password="">
+ <RecoveryLogTable tableName="RECOVERY" idColumnType="BIGINT NOT NULL"
+ vloginColumnType="VARCHAR NOT NULL" sqlColumnType="VARCHAR NOT NULL"
+ extraStatementDefinition=",PRIMARY KEY (id)"/>
+ <CheckpointTable tableName="CHECKPOINT"
+ checkpointNameColumnType="VARCHAR NOT NULL"/>
+ <BackendTable tableName="BACKEND"
+ databaseNameColumnType="VARCHAR NOT NULL"
+ backendNameColumnType="VARCHAR NOT NULL"
+ checkpointNameColumnType="VARCHAR NOT NULL"/>
+ <DumpTable tableName="DUMP" dumpNameColumnType="VARCHAR NOT NULL"
+ dumpDateColumnType="VARCHAR NOT NULL"
+ dumpPathColumnType="VARCHAR NOT NULL"
+ dumpFormatColumnType="VARCHAR NOT NULL"
+ checkpointNameColumnType="VARCHAR NOT NULL"
+ backendNameColumnType="VARCHAR NOT NULL"
+ tablesColumnType="VARCHAR NOT NULL"/>
+ </RecoveryLog>
+
+ </RequestManager>
+
+ </VirtualDatabase>
+
+</SEQUOIA>
Index: libmysequoia/config/virtualdatabase/mysql-db2.xml
diff -u /dev/null libmysequoia/config/virtualdatabase/mysql-db2.xml:1.1
--- /dev/null Thu Dec 8 14:59:08 2005
+++ libmysequoia/config/virtualdatabase/mysql-db2.xml Thu Dec 8 14:59:08 2005
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF8"?>
+<!DOCTYPE SEQUOIA PUBLIC "-//Continuent//DTD SEQUOIA 2.3//EN"
"http://sequoia.continuent.org/dtds/sequoia-2.3.dtd";>
+
+<SEQUOIA>
+
+ <VirtualDatabase name="db2">
+
+ <AuthenticationManager>
+ <Admin>
+ <User username="admin" password="adminpass"/>
+ </Admin>
+ <VirtualUsers>
+ <VirtualLogin vLogin="user1" vPassword="userpass1"/>
+ <VirtualLogin vLogin="user2" vPassword="userpass2"/>
+ </VirtualUsers>
+ </AuthenticationManager>
+
+ <DatabaseBackend name="csaba2" driver="com.mysql.jdbc.Driver"
url="jdbc:mysql://localhost/test2" connectionTestStatement="select 1">
+ <ConnectionManager vLogin="user1" rLogin="root" rPassword="rootpass">
+ <VariablePoolConnectionManager initPoolSize="10" minPoolSize="5"
maxPoolSize="50" idleTimeout="30" waitTimeout="10"/>
+ </ConnectionManager>
+ <ConnectionManager vLogin="user2" rLogin="root" rPassword="rootpass">
+ <VariablePoolConnectionManager initPoolSize="10" minPoolSize="5"
maxPoolSize="50" idleTimeout="30" waitTimeout="10"/>
+ </ConnectionManager>
+ </DatabaseBackend>
+
+ <RequestManager>
+ <RequestScheduler>
+ <RAIDb-1Scheduler level="passThrough"/>
+ </RequestScheduler>
+
+ <LoadBalancer>
+ <RAIDb-1>
+ <WaitForCompletion policy="first"/>
+ <RAIDb-1-LeastPendingRequestsFirst/>
+ </RAIDb-1>
+ </LoadBalancer>
+
+ <RecoveryLog driver="org.hsqldb.jdbcDriver"
+ url="jdbc:hsqldb:hsql://localhost:9003" login="TEST" password="">
+ <RecoveryLogTable tableName="RECOVERY" idColumnType="BIGINT NOT NULL"
+ vloginColumnType="VARCHAR NOT NULL" sqlColumnType="VARCHAR NOT NULL"
+ extraStatementDefinition=",PRIMARY KEY (id)"/>
+ <CheckpointTable tableName="CHECKPOINT"
+ checkpointNameColumnType="VARCHAR NOT NULL"/>
+ <BackendTable tableName="BACKEND"
+ databaseNameColumnType="VARCHAR NOT NULL"
+ backendNameColumnType="VARCHAR NOT NULL"
+ checkpointNameColumnType="VARCHAR NOT NULL"/>
+ <DumpTable tableName="DUMP" dumpNameColumnType="VARCHAR NOT NULL"
+ dumpDateColumnType="VARCHAR NOT NULL"
+ dumpPathColumnType="VARCHAR NOT NULL"
+ dumpFormatColumnType="VARCHAR NOT NULL"
+ checkpointNameColumnType="VARCHAR NOT NULL"
+ backendNameColumnType="VARCHAR NOT NULL"
+ tablesColumnType="VARCHAR NOT NULL"/>
+ </RecoveryLog>
+
+ </RequestManager>
+
+ </VirtualDatabase>
+
+</SEQUOIA>
Index: libmysequoia/config/virtualdatabase/mysql.xml
diff -u libmysequoia/config/virtualdatabase/mysql.xml:1.1
libmysequoia/config/virtualdatabase/mysql.xml:removed
--- libmysequoia/config/virtualdatabase/mysql.xml:1.1 Mon Nov 28 10:20:40 2005
+++ libmysequoia/config/virtualdatabase/mysql.xml Thu Dec 8 14:59:08 2005
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF8"?>
-<!DOCTYPE SEQUOIA PUBLIC "-//Continuent//DTD SEQUOIA 2.3//EN"
"http://sequoia.continuent.org/dtds/sequoia-2.3.dtd";>
-
-<SEQUOIA>
-
- <VirtualDatabase name="db">
-
- <AuthenticationManager>
- <Admin>
- <User username="admin" password="adminpass"/>
- </Admin>
- <VirtualUsers>
- <VirtualLogin vLogin="user" vPassword="userpass"/>
- </VirtualUsers>
- </AuthenticationManager>
-
- <DatabaseBackend name="csaba" driver="com.mysql.jdbc.Driver"
url="jdbc:mysql://localhost/test" connectionTestStatement="select 1">
- <ConnectionManager vLogin="user" rLogin="root" rPassword="rootpass">
- <VariablePoolConnectionManager initPoolSize="10" minPoolSize="5"
maxPoolSize="50" idleTimeout="30" waitTimeout="10"/>
- </ConnectionManager>
- </DatabaseBackend>
-
- <RequestManager>
- <RequestScheduler>
- <RAIDb-1Scheduler level="passThrough"/>
- </RequestScheduler>
-
- <LoadBalancer>
- <RAIDb-1>
- <WaitForCompletion policy="first"/>
- <RAIDb-1-LeastPendingRequestsFirst/>
- </RAIDb-1>
- </LoadBalancer>
-
- <RecoveryLog driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:hsql://localhost:9003" login="TEST" password="">
- <RecoveryLogTable tableName="RECOVERY" idColumnType="BIGINT NOT NULL"
- vloginColumnType="VARCHAR NOT NULL" sqlColumnType="VARCHAR NOT NULL"
- extraStatementDefinition=",PRIMARY KEY (id)"/>
- <CheckpointTable tableName="CHECKPOINT"
- checkpointNameColumnType="VARCHAR NOT NULL"/>
- <BackendTable tableName="BACKEND"
- databaseNameColumnType="VARCHAR NOT NULL"
- backendNameColumnType="VARCHAR NOT NULL"
- checkpointNameColumnType="VARCHAR NOT NULL"/>
- <DumpTable tableName="DUMP" dumpNameColumnType="VARCHAR NOT NULL"
- dumpDateColumnType="VARCHAR NOT NULL"
- dumpPathColumnType="VARCHAR NOT NULL"
- dumpFormatColumnType="VARCHAR NOT NULL"
- checkpointNameColumnType="VARCHAR NOT NULL"
- backendNameColumnType="VARCHAR NOT NULL"
- tablesColumnType="VARCHAR NOT NULL"/>
- </RecoveryLog>
-
- </RequestManager>
-
- </VirtualDatabase>
-
-</SEQUOIA>
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
