October 2010 - calendarserver-changes

[6488] CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml
by source_changes＠macosforge.org 31 Oct '10

31 Oct '10

Revision: 6488 http://trac.macosforge.org/projects/calendarserver/changeset/6488 Author: cdaboo(a)apple.com Date: 2010-10-30 18:35:59 -0700 (Sat, 30 Oct 2010) Log Message: ----------- Fix element order. Modified Paths: -------------- CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml Modified: CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml =================================================================== --- CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml 2010-10-29 21:20:50 UTC (rev 6487) +++ CalDAVTester/trunk/scripts/tests/CalDAV/nonascii.xml 2010-10-31 01:35:59 UTC (rev 6488) @@ -512,6 +512,7 @@ <description>POST with utf-8 data</description> <request print-response='no'> <method>POST</method> + <ruri>$outboxpath1:/</ruri> <header> <name>Originator</name> <value>$cuaddralt1:</value> @@ -520,7 +521,6 @@ <name>Recipient</name> <value>$cuaddralt2:</value> </header> - <ruri>$outboxpath1:/</ruri> <data> <content-type>text/calendar; charset=utf-8</content-type> <filepath>Resource/CalDAV/nonascii/12.ics</filepath>

1 0

[6487] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
by source_changes＠macosforge.org 29 Oct '10

29 Oct '10

Revision: 6487 http://trac.macosforge.org/projects/calendarserver/changeset/6487 Author: sagen(a)apple.com Date: 2010-10-29 14:20:50 -0700 (Fri, 29 Oct 2010) Log Message: ----------- Retry 2 more times when we see -14987 ds error Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2010-10-29 20:45:26 UTC (rev 6486) +++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2010-10-29 21:20:50 UTC (rev 6487) @@ -613,18 +613,10 @@ raise UnknownRecordTypeError("Unknown OpenDirectory record type: %s" % (recordType)) - try: - self.log_debug("opendirectory.queryRecordsWithAttribute_list(%r,%r,%r,%r,%r,%r,%r)" % ( - self.directory, - query.attribute, - query.value, - query.matchType, - caseInsensitive, - listRecordTypes, - attrs, - )) - results.extend( - lookupMethod( + # Because we're getting transient OD error -14987, try 3 times: + for i in xrange(3): + try: + self.log_debug("opendirectory.queryRecordsWithAttribute_list(%r,%r,%r,%r,%r,%r,%r)" % ( self.directory, query.attribute, query.value, @@ -632,16 +624,32 @@ caseInsensitive, listRecordTypes, attrs, + )) + results.extend( + lookupMethod( + self.directory, + query.attribute, + query.value, + query.matchType, + caseInsensitive, + listRecordTypes, + attrs, + ) ) - ) - except opendirectory.ODError, ex: - if ex.message[1] == -14140 or ex.message[1] == -14200: - # Unsupported attribute on record - don't fail - return + except opendirectory.ODError, ex: + if ex.message[1] == -14987: + # Fall through and retry + self.log_error("OpenDirectory (node=%s) error: %s" % (self.realmName, str(ex))) + elif ex.message[1] == -14140 or ex.message[1] == -14200: + # Unsupported attribute on record - don't fail + return + else: + self.log_error("OpenDirectory (node=%s) error: %s" % (self.realmName, str(ex))) + raise else: - self.log_error("OpenDirectory (node=%s) error: %s" % (self.realmName, str(ex))) - raise + # Success, so break the retry loop + break self.log_debug("opendirectory.queryRecordsWithAttribute_list matched records: %s" % (len(results),))

1 0

[6486] CalendarServer/trunk/contrib/tests/
by source_changes＠macosforge.org 29 Oct '10

29 Oct '10

Revision: 6486 http://trac.macosforge.org/projects/calendarserver/changeset/6486 Author: wsanchez(a)apple.com Date: 2010-10-29 13:45:26 -0700 (Fri, 29 Oct 2010) Log Message: ----------- obsolete Removed Paths: ------------- CalendarServer/trunk/contrib/tests/

1 0

[6485] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
by source_changes＠macosforge.org 29 Oct '10

