Updated llmessage

7 files changed, 71 insertions, 32 deletions

diff --git a/linden/indra/lib/python/indra/ipc/llsdhttp.py b/linden/indra/lib/python/indra/ipc/llsdhttp.py
index 1cf1146..ed64899 100644
--- a/linden/indra/lib/python/indra/ipc/llsdhttp.py
+++ b/linden/indra/lib/python/indra/ipc/llsdhttp.py
@@ -51,6 +51,8 @@ request_ = suite.request_
 # import every httpc error exception into our namespace for convenience
 for x in httpc.status_to_error_map.itervalues():
     globals()[x.__name__] = x
+ConnectionError = httpc.ConnectionError
+Retriable = httpc.Retriable
 
 for x in (httpc.ConnectionError,):
     globals()[x.__name__] = x
diff --git a/linden/indra/lib/python/indra/ipc/mysql_pool.py b/linden/indra/lib/python/indra/ipc/mysql_pool.py
index 507b185..25a66cf 100644
--- a/linden/indra/lib/python/indra/ipc/mysql_pool.py
+++ b/linden/indra/lib/python/indra/ipc/mysql_pool.py
@@ -30,8 +30,10 @@ import MySQLdb
 from eventlet import db_pool
 
 class DatabaseConnector(db_pool.DatabaseConnector):
-    def __init__(self, credentials, min_size = 0, max_size = 4, *args, **kwargs):
-        super(DatabaseConnector, self).__init__(MySQLdb, credentials, min_size, max_size, conn_pool=db_pool.ConnectionPool, *args, **kwargs)
+    def __init__(self, credentials, *args, **kwargs):
+        super(DatabaseConnector, self).__init__(MySQLdb, credentials,
+                                                conn_pool=db_pool.ConnectionPool,
+                                                *args, **kwargs)
 
     # get is extended relative to eventlet.db_pool to accept a port argument
     def get(self, host, dbname, port=3306):
@@ -42,7 +44,7 @@ class DatabaseConnector(db_pool.DatabaseConnector):
             new_kwargs['host'] = host
             new_kwargs['port'] = port
             new_kwargs.update(self.credentials_for(host))
-            dbpool = ConnectionPool(self._min_size, self._max_size, *self._args, **new_kwargs)
+            dbpool = ConnectionPool(*self._args, **new_kwargs)
             self._databases[key] = dbpool
 
         return self._databases[key]
@@ -51,8 +53,8 @@ class ConnectionPool(db_pool.TpooledConnectionPool):
     """A pool which gives out saranwrapped MySQLdb connections from a pool
     """
 
-    def __init__(self, min_size = 0, max_size = 4, *args, **kwargs):
-        super(ConnectionPool, self).__init__(MySQLdb, min_size, max_size, *args, **kwargs)
+    def __init__(self, *args, **kwargs):
+        super(ConnectionPool, self).__init__(MySQLdb, *args, **kwargs)
 
     def get(self):
         conn = super(ConnectionPool, self).get()
@@ -77,14 +79,3 @@ class ConnectionPool(db_pool.TpooledConnectionPool):
         conn.connection_parameters = converted_kwargs
         return conn
 
-    def clear(self):
-        """ Close all connections that this pool still holds a reference to, leaving it empty."""
-        for conn in self.free_items:
-            try:
-                conn.close()
-            except:
-                pass   # even if stuff happens here, we still want to at least try to close all the other connections
-        self.free_items.clear()
-            
-    def __del__(self):
-        self.clear()
diff --git a/linden/indra/lib/python/indra/ipc/servicebuilder.py b/linden/indra/lib/python/indra/ipc/servicebuilder.py
index 89cdfad..01f2c6f 100644
--- a/linden/indra/lib/python/indra/ipc/servicebuilder.py
+++ b/linden/indra/lib/python/indra/ipc/servicebuilder.py
@@ -51,12 +51,10 @@ def build(name, context={}, **kwargs):
      > servicebuilder.build('version-manager-version', context, version='1.18.1.2')
        'http://int.util.vaak.lindenlab.com/channel/Second%20Life%20Release/1.18.1.2'
     """
-    context = context.copy()  # shouldn't modify the caller's dictionary
-    context.update(kwargs)
     global _g_builder
     if _g_builder is None:
         _g_builder = ServiceBuilder()
-    return _g_builder.buildServiceURL(name, context)
+    return _g_builder.buildServiceURL(name, context, **kwargs)
 
 class ServiceBuilder(object):
     def __init__(self, services_definition = services_config):
@@ -81,13 +79,36 @@ class ServiceBuilder(object):
             else:
                 self.builders[service['name']] = service_builder
 
-    def buildServiceURL(self, name, context):
+    def buildServiceURL(self, name, context={}, **kwargs):
         """\
         @brief given the environment on construction, return a service URL.
         @param name The name of the service.
         @param context A dict of name value lookups for the service.
