[CalendarServer-changes] [11835] CalendarServer/branches/users/cdaboo/performance-tweaks

[source_changes at macosforge.org]

Revision: 11835
          http://trac.calendarserver.org//changeset/11835
Author:   cdaboo at apple.com
Date:     2013-10-28 10:47:30 -0700 (Mon, 28 Oct 2013)
Log Message:
-----------
Merge from trunk.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/performance-tweaks/conf/auth/accounts-test.xml
    CalendarServer/branches/users/cdaboo/performance-tweaks/twext/enterprise/dal/syntax.py
    CalendarServer/branches/users/cdaboo/performance-tweaks/twext/enterprise/dal/test/test_sqlsyntax.py
    CalendarServer/branches/users/cdaboo/performance-tweaks/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/cdaboo/performance-tweaks/conf/auth/accounts-test.xml
===================================================================
--- CalendarServer/branches/users/cdaboo/performance-tweaks/conf/auth/accounts-test.xml	2013-10-28 17:21:24 UTC (rev 11834)
+++ CalendarServer/branches/users/cdaboo/performance-tweaks/conf/auth/accounts-test.xml	2013-10-28 17:47:30 UTC (rev 11835)
@@ -89,7 +89,7 @@
     <first-name>ま</first-name>
     <last-name>だ</last-name>
   </user>
-  <user repeat="99">
+  <user repeat="101">
     <uid>user%02d</uid>
     <uid>User %02d</uid>
     <guid>user%02d</guid>

Modified: CalendarServer/branches/users/cdaboo/performance-tweaks/twext/enterprise/dal/syntax.py
===================================================================
--- CalendarServer/branches/users/cdaboo/performance-tweaks/twext/enterprise/dal/syntax.py	2013-10-28 17:21:24 UTC (rev 11834)
+++ CalendarServer/branches/users/cdaboo/performance-tweaks/twext/enterprise/dal/syntax.py	2013-10-28 17:47:30 UTC (rev 11835)
@@ -1686,7 +1686,46 @@
             SQLFragment(' in %s mode' % (self.mode,)))
 
 
+class DatabaseLock(_LockingStatement):
+    """
+    An SQL exclusive session level advisory lock
+    """
 
+    def _toSQL(self, queryGenerator):
+        assert(queryGenerator.dialect == POSTGRES_DIALECT)
+        return SQLFragment('select pg_advisory_lock(1)')
+
+
+    def on(self, txn, *a, **kw):
+        """
+        Override on() to only execute on Postgres
+        """
+        if txn.dialect == POSTGRES_DIALECT:
+            return super(DatabaseLock, self).on(txn, *a, **kw)
+
+        return succeed(None)
+
+
+class DatabaseUnlock(_LockingStatement):
+    """
+    An SQL exclusive session level advisory lock
+    """
+
+    def _toSQL(self, queryGenerator):
+        assert(queryGenerator.dialect == POSTGRES_DIALECT)
+        return SQLFragment('select pg_advisory_unlock(1)')
+
+
+    def on(self, txn, *a, **kw):
+        """
+        Override on() to only execute on Postgres
+        """
+        if txn.dialect == POSTGRES_DIALECT:
+            return super(DatabaseUnlock, self).on(txn, *a, **kw)
+
+        return succeed(None)
+
+
 class Savepoint(_LockingStatement):
     """
     An SQL 'savepoint' statement.

Modified: CalendarServer/branches/users/cdaboo/performance-tweaks/twext/enterprise/dal/test/test_sqlsyntax.py
===================================================================
--- CalendarServer/branches/users/cdaboo/performance-tweaks/twext/enterprise/dal/test/test_sqlsyntax.py	2013-10-28 17:21:24 UTC (rev 11834)
+++ CalendarServer/branches/users/cdaboo/performance-tweaks/twext/enterprise/dal/test/test_sqlsyntax.py	2013-10-28 17:47:30 UTC (rev 11835)
@@ -25,7 +25,8 @@
     TableMismatch, Parameter, Max, Len, NotEnoughValues,
     Savepoint, RollbackToSavepoint, ReleaseSavepoint, SavepointAction,
     Union, Intersect, Except, SetExpression, DALError,
-    ResultAliasSyntax, Count, QueryGenerator, ALL_COLUMNS)
+    ResultAliasSyntax, Count, QueryGenerator, ALL_COLUMNS,
+    DatabaseLock, DatabaseUnlock)
 from twext.enterprise.dal.syntax import FixedPlaceholder, NumericPlaceholder
 from twext.enterprise.dal.syntax import Function
 from twext.enterprise.dal.syntax import SchemaSyntax
@@ -1314,6 +1315,22 @@
                           SQLFragment("lock table FOO in exclusive mode"))
 
 
+    def test_databaseLock(self):
+        """
+        L{DatabaseLock} generates a ('pg_advisory_lock') statement
+        """
+        self.assertEquals(DatabaseLock().toSQL(),
+                          SQLFragment("select pg_advisory_lock(1)"))
+
+
+    def test_databaseUnlock(self):
+        """
+        L{DatabaseUnlock} generates a ('pg_advisory_unlock') statement
+        """
+        self.assertEquals(DatabaseUnlock().toSQL(),
+                          SQLFragment("select pg_advisory_unlock(1)"))
+
+
     def test_savepoint(self):
         """
         L{Savepoint} generates a ('savepoint') statement.

Modified: CalendarServer/branches/users/cdaboo/performance-tweaks/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/cdaboo/performance-tweaks/txdav/common/datastore/sql.py	2013-10-28 17:21:24 UTC (rev 11834)
+++ CalendarServer/branches/users/cdaboo/performance-tweaks/txdav/common/datastore/sql.py	2013-10-28 17:47:30 UTC (rev 11835)
@@ -29,9 +29,10 @@
 
 from pycalendar.datetime import PyCalendarDateTime
 
-from twext.enterprise.dal.syntax import \
-    Delete, utcNowSQL, Union, Insert, Len, Max, Parameter, SavepointAction, \
-    Select, Update, ColumnSyntax, TableSyntax, Upper, Count, ALL_COLUMNS, Sum
+from twext.enterprise.dal.syntax import (
+    Delete, utcNowSQL, Union, Insert, Len, Max, Parameter, SavepointAction,
+    Select, Update, ColumnSyntax, TableSyntax, Upper, Count, ALL_COLUMNS, Sum,
+    DatabaseLock, DatabaseUnlock )
 from twext.enterprise.ienterprise import AlreadyFinishedError
 from twext.enterprise.queue import LocalQueuer
 from twext.enterprise.util import parseSQLTimestamp
@@ -1401,11 +1402,11 @@
 
 
     def acquireUpgradeLock(self):
-        return self.execSQL("select pg_advisory_lock(1)")
+        return DatabaseLock().on(self)
 
 
     def releaseUpgradeLock(self):
-        return self.execSQL("select pg_advisory_unlock(1)")
+        return DatabaseUnlock().on(self)
 
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/3248d500/attachment.html>