29 Oct '10

Revision: 6485 http://trac.macosforge.org/projects/calendarserver/changeset/6485 Author: sagen(a)apple.com Date: 2010-10-29 13:43:42 -0700 (Fri, 29 Oct 2010) Log Message: ----------- Don't prefetch groupsForGUID when faulting in a record. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2010-10-29 16:34:03 UTC (rev 6484) +++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2010-10-29 20:43:42 UTC (rev 6485) @@ -753,11 +753,6 @@ origIndexKey = origIndexKey.encode("utf-8") self.log_debug("Storing (%s %s) %s in internal cache" % (indexType, origIndexKey, record)) - # Fetch the set of groups this record is a member of so we can - # cache it, rather than have each process make the same group - # lookup - record._groupMembershipGUIDs = self.groupsForGUID(record.guid) - self.recordCacheForType(recordType).addRecord(record, indexType, origIndexKey) def isAvailable(self):

1 0

[6484] CalendarServer/trunk/twistedcaldav/directory/common.py
by source_changes＠macosforge.org 29 Oct '10

29 Oct '10

Revision: 6484 http://trac.macosforge.org/projects/calendarserver/changeset/6484 Author: sagen(a)apple.com Date: 2010-10-29 09:34:03 -0700 (Fri, 29 Oct 2010) Log Message: ----------- Fix logging Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/common.py Modified: CalendarServer/trunk/twistedcaldav/directory/common.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/common.py 2010-10-29 00:00:10 UTC (rev 6483) +++ CalendarServer/trunk/twistedcaldav/directory/common.py 2010-10-29 16:34:03 UTC (rev 6484) @@ -22,6 +22,11 @@ from twistedcaldav.directory.util import transactionFromRequest from twistedcaldav.directory.resource import DirectoryReverseProxyResource +from twext.python.log import Logger + +log = Logger() + + __all__ = [ 'uidsResourceName', 'CommonUIDProvisioningResource' @@ -63,11 +68,11 @@ name = record.uid if record is None: - self.log_msg("No directory record with GUID %r" % (name,)) + log.debug("No directory record with GUID %r" % (name,)) returnValue(None) if not getattr(record, self.enabledAttribute): - self.log_msg("Directory record %r is not enabled for %s" % ( + log.debug("Directory record %r is not enabled for %s" % ( record, self.homeResourceTypeName)) returnValue(None)

1 0

[6483] CalendarServer/trunk
by source_changes＠macosforge.org 29 Oct '10

29 Oct '10

