[CalendarServer-changes] [14421] CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common /datastore/podding/migration
source_changes at macosforge.org
source_changes at macosforge.org
Mon Feb 16 17:22:15 PST 2015
Revision: 14421
http://trac.calendarserver.org//changeset/14421
Author: cdaboo at apple.com
Date: 2015-02-16 17:22:15 -0800 (Mon, 16 Feb 2015)
Log Message:
-----------
Rename only.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/home_sync.py
CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/test/test_home_sync.py
Added Paths:
-----------
CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/sync_metadata.py
Removed Paths:
-------------
CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/migration_metadata.py
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/home_sync.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/home_sync.py 2015-02-17 00:48:41 UTC (rev 14420)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/home_sync.py 2015-02-17 01:22:15 UTC (rev 14421)
@@ -20,7 +20,7 @@
from twisted.internet.defer import returnValue, inlineCallbacks
from twisted.python.failure import Failure
from txdav.caldav.icalendarstore import ComponentUpdateState
-from txdav.common.datastore.podding.migration.migration_metadata import CalendarMigrationRecord, \
+from txdav.common.datastore.podding.migration.sync_metadata import CalendarMigrationRecord, \
CalendarObjectMigrationRecord, AttachmentMigrationRecord
from txdav.caldav.datastore.sql import ManagedAttachment
from txdav.common.idirectoryservice import DirectoryRecordNotFoundError
Deleted: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/migration_metadata.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/migration_metadata.py 2015-02-17 00:48:41 UTC (rev 14420)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/migration_metadata.py 2015-02-17 01:22:15 UTC (rev 14421)
@@ -1,58 +0,0 @@
-##
-# Copyright (c) 2015 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.
-##
-
-from twext.enterprise.dal.record import Record, fromTable
-from txdav.common.datastore.sql_tables import schema
-from twext.enterprise.dal.syntax import Parameter, Delete
-from twisted.internet.defer import inlineCallbacks
-
-"""
-Module that manages store-level metadata objects used during the migration process.
-"""
-
-class CalendarMigrationRecord(Record, fromTable(schema.CALENDAR_MIGRATION)):
- """
- @DynamicAttrs
- L{Record} for L{schema.CALENDAR_MIGRATION}.
- """
-
- @classmethod
- @inlineCallbacks
- def deleteremotes(cls, txn, homeid, remotes):
- return Delete(
- From=cls.table,
- Where=(cls.calendarHomeResourceID == homeid).And(
- cls.remoteResourceID.In(Parameter("remotes", len(remotes)))
- ),
- ).on(txn, remotes=remotes)
-
-
-
-class CalendarObjectMigrationRecord(Record, fromTable(schema.CALENDAR_OBJECT_MIGRATION)):
- """
- @DynamicAttrs
- L{Record} for L{schema.CALENDAR_OBJECT_MIGRATION}.
- """
- pass
-
-
-
-class AttachmentMigrationRecord(Record, fromTable(schema.ATTACHMENT_MIGRATION)):
- """
- @DynamicAttrs
- L{Record} for L{schema.ATTACHMENT_MIGRATION}.
- """
- pass
Copied: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/sync_metadata.py (from rev 14419, CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/migration_metadata.py)
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/sync_metadata.py (rev 0)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/sync_metadata.py 2015-02-17 01:22:15 UTC (rev 14421)
@@ -0,0 +1,58 @@
+##
+# Copyright (c) 2015 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.
+##
+
+from twext.enterprise.dal.record import Record, fromTable
+from txdav.common.datastore.sql_tables import schema
+from twext.enterprise.dal.syntax import Parameter, Delete
+from twisted.internet.defer import inlineCallbacks
+
+"""
+Module that manages store-level metadata objects used during the migration process.
+"""
+
+class CalendarMigrationRecord(Record, fromTable(schema.CALENDAR_MIGRATION)):
+ """
+ @DynamicAttrs
+ L{Record} for L{schema.CALENDAR_MIGRATION}.
+ """
+
+ @classmethod
+ @inlineCallbacks
+ def deleteremotes(cls, txn, homeid, remotes):
+ return Delete(
+ From=cls.table,
+ Where=(cls.calendarHomeResourceID == homeid).And(
+ cls.remoteResourceID.In(Parameter("remotes", len(remotes)))
+ ),
+ ).on(txn, remotes=remotes)
+
+
+
+class CalendarObjectMigrationRecord(Record, fromTable(schema.CALENDAR_OBJECT_MIGRATION)):
+ """
+ @DynamicAttrs
+ L{Record} for L{schema.CALENDAR_OBJECT_MIGRATION}.
+ """
+ pass
+
+
+
+class AttachmentMigrationRecord(Record, fromTable(schema.ATTACHMENT_MIGRATION)):
+ """
+ @DynamicAttrs
+ L{Record} for L{schema.ATTACHMENT_MIGRATION}.
+ """
+ pass
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/test/test_home_sync.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/test/test_home_sync.py 2015-02-17 00:48:41 UTC (rev 14420)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/test/test_home_sync.py 2015-02-17 01:22:15 UTC (rev 14421)
@@ -20,7 +20,7 @@
from twistedcaldav.ical import Component, normalize_iCalStr
from txdav.caldav.datastore.sql import ManagedAttachment
from txdav.common.datastore.podding.migration.home_sync import CrossPodHomeSync
-from txdav.common.datastore.podding.migration.migration_metadata import CalendarMigrationRecord
+from txdav.common.datastore.podding.migration.sync_metadata import CalendarMigrationRecord
from txdav.common.datastore.podding.test.util import MultiStoreConduitTest
from txdav.common.datastore.sql_tables import schema
from txweb2.http_headers import MimeType
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150216/194f5457/attachment-0001.html>
More information about the calendarserver-changes
mailing list