CVS update of sequoia/src/org/continuent/sequoia (6 files)

    Date: Thursday, September 21, 2006 @ 16:26:28
  Author: emmanuel
    Path: /cvsroot/sequoia/sequoia/src/org/continuent/sequoia

Modified: common/jmx/management/BackendInfo.java (1.8 -> 1.9)
          controller/virtualdatabase/protocol/BackendStatus.java (1.9 ->
          1.10) controller/virtualdatabase/protocol/BackendTransfer.java
          (1.8 -> 1.9)
          controller/virtualdatabase/protocol/CacheInvalidate.java (1.5 ->
          1.6)
          controller/virtualdatabase/protocol/NotifyDisableBackend.java
          (1.3 -> 1.4)
          controller/virtualdatabase/protocol/NotifyEnableBackend.java
          (1.2 -> 1.3)

DatabaseBackend now has a reference to the vdb instead of the vdbName (new 
constructor)
Relates to SEQUOIA-791


---------------------------------------------------------------+
 common/jmx/management/BackendInfo.java                        |   13 +++++----
 controller/virtualdatabase/protocol/BackendStatus.java        |    6 ++--
 controller/virtualdatabase/protocol/BackendTransfer.java      |    5 ++-
 controller/virtualdatabase/protocol/CacheInvalidate.java      |    2 -
 controller/virtualdatabase/protocol/NotifyDisableBackend.java |   14 +---------
 controller/virtualdatabase/protocol/NotifyEnableBackend.java  |    2 -
 6 files changed, 18 insertions(+), 24 deletions(-)


Index: sequoia/src/org/continuent/sequoia/common/jmx/management/BackendInfo.java
diff -u 
sequoia/src/org/continuent/sequoia/common/jmx/management/BackendInfo.java:1.8 
sequoia/src/org/continuent/sequoia/common/jmx/management/BackendInfo.java:1.9
--- 
sequoia/src/org/continuent/sequoia/common/jmx/management/BackendInfo.java:1.8   
    Tue Sep 19 12:39:35 2006
+++ sequoia/src/org/continuent/sequoia/common/jmx/management/BackendInfo.java   
Thu Sep 21 16:26:28 2006
@@ -29,6 +29,7 @@
 import java.util.List;
 
 import org.continuent.sequoia.controller.backend.DatabaseBackend;
+import org.continuent.sequoia.controller.virtualdatabase.VirtualDatabase;
 
 /**
  * This class defines a BackendInfo. We cannot use DatabaseBackend as a
@@ -87,12 +88,13 @@
    * Create a corresponding DatabaseBackend object from the information stored
    * in this object.
    * 
+   * @param vdb the virtual database this backend will belong to
    * @return a <code>DatabaseBackend</code>
    */