Revision: 6483 http://trac.macosforge.org/projects/calendarserver/changeset/6483 Author: wsanchez(a)apple.com Date: 2010-10-28 17:00:10 -0700 (Thu, 28 Oct 2010) Log Message: ----------- twistedcaldav.__version__ -> calendarserver.__version__ Modified Paths: -------------- CalendarServer/trunk/calendarserver/__init__.py CalendarServer/trunk/calendarserver/tap/caldav.py CalendarServer/trunk/setup.py CalendarServer/trunk/twistedcaldav/__init__.py CalendarServer/trunk/twistedcaldav/extensions.py Property Changed: ---------------- CalendarServer/trunk/calendarserver/ CalendarServer/trunk/twistedcaldav/ Property changes on: CalendarServer/trunk/calendarserver ___________________________________________________________________ Added: svn:ignore + version.py Modified: CalendarServer/trunk/calendarserver/__init__.py =================================================================== --- CalendarServer/trunk/calendarserver/__init__.py 2010-10-28 20:39:22 UTC (rev 6482) +++ CalendarServer/trunk/calendarserver/__init__.py 2010-10-29 00:00:10 UTC (rev 6483) @@ -19,7 +19,18 @@ CalendarServer application code. """ +# # setuptools is annoying +# from warnings import filterwarnings filterwarnings("ignore", "Module (.*) was already imported (.*)") del filterwarnings + +# +# Set __version__ +# + +try: + from calendarserver.version import version as __version__ +except ImportError: + __version__ = None Modified: CalendarServer/trunk/calendarserver/tap/caldav.py =================================================================== --- CalendarServer/trunk/calendarserver/tap/caldav.py 2010-10-28 20:39:22 UTC (rev 6482) +++ CalendarServer/trunk/calendarserver/tap/caldav.py 2010-10-29 00:00:10 UTC (rev 6483) @@ -26,14 +26,12 @@ import stat import sys from time import time - from subprocess import Popen, PIPE from pwd import getpwuid, getpwnam from grp import getgrnam from inspect import getargspec - +import OpenSSL from OpenSSL.SSL import Error as SSLError -import OpenSSL from zope.interface import implements @@ -51,21 +49,20 @@ from twisted.application.service import MultiService, IServiceMaker from twisted.scripts.mktap import getid from twisted.runner import procmon + +import twext from twext.web2.server import Site - from twext.python.log import Logger, LoggingMixIn from twext.python.log import logLevelForNamespace, setLogLevelForNamespace +from twext.python.filepath import CachingFilePath from twext.internet.ssl import ChainingOpenSSLContextFactory from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer - from twext.web2.channel.http import LimitingHTTPFactory, SSLRedirectRequest +from twext.web2.metafd import ConnectionLimiter, ReportingHTTPService -try: - from twistedcaldav.version import version -except ImportError: - sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "support")) - from version import version as getVersion - version = "%s (%s)" % getVersion() +from txdav.common.datastore.sql import v1_schema +from txdav.base.datastore.subpostgres import PostgresService +from txdav.common.datastore.util import UpgradeToDatabaseService from twistedcaldav.config import ConfigurationError from twistedcaldav.config import config @@ -76,8 +73,6 @@ from twistedcaldav.stdconfig import DEFAULT_CONFIG, DEFAULT_CONFIG_FILE from twistedcaldav.upgrade import upgradeData -from twext.web2.metafd import ConnectionLimiter, ReportingHTTPService - try: from twistedcaldav.authkerb import NegotiateCredentialFactory NegotiateCredentialFactory # pacify pyflakes @@ -90,10 +85,15 @@ from calendarserver.tap.util import getRootResource, computeProcessCount from calendarserver.tools.util import checkDirectory -from txdav.common.datastore.sql import v1_schema -from txdav.base.datastore.subpostgres import PostgresService -from txdav.common.datastore.util import UpgradeToDatabaseService -from twext.python.filepath import CachingFilePath +try: + from calendarserver.version import version +except ImportError: + sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "support")) + from version import version as getVersion + version = "%s (%s*)" % getVersion() +twext.web2.server.VERSION = "CalendarServer/%s %s" % ( + version.replace(" ", ""), twext.web2.server.VERSION, +) log = Logger() Modified: CalendarServer/trunk/setup.py =================================================================== --- CalendarServer/trunk/setup.py 2010-10-28 20:39:22 UTC (rev 6482) +++ CalendarServer/trunk/setup.py 2010-10-29 00:00:10 UTC (rev 6483) @@ -58,7 +58,7 @@ # version_string = "%s (%s)" % version() -version_file = file(os.path.join("twistedcaldav", "version.py"), "w") +version_file = file(os.path.join("calendarserver", "version.py"), "w") version_file.write('version = "%s"\n' % version_string) version_file.close() Property changes on: CalendarServer/trunk/twistedcaldav ___________________________________________________________________ Deleted: svn:ignore - version.py Modified: CalendarServer/trunk/twistedcaldav/__init__.py =================================================================== --- CalendarServer/trunk/twistedcaldav/__init__.py 2010-10-28 20:39:22 UTC (rev 6482) +++ CalendarServer/trunk/twistedcaldav/__init__.py 2010-10-29 00:00:10 UTC (rev 6483) @@ -22,15 +22,6 @@ """ # -# Set __version__ -# - -try: - from twistedcaldav.version import version as __version__ -except ImportError: - __version__ = None - -# # Load in suitable file extension/content-type map from OS X # Modified: CalendarServer/trunk/twistedcaldav/extensions.py =================================================================== --- CalendarServer/trunk/twistedcaldav/extensions.py 2010-10-28 20:39:22 UTC (rev 6482) +++ CalendarServer/trunk/twistedcaldav/extensions.py 2010-10-29 00:00:10 UTC (rev 6483) @@ -69,17 +69,6 @@ log = Logger() -if twistedcaldav.__version__: - twext.web2.server.VERSION = "CalendarServer/%s %s" % ( - twistedcaldav.__version__.replace(" ", ""), - twext.web2.server.VERSION, - ) -else: - twext.web2.server.VERSION = "CalendarServer/? %s" % ( - twext.web2.server.VERSION, - ) - - class SudoersMixin (object): """ Mixin class to let DAVResource, and DAVFile subclasses know about

