[CalendarServer-changes] [11830] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:15:35 PDT 2014
Revision: 11830
http://trac.calendarserver.org//changeset/11830
Author: sagen at apple.com
Date: 2013-10-21 15:00:05 -0700 (Mon, 21 Oct 2013)
Log Message:
-----------
Make the pg_advisory_lock a no-op on DBs other than postgres
Modified Paths:
--------------
CalendarServer/trunk/twext/enterprise/dal/syntax.py
CalendarServer/trunk/twext/enterprise/dal/test/test_sqlsyntax.py
CalendarServer/trunk/txdav/common/datastore/sql.py
Modified: CalendarServer/trunk/twext/enterprise/dal/syntax.py
===================================================================
--- CalendarServer/trunk/twext/enterprise/dal/syntax.py 2013-10-21 21:58:11 UTC (rev 11829)
+++ CalendarServer/trunk/twext/enterprise/dal/syntax.py 2013-10-21 22:00:05 UTC (rev 11830)
@@ -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/trunk/twext/enterprise/dal/test/test_sqlsyntax.py
===================================================================
--- CalendarServer/trunk/twext/enterprise/dal/test/test_sqlsyntax.py 2013-10-21 21:58:11 UTC (rev 11829)
+++ CalendarServer/trunk/twext/enterprise/dal/test/test_sqlsyntax.py 2013-10-21 22:00:05 UTC (rev 11830)
@@ -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/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py 2013-10-21 21:58:11 UTC (rev 11829)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2013-10-21 22:00:05 UTC (rev 11830)
@@ -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
@@ -1375,11 +1376,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/7b7b2cbe/attachment.html>
More information about the calendarserver-changes
mailing list