perfsonar development work

Author: yi
Date: 2006-11-20 11:50:15 -0500 (Mon, 20 Nov 2006)
New Revision: 1768

Modified:
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
   
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSUtilities.java
Log:
improved I/O for reading BDB xquery

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
 2006-11-17 19:54:50 UTC (rev 1767)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSGlobalTokenAction.java
 2006-11-20 16:50:15 UTC (rev 1768)
@@ -2,12 +2,8 @@
 
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.ggf.ns.nmwg.base.v2_0.*;
-import org.ggf.ns.nmwg.base.v2_0.Message;
-import org.ggf.ns.nmwg.base.v2_0.Store;
 
 import org.perfsonar.commons.util.XMLUtils;
 import org.perfsonar.commons.util.MathUtil;
@@ -24,11 +20,7 @@
 import 
org.perfsonar.service.commons.storage.xmldb.exist.xmlrpc.ExistDbXmlrpcXmlStorageManager;
 import 
org.perfsonar.service.commons.storage.xmldb.exist.rest.ExistDbHttpXmlStorageManager;
 
-import org.perfsonar.commons.auxiliary.AuxiliaryComponent;
 import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.commons.auxiliary.ComponentNames;
-import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
-import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
 import org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler;
 
 /**
@@ -46,7 +38,7 @@
     /** 
      * allow replacement of items in the xmldb
      */     
-    private final static boolean DEFAULT_ALLOW_REPLACE = true;
+    //private final static boolean DEFAULT_ALLOW_REPLACE = true;
         
         
     /** 
@@ -67,7 +59,7 @@
     /**
      * allow the replacement of already registered data
      */        
-    private boolean allowReplaceIfAlreadyRegistered = DEFAULT_ALLOW_REPLACE;
+    //private boolean allowReplaceIfAlreadyRegistered = 
DEFAULT_ALLOW_REPLACE;
 
            
     /**
@@ -119,7 +111,7 @@
        
        Collection metadataCol = null;
        String[][] sortedList = null;                   
-       int c = 0, d = 0;               
+       int c = 0;              
                        
         logger.debug("LSGlobalTokenAction: LS Token - action started");
                   

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
  2006-11-17 19:54:50 UTC (rev 1767)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSLocalTokenAction.java
  2006-11-20 16:50:15 UTC (rev 1768)
@@ -2,12 +2,8 @@
 
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.ggf.ns.nmwg.base.v2_0.*;
-import org.ggf.ns.nmwg.base.v2_0.Message;
-import org.ggf.ns.nmwg.base.v2_0.Store;
 
 import org.perfsonar.commons.util.XMLUtils;
 import org.perfsonar.commons.util.MathUtil;
@@ -24,11 +20,7 @@
 import 
org.perfsonar.service.commons.storage.xmldb.exist.xmlrpc.ExistDbXmlrpcXmlStorageManager;
 import 
org.perfsonar.service.commons.storage.xmldb.exist.rest.ExistDbHttpXmlStorageManager;
 
-import org.perfsonar.commons.auxiliary.AuxiliaryComponent;
 import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.commons.auxiliary.ComponentNames;
-import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
-import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
 import org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler;
 
 /**
@@ -46,7 +38,7 @@
     /** 
      * allow replacement of items in the xmldb
      */     
-    private final static boolean DEFAULT_ALLOW_REPLACE = true;
+    //private final static boolean DEFAULT_ALLOW_REPLACE = true;
         
         
     /** 
@@ -67,7 +59,7 @@
     /**
      * allow the replacement of already registered data
      */        