1 0

[6482] CalendarServer/trunk
by source_changes＠macosforge.org 28 Oct '10

28 Oct '10

Revision: 6482 http://trac.macosforge.org/projects/calendarserver/changeset/6482 Author: wsanchez(a)apple.com Date: 2010-10-28 13:39:22 -0700 (Thu, 28 Oct 2010) Log Message: ----------- Rename memoized to memoizedKey and move it to twext. Modified Paths: -------------- CalendarServer/trunk/txdav/common/datastore/sql.py Added Paths: ----------- CalendarServer/trunk/twext/internet/decorate.py Removed Paths: ------------- CalendarServer/trunk/txdav/base/datastore/sql.py Added: CalendarServer/trunk/twext/internet/decorate.py =================================================================== --- CalendarServer/trunk/twext/internet/decorate.py (rev 0) +++ CalendarServer/trunk/twext/internet/decorate.py 2010-10-28 20:39:22 UTC (rev 6482) @@ -0,0 +1,114 @@ +## +# Copyright (c) 2010 Apple Inc. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +## + +""" +Decorators. +""" + +__all__ = [ + "memoizedKey", +] + + +from inspect import getargspec + +from twisted.internet.defer import Deferred, succeed + + +def memoizedKey(keyArgument, memoAttribute, deferredResult=True): + """ + Decorator which memoizes the result of a method on that method's instance. + + @param keyArgument: The name of the "key" argument. + @type keyArgument: C{str} + + @param memoAttribute: The name of the attribute on the instance which + should be used for memoizing the result of this method; the attribute + itself must be a dictionary. + @type memoAttribute: C{str} + + @param deferredResult: Whether the result must be a deferred. + @type keyArgument: C{bool} + """ + + def getarg(argname, argspec, args, kw): + """ + Get an argument from some arguments. + + @param argname: The name of the argument to retrieve. + + @param argspec: The result of L{inspect.getargspec}. + + @param args: positional arguments passed to the function specified by + argspec. + + @param kw: keyword arguments passed to the function specified by + argspec. + + @return: The value of the argument named by 'argname'. + """ + argnames = argspec[0] + try: + argpos = argnames.index(argname) + except ValueError: + argpos = None + if argpos is not None: + if len(args) > argpos: + return args[argpos] + if argname in kw: + return kw[argname] + else: + raise TypeError("could not find key argument %r in %r/%r (%r)" % + (argname, args, kw, argpos) + ) + + def decorate(thunk): + # cheater move to try to get the right argspec from inlineCallbacks. + # This could probably be more robust, but the 'cell_contents' thing + # probably can't (that's the only real reference to the underlying + # function). + if thunk.func_code.co_name == "unwindGenerator": + specTarget = thunk.func_closure[0].cell_contents + else: + specTarget = thunk + spec = getargspec(specTarget) + + def outer(*a, **kw): + self = a[0] + memo = getattr(self, memoAttribute) + key = getarg(keyArgument, spec, a, kw) + if key in memo: + memoed = memo[key] + if deferredResult: + return succeed(memoed) + else: + return memoed + result = thunk(*a, **kw) + + if isinstance(result, Deferred): + def memoResult(finalResult): + if finalResult is not None: + memo[key] = finalResult + return finalResult + result.addCallback(memoResult) + elif result is not None: + memo[key] = result + + return result + + return outer + + return decorate Deleted: CalendarServer/trunk/txdav/base/datastore/sql.py =================================================================== --- CalendarServer/trunk/txdav/base/datastore/sql.py 2010-10-28 20:35:50 UTC (rev 6481) +++ CalendarServer/trunk/txdav/base/datastore/sql.py 2010-10-28 20:39:22 UTC (rev 6482) @@ -1,101 +0,0 @@ -## -# Copyright (c) 2010 Apple Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -## - -""" -Logic common to SQL implementations. -""" - -from twisted.internet.defer import Deferred, succeed -from inspect import getargspec - -def _getarg(argname, argspec, args, kw): - """ - Get an argument from some arguments. - - @param argname: The name of the argument to retrieve. - - @param argspec: The result of L{inspect.getargspec}. - - @param args: positional arguments passed to the function specified by - argspec. - - @param kw: keyword arguments passed to the function specified by - argspec. - - @return: The value of the argument named by 'argname'. - """ - argnames = argspec[0] - try: - argpos = argnames.index(argname) - except ValueError: - argpos = None - if argpos is not None: - if len(args) > argpos: - return args[argpos] - if argname in kw: - return kw[argname] - else: - raise TypeError("could not find key argument %r in %r/%r (%r)" % - (argname, args, kw, argpos) - ) - - - -def memoized(keyArgument, memoAttribute, deferredResult=True): - """ - Decorator which memoizes the result of a method on that method's instance. - - @param keyArgument: The name of the 'key' argument. - @type keyArgument: C{str} - - @param memoAttribute: The name of the attribute on the instance which - should be used for memoizing the result of this method; the attribute - itself must be a dictionary. - @type memoAttribute: C{str} - - @param deferredResult: Whether the result must be a deferred. - @type keyArgument: C{bool} - - """ - def decorate(thunk): - # cheater move to try to get the right argspec from inlineCallbacks. - # This could probably be more robust, but the 'cell_contents' thing - # probably can't (that's the only real reference to the underlying - # function). - if thunk.func_code.co_name == 'unwindGenerator': - specTarget = thunk.func_closure[0].cell_contents - else: - specTarget = thunk - spec = getargspec(specTarget) - def outer(*a, **kw): - self = a[0] - memo = getattr(self, memoAttribute) - key = _getarg(keyArgument, spec, a, kw) - if key in memo: - memoed = memo[key] - return succeed(memoed) if deferredResult else memoed - result = thunk(*a, **kw) - if isinstance(result, Deferred): - def memoResult(finalResult): - if finalResult is not None: - memo[key] = finalResult - return finalResult - result.addCallback(memoResult) - elif result is not None: - memo[key] = result - return result - return outer - return decorate Modified: CalendarServer/trunk/txdav/common/datastore/sql.py =================================================================== --- CalendarServer/trunk/txdav/common/datastore/sql.py 2010-10-28 20:35:50 UTC (rev 6481) +++ CalendarServer/trunk/txdav/common/datastore/sql.py 2010-10-28 20:39:22 UTC (rev 6482) @@ -26,25 +26,26 @@ ] import sys - +import datetime from Queue import Queue -from twext.python.log import Logger, LoggingMixIn -from twext.web2.dav.element.rfc2518 import ResourceType -from twext.web2.http_headers import MimeType +from zope.interface.declarations import implements, directlyProvides -from twisted.application.service import Service from twisted.python import hashlib from twisted.python.modules import getModule from twisted.python.util import FancyEqMixin +from twisted.python.failure import Failure from twisted.internet import reactor from twisted.internet.defer import inlineCallbacks, returnValue, Deferred -from twisted.python.failure import Failure -from twistedcaldav.customxml import NotificationType -from twistedcaldav.dateops import datetimeMktime +from twisted.application.service import Service +from twext.python.log import Logger, LoggingMixIn +from twext.internet.decorate import memoizedKey +from twext.web2.dav.element.rfc2518 import ResourceType +from twext.web2.http_headers import MimeType + from txdav.common.datastore.sql_legacy import PostgresLegacyNotificationsEmulator from txdav.caldav.icalendarstore import ICalendarTransaction, ICalendarStore @@ -59,18 +60,16 @@ NoSuchObjectResourceError from txdav.common.inotifications import INotificationCollection, \ INotificationObject -from txdav.base.datastore.sql import memoized from txdav.idav import AlreadyFinishedError from txdav.base.propertystore.base import PropertyName from txdav.base.propertystore.sql import PropertyStore -from zope.interface.declarations import implements, directlyProvides +from twistedcaldav.customxml import NotificationType +from twistedcaldav.dateops import datetimeMktime -import datetime -v1_schema = getModule(__name__).filePath.sibling( - "sql_schema_v1.sql").getContent() +v1_schema = getModule(__name__).filePath.sibling("sql_schema_v1.sql").getContent() log = Logger() @@ -127,9 +126,9 @@ _DONE = object() -_STATE_STOPPED = 'STOPPED' -_STATE_RUNNING = 'RUNNING' -_STATE_STOPPING = 'STOPPING' +_STATE_STOPPED = "STOPPED" +_STATE_RUNNING = "RUNNING" +_STATE_STOPPING = "STOPPING" class ThreadHolder(object): """ @@ -261,7 +260,7 @@ def __repr__(self): - return 'PG-TXN<%s>' % (self._label,) + return "PG-TXN<%s>" % (self._label,) def _reallyExecSQL(self, sql, args=[], raiseOnZeroRowCount=None): @@ -295,16 +294,16 @@ def __del__(self): if not self._completed: - print 'CommonStoreTransaction.__del__: OK' + print "CommonStoreTransaction.__del__: OK" self.abort() - @memoized('uid', '_calendarHomes') + @memoizedKey("uid", "_calendarHomes") def calendarHomeWithUID(self, uid, create=False): return self.homeWithUID(ECALENDARTYPE, uid, create=create) - @memoized('uid', '_addressbookHomes') + @memoizedKey("uid", "_addressbookHomes") def addressbookHomeWithUID(self, uid, create=False): return self.homeWithUID(EADDRESSBOOKTYPE, uid, create=create) @@ -360,7 +359,7 @@ returnValue(homeObject) - @memoized('uid', '_notificationHomes') + @memoizedKey("uid", "_notificationHomes") @inlineCallbacks def notificationsWithUID(self, uid): """ @@ -419,7 +418,7 @@ def postCommit(self, operation): """ - Run things after 'commit.' + Run things after C{commit}. """ self._postCommitOperations.append(operation) @@ -539,7 +538,7 @@ returnValue(names) - @memoized('name', '_children') + @memoizedKey("name", "_children") def childWithName(self, name): """ Retrieve the child with the given C{name} contained in this @@ -551,7 +550,7 @@ return self._childWithName(name, owned=True) - @memoized('name', '_sharedChildren') + @memoizedKey("name", "_sharedChildren") def sharedChildWithName(self, name): """ Retrieve the shared child with the given C{name} contained in this @@ -851,7 +850,7 @@ Common ancestor class of AddressBooks and Calendars. """ - compareAttributes = '_name _home _resourceID'.split() + compareAttributes = "_name _home _resourceID".split() _objectResourceClass = None _bindTable = None @@ -963,6 +962,7 @@ def objectResourceWithUID(self, uid): return self._makeObjectResource(None, uid) + @inlineCallbacks def _makeObjectResource(self, name, uid): """ @@ -1338,7 +1338,7 @@ @type _path: L{FilePath} """ - compareAttributes = '_name _parentCollection'.split() + compareAttributes = "_name _parentCollection".split() _objectTable = None @@ -1504,7 +1504,7 @@ implements(INotificationCollection) - compareAttributes = '_uid _resourceID'.split() + compareAttributes = "_uid _resourceID".split() _objectResourceClass = None _revisionsTable = NOTIFICATION_OBJECT_REVISIONS_TABLE @@ -1536,7 +1536,7 @@ return "<%s: %s>" % (self.__class__.__name__, self._resourceID) def name(self): - return 'notification' + return "notification" def uid(self): return self._uid @@ -1571,7 +1571,7 @@ return self.notificationObjectWithUID(self._nameToUID(name)) - @memoized('uid', '_notifications') + @memoizedKey("uid", "_notifications") @inlineCallbacks def notificationObjectWithUID(self, uid): """ @@ -1759,7 +1759,7 @@ implements(INotificationObject) - compareAttributes = '_resourceID _home'.split() + compareAttributes = "_resourceID _home".split() def __init__(self, home, uid): self._home = home

