CVS update of sequoia/src/org/continuent/sequoia/controller (3 files)

    Date: Friday, September 22, 2006 @ 15:16:47
  Author: emmanuel
    Path: /cvsroot/sequoia/sequoia/src/org/continuent/sequoia/controller

Modified: cache/parsing/ParsingCache.java (1.8 -> 1.9)
          loadbalancer/BackendTaskQueues.java (1.132 -> 1.133)
          requestmanager/RequestManager.java (1.167 -> 1.168)

Set the semantic manager on the request before calling parse()
Relates to SEQUOIA-791


-------------------------------------+
 cache/parsing/ParsingCache.java     |    1 +
 loadbalancer/BackendTaskQueues.java |    8 ++++++--
 requestmanager/RequestManager.java  |   11 +++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)


Index: 
sequoia/src/org/continuent/sequoia/controller/cache/parsing/ParsingCache.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/cache/parsing/ParsingCache.java:1.8
 
sequoia/src/org/continuent/sequoia/controller/cache/parsing/ParsingCache.java:1.9
--- 
sequoia/src/org/continuent/sequoia/controller/cache/parsing/ParsingCache.java:1.8
   Thu Sep 21 16:17:17 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/cache/parsing/ParsingCache.java   
    Fri Sep 22 15:16:47 2006
@@ -203,6 +203,7 @@
 
       // Check if there is a semantic information for this request
       SemanticBehavior semantic = semanticManager.getRequestSemantic(request);
+      request.setSemanticManager(semanticManager);
       if (semantic != null)
       {
         request.setSemantic(semantic);
Index: 
sequoia/src/org/continuent/sequoia/controller/loadbalancer/BackendTaskQueues.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/loadbalancer/BackendTaskQueues.java:1.132
 
sequoia/src/org/continuent/sequoia/controller/loadbalancer/BackendTaskQueues.java:1.133
--- 
sequoia/src/org/continuent/sequoia/controller/loadbalancer/BackendTaskQueues.java:1.132
     Thu Sep 21 16:20:52 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/loadbalancer/BackendTaskQueues.java
   Fri Sep 22 15:16:47 2006
@@ -50,6 +50,7 @@
 import org.continuent.sequoia.controller.requests.SelectRequest;
 import org.continuent.sequoia.controller.requests.StoredProcedure;
 import org.continuent.sequoia.controller.semantic.SemanticBehavior;
+import org.continuent.sequoia.controller.semantic.SemanticManager;
 import org.continuent.sequoia.controller.virtualdatabase.VirtualDatabase;
 
 /**
@@ -821,9 +822,12 @@
         {
           if (!request.isParsed())
           {
+            SemanticManager semanticManager = requestManager
+                .getVirtualDatabase().getSemanticManager();
             // Check if there is semantic information
-            SemanticBehavior semantic = requestManager.getVirtualDatabase()
-                .getSemanticManager().getRequestSemantic(request);
+            SemanticBehavior semantic = semanticManager
+                .getRequestSemantic(request);
+            request.setSemanticManager(semanticManager);
             if (semantic != null)
               request.setSemantic(semantic);
             else
Index: 
sequoia/src/org/continuent/sequoia/controller/requestmanager/RequestManager.java
diff -u 
sequoia/src/org/continuent/sequoia/controller/requestmanager/RequestManager.java:1.167
 
sequoia/src/org/continuent/sequoia/controller/requestmanager/RequestManager.java:1.168
--- 
sequoia/src/org/continuent/sequoia/controller/requestmanager/RequestManager.java:1.167
      Thu Sep 21 16:20:52 2006
+++ 
sequoia/src/org/continuent/sequoia/controller/requestmanager/RequestManager.java
    Fri Sep 22 15:16:47 2006
@@ -87,6 +87,7 @@
 import org.continuent.sequoia.controller.requests.UpdateRequest;
 import org.continuent.sequoia.controller.scheduler.AbstractScheduler;
 import org.continuent.sequoia.controller.semantic.SemanticBehavior;
+import org.continuent.sequoia.controller.semantic.SemanticManager;
 import org.continuent.sequoia.controller.virtualdatabase.VirtualDatabase;
 import 
org.continuent.sequoia.controller.virtualdatabase.VirtualDatabaseWorkerThread;
 import 
org.continuent.sequoia.controller.virtualdatabase.protocol.DistributedCommit;
@@ -357,9 +358,10 @@
     {
       if (parsingCache == null)
       {
+        SemanticManager semanticManager = vdb.getSemanticManager();
         // Check if there is semantic information
-        SemanticBehavior semantic = vdb.getSemanticManager()
-            .getRequestSemantic(request);
+        SemanticBehavior semantic = 
semanticManager.getRequestSemantic(request);
+        request.setSemanticManager(semanticManager);
         if (semantic != null)
           request.setSemantic(semantic);
         else
@@ -3501,8 +3503,9 @@
     try
     {
       // Check if there is semantic information
-      SemanticBehavior semantic = vdb.getSemanticManager().getRequestSemantic(
-          request);
+      SemanticManager semanticManager = vdb.getSemanticManager();
+      SemanticBehavior semantic = semanticManager.getRequestSemantic(request);
+      request.setSemanticManager(semanticManager);
       if (semantic != null)
         request.setSemantic(semantic);
       else