-  public DatabaseBackend getDatabaseBackend()
+  public DatabaseBackend getDatabaseBackend(VirtualDatabase vdb)
   {
-    return new DatabaseBackend(name, driverPath, driverClassName, url,
-        virtualDatabaseName, true, connectionTestStatement, nbOfWorkerThreads);
+    return new DatabaseBackend(vdb, name, driverPath, driverClassName, url,
+        true, connectionTestStatement, nbOfWorkerThreads);
   }
 
   /**
@@ -213,13 +215,14 @@
    * get the "real" DatabaseBackends, use 
    * {@link 
org.continuent.sequoia.controller.virtualdatabase.VirtualDatabase#getAndCheckBackend(String,
 int)}.</em>
    * 
+   * @param vdb the virtual database the backends will belong to
    * @param backendInfos a <code>List</code> of <code>BackendInfo</code>
    * @return a <code>List</code> of <code>DatabaseBackend</code> (possibly
    *         empty if the list of backendInfos was <code>null</code>
    * @see DatabaseBackend#toBackendInfos(List)
    */
   public static List /* <DatabaseBackend> */toDatabaseBackends(
-      List /* <BackendInfo> */backendInfos)
+      VirtualDatabase vdb, List /* <BackendInfo> */backendInfos)
   {
     if (backendInfos == null)
     {
@@ -230,7 +233,7 @@
     for (Iterator iter = backendInfos.iterator(); iter.hasNext();)
     {
       BackendInfo info = (BackendInfo) iter.next();
-      backends.add(info.getDatabaseBackend());
+      backends.add(info.getDatabaseBackend(vdb));
     }
     return backends;
   }
Index: 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/BackendStatus.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/BackendStatus.java:1.9
 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/BackendStatus.java:1.10
--- 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/BackendStatus.java:1.9
       Tue Aug  8 17:05:51 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/BackendStatus.java
   Thu Sep 21 16:26:28 2006
@@ -53,7 +53,7 @@
    * @param controllerId the sending controller identifier
    * @see org.continuent.sequoia.common.jmx.management.BackendInfo
    */
-  public BackendStatus(List/* <BackendInfo> */ backends, long controllerId)
+  public BackendStatus(List/* <BackendInfo> */backends, long controllerId)
   {
     backendList = backends;
     this.controllerId = controllerId;
@@ -64,7 +64,7 @@
    * 
    * @return a List&lt;BackendInfo&gt; of the remote controller BackendInfo
    */
-  public List/* <BackendInfo> */ getBackendInfos()
+  public List/* <BackendInfo> */getBackendInfos()
   {
     return backendList;
   }
@@ -98,7 +98,7 @@
       Object handleMessageSingleThreadedResult)
   {
     // Update backend list from sender
-    List remoteBackends = BackendInfo.toDatabaseBackends(backendList);
+    List remoteBackends = BackendInfo.toDatabaseBackends(dvdb, backendList);
     dvdb.addRemoteControllerId(sender, controllerId);
     dvdb.addBackendPerController(sender, remoteBackends);
     return new BackendStatus(
Index: 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/BackendTransfer.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/BackendTransfer.java:1.8
 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/BackendTransfer.java:1.9
--- 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/BackendTransfer.java:1.8
     Mon Aug 21 18:06:54 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/BackendTransfer.java
 Thu Sep 21 16:26:28 2006
@@ -109,7 +109,8 @@
     totalOrderQueue = dvdb.getTotalOrderQueue();
     if (totalOrderQueue == null)
       return new VirtualDatabaseException(Translate
-          .get("virtualdatabase.no.total.order.queue", 
dvdb.getVirtualDatabaseName()));
+          .get("virtualdatabase.no.total.order.queue", dvdb
+              .getVirtualDatabaseName()));
 
     synchronized (totalOrderQueue)
     {
@@ -143,7 +144,7 @@
     if (logger.isInfoEnabled())
       logger.info(dvdb.getControllerName()
           + ": Received transfer command. Checkpoint: " + getCheckpointName());
-    DatabaseBackend backend = new DatabaseBackend(info);
+    DatabaseBackend backend = new DatabaseBackend(dvdb, info);
 
     try
     {
Index: 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/CacheInvalidate.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/CacheInvalidate.java:1.5
 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/CacheInvalidate.java:1.6
--- 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/CacheInvalidate.java:1.5
     Wed Jan 25 12:11:27 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/CacheInvalidate.java
 Thu Sep 21 16:26:28 2006
@@ -74,7 +74,7 @@
     // Notify cache if any
     if (drm.getResultCache() != null)
     { // Update cache
-      drm.getResultCache().writeNotify((AbstractWriteRequest) request);
+      drm.getResultCache().writeNotify(request);
     }
     return null;
   }
Index: 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/NotifyDisableBackend.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/NotifyDisableBackend.java:1.3
 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/NotifyDisableBackend.java:1.4
--- 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/NotifyDisableBackend.java:1.3
        Mon Jan 23 02:57:05 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/NotifyDisableBackend.java
    Thu Sep 21 16:26:28 2006
@@ -28,7 +28,6 @@
 
 import org.continuent.hedera.common.Member;
 import org.continuent.sequoia.common.jmx.management.BackendInfo;
-import org.continuent.sequoia.controller.backend.DatabaseBackend;
 import 
org.continuent.sequoia.controller.virtualdatabase.DistributedVirtualDatabase;
 
 /**
@@ -54,16 +53,6 @@
   }
 
   /**
-   * Get the backend that needs to be disabled.
-   * 
-   * @return the backend to disable.
-   */
-  public DatabaseBackend getDatabaseBackend()
-  {
-    return backendInfo.getDatabaseBackend();
-  }
-
-  /**
    * @see 
org.continuent.sequoia.controller.virtualdatabase.protocol.DistributedVirtualDatabaseMessage#handleMessageSingleThreaded(org.continuent.sequoia.controller.virtualdatabase.DistributedVirtualDatabase,
    *      org.continuent.hedera.common.Member)
    */
@@ -81,7 +70,8 @@
       DistributedVirtualDatabase dvdb, Member sender,
       Object handleMessageSingleThreadedResult)
   {
-    dvdb.handleRemoteDisableBackendNotification(getDatabaseBackend(), sender);
+    dvdb.handleRemoteDisableBackendNotification(backendInfo
+        .getDatabaseBackend(dvdb), sender);
     return null;
   }
 
Index: 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/NotifyEnableBackend.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/NotifyEnableBackend.java:1.2
 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/NotifyEnableBackend.java:1.3
--- 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/NotifyEnableBackend.java:1.2
 Tue Feb 14 17:18:01 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/virtualdatabase/protocol/NotifyEnableBackend.java
     Thu Sep 21 16:26:28 2006
@@ -75,7 +75,7 @@
       remoteBackends = new ArrayList();
       dvdb.addBackendPerController(sender, remoteBackends);
     }
-    DatabaseBackend enabledBackend = backendInfo.getDatabaseBackend();
+    DatabaseBackend enabledBackend = backendInfo.getDatabaseBackend(dvdb);
     int size = remoteBackends.size();
     boolean backendFound = false;
     for (int i = 0; i < size; i++)