1 0

[6481] CalendarServer/trunk/test
by source_changes＠macosforge.org 28 Oct '10

28 Oct '10

Revision: 6481 http://trac.macosforge.org/projects/calendarserver/changeset/6481 Author: wsanchez(a)apple.com Date: 2010-10-28 13:35:50 -0700 (Thu, 28 Oct 2010) Log Message: ----------- Nuke pyc files first. Modified Paths: -------------- CalendarServer/trunk/test Modified: CalendarServer/trunk/test =================================================================== --- CalendarServer/trunk/test 2010-10-28 20:21:28 UTC (rev 6480) +++ CalendarServer/trunk/test 2010-10-28 20:35:50 UTC (rev 6481) @@ -76,4 +76,6 @@ test_modules="calendarserver twistedcaldav twext txdav ${m_twisted}"; fi; +find "${wd}" -name \*.pyc -print0 | xargs -0 rm; + cd "${wd}" && "${python}" "${trial}" --rterrors ${random} ${until_fail} ${no_colour} ${coverage} ${test_modules};

1 0

[6480] CalendarServer/trunk/txdav/common/datastore
by source_changes＠macosforge.org 28 Oct '10

28 Oct '10

Revision: 6480 http://trac.macosforge.org/projects/calendarserver/changeset/6480 Author: cdaboo(a)apple.com Date: 2010-10-28 13:21:28 -0700 (Thu, 28 Oct 2010) Log Message: ----------- Do more efficient tracking of valid child resources so we can minimize repeated SQL queries. Modified Paths: -------------- CalendarServer/trunk/txdav/common/datastore/sql.py CalendarServer/trunk/txdav/common/datastore/sql_legacy.py Modified: CalendarServer/trunk/txdav/common/datastore/sql.py =================================================================== --- CalendarServer/trunk/txdav/common/datastore/sql.py 2010-10-28 14:27:52 UTC (rev 6479) +++ CalendarServer/trunk/txdav/common/datastore/sql.py 2010-10-28 20:21:28 UTC (rev 6480) @@ -956,16 +956,13 @@ returnValue(sorted([row[0] for row in rows])) - @memoized('name', '_objects') def objectResourceWithName(self, name): return self._makeObjectResource(name, None) - @memoized('uid', '_objects') def objectResourceWithUID(self, uid): return self._makeObjectResource(None, uid) - @inlineCallbacks def _makeObjectResource(self, name, uid): """ @@ -973,25 +970,79 @@ """ objectResource = self._objectResourceClass(self, name, uid) objectResource = (yield objectResource.initFromStore()) + if objectResource: + self._objects[objectResource.name()] = objectResource + self._objects[objectResource.uid()] = objectResource + else: + self._objects[name if name else uid] = None returnValue(objectResource) @inlineCallbacks - def createObjectResourceWithName(self, name, component): - if name.startswith("."): - raise ObjectResourceNameNotAllowedError(name) + def resourceNameForUID(self, uid): + try: + resource = self._objects[uid] + returnValue(resource.name() if resource else None) + except KeyError: + pass - rows = yield self._txn.execSQL( - "select %(column_RESOURCE_ID)s from %(name)s " - "where %(column_RESOURCE_NAME)s = %%s " - "and %(column_PARENT_RESOURCE_ID)s = %%s" % self._objectTable, + rows = yield self._txn.execSQL(""" + select %(column_RESOURCE_NAME)s + from %(name)s + where %(column_UID)s = %%s and %(column_PARENT_RESOURCE_ID)s = %%s + """ % self._objectTable, + [uid, self._resourceID] + ) + if rows: + returnValue(rows[0][0]) + else: + self._objects[uid] = None + returnValue(None) + + @inlineCallbacks + def resourceUIDForName(self, name): + try: + resource = self._objects[name] + returnValue(resource.uid() if resource else None) + except KeyError: + pass + + rows = yield self._txn.execSQL(""" + select %(column_UID)s + from %(name)s + where %(column_RESOURCE_NAME)s = %%s and %(column_PARENT_RESOURCE_ID)s = %%s + """ % self._objectTable, [name, self._resourceID] ) if rows: - raise ObjectResourceNameAlreadyExistsError() + returnValue(rows[0][0]) + else: + self._objects[name] = None + returnValue(None) + + @inlineCallbacks + def createObjectResourceWithName(self, name, component): + if name.startswith("."): + raise ObjectResourceNameNotAllowedError(name) + + if name in self._objects: + if self._objects[name]: + raise ObjectResourceNameAlreadyExistsError() + else: + rows = yield self._txn.execSQL( + "select %(column_RESOURCE_ID)s from %(name)s " + "where %(column_RESOURCE_NAME)s = %%s " + "and %(column_PARENT_RESOURCE_ID)s = %%s" % self._objectTable, + [name, self._resourceID] + ) + if rows: + raise ObjectResourceNameAlreadyExistsError() + objectResource = self._objectResourceClass(self, name, None) yield objectResource.setComponent(component, inserting=True) + self._objects[objectResource.name()] = objectResource + self._objects[objectResource.uid()] = objectResource # Note: setComponent triggers a notification, so we don't need to # call notify( ) here like we do for object removal. Modified: CalendarServer/trunk/txdav/common/datastore/sql_legacy.py =================================================================== --- CalendarServer/trunk/txdav/common/datastore/sql_legacy.py 2010-10-28 14:27:52 UTC (rev 6479) +++ CalendarServer/trunk/txdav/common/datastore/sql_legacy.py 2010-10-28 20:21:28 UTC (rev 6480) @@ -929,18 +929,14 @@ @inlineCallbacks def resourceUIDForName(self, name): - obj = yield self.calendar.calendarObjectWithName(name) - if obj is None: - returnValue(None) - returnValue(obj.uid()) + uid = yield self.calendar.resourceUIDForName(name) + returnValue(uid) @inlineCallbacks def resourceNameForUID(self, uid): - obj = yield self.calendar.calendarObjectWithUID(uid) - if obj is None: - returnValue(None) - returnValue(obj.name()) + name = yield self.calendar.resourceNameForUID(uid) + returnValue(name) @inlineCallbacks

