perfsonar development work

Author: yi
Date: 2006-12-01 11:21:38 -0500 (Fri, 01 Dec 2006)
New Revision: 1790

Modified:
   
branches/yi-udel/perfsonar/src/org/perfsonar/client/testHarness/LSTestClientScenario.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLookupAction.java
Log:


Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/client/testHarness/LSTestClientScenario.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/client/testHarness/LSTestClientScenario.java
   2006-12-01 13:20:50 UTC (rev 1789)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/client/testHarness/LSTestClientScenario.java
   2006-12-01 16:21:38 UTC (rev 1790)
@@ -15,7 +15,7 @@
 {
 
        static Vector<String> servers = new Vector<String> ();
-       static final int N = 128;
+       static final int N = 512;
        static String tmpFile = 
"schema/example-instances/sonar/LS/test/tmp.xml";
        
        public static void main(String[] args)
@@ -205,7 +205,9 @@
                        fw.write("              <xquery:subject 
id=\"sub\">\n");
                        fw.write("                      declare namespace 
nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";\n";);
                        fw.write("                      declare namespace 
nmwgt=\"http://ggf.org/ns/nmwg/topology/2.0/\";\n";);
-                       fw.write("                      let $collection := 
(collection (\"LSStore.dbxml\") | collection (\"LSCache.dbxml\"))\n");
+                       // use LSStore.dbxml only instead
+                       //fw.write("                    let $collection := 
(collection (\"LSStore.dbxml\") | collection (\"LSCache.dbxml\"))\n");
+                       fw.write("                      let $collection := 
collection (\"LSStore.dbxml\")\n");
                        fw.write("                      for $m in 
$collection/nmwg:metadata,\n");
                        fw.write("                      $d in 
$collection/nmwg:data\n");
                        fw.write("                      where 
$m/@id=$d/@metadataIdRef and contains ($d//nmwgt:hostName, \"." + hostName + 
"\")\n");

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLookupAction.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLookupAction.java
      2006-12-01 13:20:50 UTC (rev 1789)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLookupAction.java
      2006-12-01 16:21:38 UTC (rev 1790)
@@ -141,7 +141,6 @@
        
      
         // System.out.println("    LSq0,"+System.currentTimeMillis());
-        double startTime = new 
Long(System.currentTimeMillis()).doubleValue();
         if(xmlStorageManager instanceof ExistDbXmlrpcXmlStorageManager ||
           xmlStorageManager instanceof ExistDbHttpXmlStorageManager) {
             edbres = (XmlDbResult)xmlStorageManager.fetch(query); 
@@ -158,9 +157,6 @@
        
         //System.out.println("    LSq1," + System.currentTimeMillis());
         
-        Double endTime = new Long(System.currentTimeMillis()).doubleValue();
-        System.out.println("Actual Time Taken to Query: 
"+((endTime-startTime)/1000d)+" secs");
-        
         logger.debug("LSLookupAction: Got [[" + results.length + "]] results 
from DB");
         
         //TODO: if results.length==0 --> return error code or not?