+        @param kwargs Any keyword arguments are treated as members of the
+            context, this allows you to be all 31337 by writing shit like:
+            servicebuilder.build('name', param=value)
         @returns Returns the 
         """
+        context = context.copy()  # shouldn't modify the caller's dictionary
+        context.update(kwargs)
         base_url = config.get('services-base-url')
         svc_path = russ.format(self.builders[name], context)
         return base_url + svc_path
+
+
+def on_in(query_name, host_key, schema_key):
+    """\
+    @brief Constructs an on/in snippet (for running named queries)
+    from a schema name and two keys referencing values stored in
+    indra.xml.
+
+    @param query_name Name of the query.
+    @param host_key Logical name of destination host.  Will be
+        looked up in indra.xml.
+    @param schema_key Logical name of destination schema.  Will
+        be looked up in indra.xml.
+    """
+    host_name = config.get(host_key)
+    schema_name = config.get(schema_key)
+    return '/'.join( ('on', host_name, 'in', schema_name, query_name.lstrip('/')) )
+
diff --git a/linden/indra/lib/python/indra/ipc/siesta.py b/linden/indra/lib/python/indra/ipc/siesta.py
index 5fbea29..b206f18 100644
--- a/linden/indra/lib/python/indra/ipc/siesta.py
+++ b/linden/indra/lib/python/indra/ipc/siesta.py
@@ -24,9 +24,9 @@ except ImportError:
 
 llsd_parsers = {
     'application/json': json_decode,
-    'application/llsd+binary': llsd.parse_binary,
+    llsd.BINARY_MIME_TYPE: llsd.parse_binary,
     'application/llsd+notation': llsd.parse_notation,
-    'application/llsd+xml': llsd.parse_xml,
+    llsd.XML_MIME_TYPE: llsd.parse_xml,
     'application/xml': llsd.parse_xml,
     }
 
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py
index 4675177..a00d242 100644
--- a/linden/indra/lib/python/indra/util/llmanifest.py
+++ b/linden/indra/lib/python/indra/util/llmanifest.py
@@ -584,7 +584,7 @@ class LLManifest(object):
 
     def wildcard_regex(self, src_glob, dst_glob):
         src_re = re.escape(src_glob)
-        src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]+)')
+        src_re = src_re.replace('\*', '([-a-zA-Z0-9._ ]*)')
         dst_temp = dst_glob
         i = 1
         while dst_temp.count("*") > 0:
@@ -621,6 +621,7 @@ class LLManifest(object):
             count = 0
             if self.wildcard_pattern.search(src):
                 for s,d in self.expand_globs(src, dst):
+                    assert(s != d)
                     count += self.process_file(s, d)
             else:
                 # if we're specifying a single path (not a glob),
diff --git a/linden/indra/lib/python/indra/util/llversion.py b/linden/indra/lib/python/indra/util/llversion.py
index 666cce4..fe9448f 100644
--- a/linden/indra/lib/python/indra/util/llversion.py
+++ b/linden/indra/lib/python/indra/util/llversion.py
@@ -50,7 +50,10 @@ def get_version(version_type):
     m = re.search('const S32 IMP_VERSION_MINOR = (\d+);', file_str)
     VER_MINOR = m.group(1)
     m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', file_str)
-    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s" % locals()
+    VER_PATCH = m.group(1)
+    m = re.search('const S32 IMP_VERSION_TEST = (\d+);', file_str)
+    VER_BUILD = m.group(1)
+    version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s.%(VER_TEST)s" % locals()
     return version
 
 def get_channel(version_type):
diff --git a/linden/indra/lib/python/indra/util/named_query.py b/linden/indra/lib/python/indra/util/named_query.py
index 20f2ec7..788fb0e 100644
--- a/linden/indra/lib/python/indra/util/named_query.py
+++ b/linden/indra/lib/python/indra/util/named_query.py
@@ -47,6 +47,8 @@ except NameError:
 from indra.base import llsd
 from indra.base import config
 
+DEBUG = False
+
 NQ_FILE_SUFFIX = config.get('named-query-file-suffix', '.nq')
 NQ_FILE_SUFFIX_LEN  = len(NQ_FILE_SUFFIX)
 
@@ -63,7 +65,9 @@ def _init_g_named_manager(sql_dir = None):
 
     # extra fallback directory in case config doesn't return what we want
     if sql_dir is None:
-        sql_dir = os.path.dirname(__file__) + "../../../../web/dataservice/sql"
+        sql_dir = os.path.abspath(
+            os.path.join(
+            os.path.realpath(os.path.dirname(__file__)), "..", "..", "..", "..", "web", "dataservice", "sql"))
 
     global _g_named_manager
     _g_named_manager = NamedQueryManager(
@@ -103,11 +107,12 @@ class NamedQuery(object):
     def __init__(self, name, filename):
         """ Construct a NamedQuery object.  The name argument is an
         arbitrary name as a handle for the query, and the filename is