1 0

[6479] CalendarServer/trunk/twistedcaldav/resource.py
by source_changes＠macosforge.org 28 Oct '10

28 Oct '10

Revision: 6479 http://trac.macosforge.org/projects/calendarserver/changeset/6479 Author: cdaboo(a)apple.com Date: 2010-10-28 07:27:52 -0700 (Thu, 28 Oct 2010) Log Message: ----------- Do not do depth infinity scans into regular collections (which include dropbox which is very expensive to scan right now). This fixes a bad performance regeression when PUT'ing data. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/resource.py Modified: CalendarServer/trunk/twistedcaldav/resource.py =================================================================== --- CalendarServer/trunk/twistedcaldav/resource.py 2010-10-28 01:49:29 UTC (rev 6478) +++ CalendarServer/trunk/twistedcaldav/resource.py 2010-10-28 14:27:52 UTC (rev 6479) @@ -986,9 +986,13 @@ continue if child.isSpecialCollection(type): callback(child, childpath) - elif child.isCollection(): - if depth == "infinity": - yield child.findSpecialCollectionsFaster(type, depth, request, callback, privileges) + + # No more regular collections. If we leave this in then dropbox is scanned at depth:infinity + # and that is very painful as it requires scanning all calendar resources too. Eventually we need + # to fix drop box and probably re-enable this for the generic case. +# elif child.isCollection(): +# if depth == "infinity": +# yield child.findSpecialCollectionsFaster(type, depth, request, callback, privileges) findSpecialCollections = findSpecialCollectionsFaster

1 0