-    private boolean allowReplaceIfAlreadyRegistered = DEFAULT_ALLOW_REPLACE;
+    //private boolean allowReplaceIfAlreadyRegistered = 
DEFAULT_ALLOW_REPLACE;
 
            
     /**
@@ -119,7 +111,7 @@
        
        Collection metadataCol = null;
        String[][] sortedList = null;                   
-       int c = 0, d = 0;               
+       int c = 0;              
                        
         logger.debug("LSLocalTokenAction: LS Token - action started");
                   

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
   2006-11-17 19:54:50 UTC (rev 1767)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSSummary.java
   2006-11-20 16:50:15 UTC (rev 1768)
@@ -1,7 +1,6 @@
 package org.perfsonar.service.lookupService.xmlType;
 
 import org.ggf.ns.nmwg.base.v2_0.Message;
-import org.ggf.ns.nmwg.base.v2_0.Store;
 import org.ggf.ns.nmwg.base.v2_0.Metadata;
 import org.ggf.ns.nmwg.base.v2_0.Data;
 
@@ -17,19 +16,13 @@
 
 import org.perfsonar.service.commons.storage.StorageManager;
 import org.perfsonar.service.commons.storage.xmldb.XmlDbResult;
-import org.perfsonar.service.commons.storage.xmldb.XmlDbDataRepository;
 import org.perfsonar.service.commons.storage.xmldb.XmlDbStorageManager;
-import org.perfsonar.service.commons.storage.xmldb.exist.ExistDbFactory;
-import org.perfsonar.service.commons.storage.xmldb.XmlDbConstants;
-import 
org.perfsonar.service.commons.storage.xmldb.exist.rest.ExistDbHTTPAccess;
 import 
org.perfsonar.service.commons.storage.xmldb.bdbxml.BerkeleyDbXmlStorageManager;
 import 
org.perfsonar.service.commons.storage.xmldb.exist.xmlrpc.ExistDbXmlrpcXmlStorageManager;
 import 
org.perfsonar.service.commons.storage.xmldb.exist.rest.ExistDbHttpXmlStorageManager;
 
 import java.io.FileReader;
-import java.io.IOException;
 import java.io.File;
-import java.util.ArrayList;
 import java.lang.String;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -199,13 +192,14 @@
                logger.debug("LSSummary: XQuery Starting...");
                
                try {
-                       // TODO: any better ways to read a query string from 
a file?
                        query = "";
+                       
+                       // query is not that long, so reading one time is 
enough
+                       char[] chars = new char[4096];
                        FileReader inputStream = new 
FileReader(getSummaryXQuery());
-                       int ch;
-                       while ((ch = inputStream.read()) != -1)
-                               query += (char)ch;
+                       inputStream.read(chars);
                        inputStream.close();
+                       query += String.valueOf(chars).trim();
                        
                        edbres = (XmlDbResult)xmlStorageManager.fetch(query); 
                        results = (String[])edbres.getResultAsStringArray();

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
    2006-11-17 19:54:50 UTC (rev 1767)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSTokenUtilities.java
    2006-11-20 16:50:15 UTC (rev 1768)
@@ -7,7 +7,6 @@
 
 import org.ggf.ns.nmwg.base.v2_0.*;
 import org.ggf.ns.nmwg.base.v2_0.Message;
-import org.ggf.ns.nmwg.base.v2_0.Store;
 
 import org.perfsonar.commons.util.XMLUtils;
 import org.perfsonar.commons.util.MathUtil;
@@ -15,7 +14,6 @@
 import org.perfsonar.service.commons.exceptions.DataFormatException;
 import org.perfsonar.service.commons.exceptions.RequestException;
 import org.perfsonar.service.commons.exceptions.SystemException;
-import org.perfsonar.service.commons.exceptions.PerfSONARException;
 
 import org.perfsonar.service.commons.storage.StorageManager;
 import org.perfsonar.service.commons.storage.xmldb.XmlDbResult;
@@ -23,13 +21,8 @@
 import 
org.perfsonar.service.commons.storage.xmldb.exist.xmlrpc.ExistDbXmlrpcXmlStorageManager;
 import 
org.perfsonar.service.commons.storage.xmldb.exist.rest.ExistDbHttpXmlStorageManager;
 
-import 
org.perfsonar.commons.auxiliary.components.simplescheduler.SchedulerAction;
-import org.perfsonar.commons.auxiliary.AuxiliaryComponent;
-import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
-import org.perfsonar.commons.auxiliary.ComponentNames;
 import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
 import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
-import org.perfsonar.commons.auxiliary.components.simplescheduler.Scheduler;
 
 import java.net.URL;
 import java.util.Vector;
@@ -40,14 +33,10 @@
 import org.w3c.dom.Document;
 
 import java.io.FileReader;
-import java.io.IOException;
 import java.io.File;
-import java.util.ArrayList;
 import java.lang.String;
 import java.io.StringReader;
 import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Iterator;
 
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
@@ -64,24 +53,20 @@
  */
 public class LSTokenUtilities {
 
-    private final String LS_STORE_COLLECTION_TYPE = "LSStore";
     private final String LS_CACHE_COLLECTION_TYPE = "LSCache";
-    private final String LS_STORE_CONTROL_COLLECTION_TYPE = 
"LSStore-control";
     private final String LS_LOCAL_PEER_COLLECTION_TYPE = "LSLocalPeers";
     private final String LS_GLOBAL_PEER_COLLECTION_TYPE = "LSGlobalPeers";   
 
-    private final String LS_STORE_CONTAINER = LS_STORE_COLLECTION_TYPE + 
".dbxml";
-    private final String LS_CACHE_CONTAINER = LS_CACHE_COLLECTION_TYPE + 
".dbxml";
-    private final String LS_STORE_CONTROL_CONTAINER = 
LS_STORE_CONTROL_COLLECTION_TYPE + ".dbxml";
+    private final String LS_STORE_CONTROL_CONTAINER = 
LS_CACHE_COLLECTION_TYPE + ".dbxml";
     private final String LS_LOCAL_PEER_CONTAINER = 
LS_LOCAL_PEER_COLLECTION_TYPE + ".dbxml";
     private final String LS_GLOBAL_PEER_CONTAINER = 
LS_GLOBAL_PEER_COLLECTION_TYPE + ".dbxml";    
         
     private final String XQUERY_UPDATE_DECLARE = "declare " +
         "namespace nmwg=\"http://ggf.org/ns/nmwg/base/2.0/\";; ";
     private final String XQUERY_UPDATE_INSERT = "update insert ";
-    private final String XQUERY_UPDATE_REPLACE = "update replace ";
+    //private final String XQUERY_UPDATE_REPLACE = "update replace ";
     private final String XQUERY_UPDATE_VALUE = "update value ";
-    private final String XQUERY_UPDATE_DELETE = "update delete ";
-    private final String XQUERY_UPDATE_RENAME = "update rename ";
+    //private final String XQUERY_UPDATE_DELETE = "update delete ";
+    //private final String XQUERY_UPDATE_RENAME = "update rename ";
   
     /**
      *  The object to log control/debugging messages
@@ -364,7 +349,7 @@
        
         Collection metadataCol = null;
         String[][] sortedList = null;                   
-        int c = 0, d = 0;      
+        //int c = 0, d = 0;    
 
         //get the contents of LS(Local|Global)Peers   
         if(xmlStorageManager instanceof ExistDbXmlrpcXmlStorageManager ||
@@ -420,7 +405,7 @@
             results = (String[])edbres.getResultAsStringArray();
         }
         else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager) {
-            query = XQUERY_UPDATE_DECLARE + "collection(\"" + 
LS_CACHE_COLLECTION_TYPE + 
+            query = XQUERY_UPDATE_DECLARE + "collection(\"" + 
LS_STORE_CONTROL_CONTAINER + 
                    
"\")/nmwg:metadata[@id=\""
 + lsUtil.getLsAccessPoint() + "\"]";
             edbres = (XmlDbResult)xmlStorageManager.fetch(query); 
             results = (String[])edbres.getResultAsStringArray();
@@ -448,7 +433,7 @@
             results = (String[])edbres.getResultAsStringArray();
         }
         else if(xmlStorageManager instanceof BerkeleyDbXmlStorageManager) {
-            query = XQUERY_UPDATE_DECLARE + "collection(\"" + 
LS_CACHE_COLLECTION_TYPE + 
+            query = XQUERY_UPDATE_DECLARE + "collection(\"" + 
LS_STORE_CONTROL_CONTAINER + 
                    
"\")/nmwg:data[@metadataIdRef=\""
 + lsUtil.getLsAccessPoint() + "\"]";
             edbres = (XmlDbResult)xmlStorageManager.fetch(query); 
             results = (String[])edbres.getResultAsStringArray();
@@ -815,7 +800,7 @@
        
         Collection metadataCol = null;
         String[][] sortedList = null;                   
-        int c = 0, d = 0;      
+        //int c = 0, d = 0;    
 
         //get the contents of LSGlobal Peers           
         if(xmlStorageManager instanceof ExistDbXmlrpcXmlStorageManager ||
@@ -864,14 +849,15 @@
                logger.debug("LSTokenUtilities: XQuery Starting...");
                
                try {
-                       // TODO: any better ways to read a query string from 
a file?
                        query = "";
+                       
+                       // query is not that long, so reading one time is 
enough
+                       char[] chars = new char[4096];
                        FileReader inputStream = new 
FileReader(getSummaryXQuery());
-                       int ch;
-                       while ((ch = inputStream.read()) != -1)
-                               query += (char)ch;
+                       inputStream.read(chars);
                        inputStream.close();
-                       
+                       query += String.valueOf(chars).trim();
+                       
                        edbres = (XmlDbResult)xmlStorageManager.fetch(query); 
                        results = (String[])edbres.getResultAsStringArray();
                }

Modified: 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSUtilities.java
===================================================================
--- 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSUtilities.java
 2006-11-17 19:54:50 UTC (rev 1767)
+++ 
branches/yi-udel/perfsonar/src/org/perfsonar/service/lookupService/xmlType/LSUtilities.java
 2006-11-20 16:50:15 UTC (rev 1768)
@@ -1,41 +1,19 @@
 package org.perfsonar.service.lookupService.xmlType;
 
-import org.ggf.ns.nmwg.base.v2_0.Message;
-import org.ggf.ns.nmwg.base.v2_0.Store;
-import org.ggf.ns.nmwg.base.v2_0.Metadata;
-import org.ggf.ns.nmwg.base.v2_0.Data;
-
 import 
org.perfsonar.commons.auxiliary.components.configuration.ConfigurationComponent;
 import org.perfsonar.commons.auxiliary.components.logger.LoggerComponent;
 import org.perfsonar.commons.auxiliary.AuxiliaryComponentManager;
 import org.perfsonar.commons.auxiliary.ComponentNames;
 
 import org.perfsonar.commons.util.XMLUtils;
-import org.perfsonar.commons.util.MathUtil;
 
 import org.perfsonar.service.commons.exceptions.DataFormatException;
-import org.perfsonar.service.commons.exceptions.PerfSONARException;
 import org.perfsonar.service.commons.exceptions.RequestException;
 import org.perfsonar.service.commons.exceptions.SystemException;
 
 import org.perfsonar.service.commons.storage.StorageManager;
 import org.perfsonar.service.commons.storage.xmldb.XmlDbResult;
-import org.perfsonar.service.commons.storage.xmldb.XmlDbDataRepository;
-import org.perfsonar.service.commons.storage.xmldb.XmlDbStorageManager;
-import org.perfsonar.service.commons.storage.xmldb.exist.ExistDbFactory;
-import org.perfsonar.service.commons.storage.xmldb.XmlDbConstants;
-import 
org.perfsonar.service.commons.storage.xmldb.exist.rest.ExistDbHTTPAccess;
-import 
org.perfsonar.service.commons.storage.xmldb.exist.rest.ExistDbHttpXmlStorageManager;
 
-import java.io.IOException;
-import java.io.File;
-import java.util.ArrayList;
-import java.lang.String;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Collection;
-import java.util.Iterator;
-
 /**
  * Action that summarizes database content
  * @author Maciej Glowiak
@@ -395,7 +373,7 @@
      */
     public String[] getDBContents(StorageManager xmlStorageManager, String 
query) throws 
         SystemException, RequestException, DataFormatException {
-        String output = null;
+        //String output = null;
         String[] results;
      
         query = XMLUtils.convertEntitiesToCharacters(query);