-        a path to a file containing an llsd named query document."""
+        a path to a file or a file-like object containing an llsd named
+        query document."""
         self._stat_interval_seconds = 5  # 5 seconds
         self._name = name
-        if (filename is not None) \
-                and (NQ_FILE_SUFFIX != filename[-NQ_FILE_SUFFIX_LEN:]):
+        if (filename is not None and isinstance(filename, (str, unicode))
+            and NQ_FILE_SUFFIX != filename[-NQ_FILE_SUFFIX_LEN:]):
             filename = filename + NQ_FILE_SUFFIX
         self._location = filename
         self._alternative = dict()
@@ -122,8 +127,8 @@ class NamedQuery(object):
 
     def get_modtime(self):
         """ Returns the mtime (last modified time) of the named query
-        file, if such exists."""
-        if self._location:
+        filename. For file-like objects, expect a modtime of 0"""
+        if self._location and isinstance(self._location, (str, unicode)):
             return os.path.getmtime(self._location)
         return 0
 
@@ -131,7 +136,12 @@ class NamedQuery(object):
         """ Loads and parses the named query file into self.  Does
         nothing if self.location is nonexistant."""
         if self._location:
-            self._reference_contents(llsd.parse(open(self._location).read()))
+            if isinstance(self._location, (str, unicode)):
+                contents = llsd.parse(open(self._location).read())
+            else:
+                # we probably have a file-like object. Godspeed!
+                contents = llsd.parse(self._location.read())
+            self._reference_contents(contents)
             # Check for alternative implementations
             try:
                 for name, alt in self._contents['alternative'].items():
@@ -182,6 +192,16 @@ class NamedQuery(object):
         ready them for use in LIKE statements"""
         if sql:
             #print >>sys.stderr, "sql:",sql
+            
+            # This first sub is to properly escape any % signs that
+            # are meant to be literally passed through to mysql in the
+            # query.  It leaves any %'s that are used for
+            # like-expressions.
+            expr = re.compile("(?<=[^a-zA-Z0-9_-])%(?=[^:])")
+            sql = expr.sub('%%', sql)
+
+            # This should tackle the rest of the %'s in the query, by
+            # converting them to LIKE clauses.
             expr = re.compile("(%?):([a-zA-Z][a-zA-Z0-9_-]*)%")
             sql = expr.sub(self._prepare_like, sql)
             expr = re.compile("#:([a-zA-Z][a-zA-Z0-9_-]*)")
@@ -333,7 +353,8 @@ class NamedQuery(object):
             cursor = connection.cursor()
         
         statement = self.sql(connection, params)
-        #print "SQL:", statement
+        if DEBUG:
+            print "SQL:", statement
         rows = cursor.execute(statement)
         
         # *NOTE: the expect_rows argument is a very cheesy way to get some