April 2011 - calendarserver-changes

[7405] CalendarServer/trunk/txdav/common/datastore/sql_tables.py
by source_changes＠macosforge.org 29 Apr '11

29 Apr '11

Revision: 7405 http://trac.macosforge.org/projects/calendarserver/changeset/7405 Author: glyph(a)apple.com Date: 2011-04-29 14:28:39 -0700 (Fri, 29 Apr 2011) Log Message: ----------- add schema translation for all existing indexes. Modified Paths: -------------- CalendarServer/trunk/txdav/common/datastore/sql_tables.py Modified: CalendarServer/trunk/txdav/common/datastore/sql_tables.py =================================================================== --- CalendarServer/trunk/txdav/common/datastore/sql_tables.py 2011-04-29 21:28:32 UTC (rev 7404) +++ CalendarServer/trunk/txdav/common/datastore/sql_tables.py 2011-04-29 21:28:39 UTC (rev 7405) @@ -254,7 +254,8 @@ # Oracle treats empty strings as NULLs, so we have to accept # NULL values in columns of a string type. Other types should # be okay though. - and typeName not in ('varchar', 'nclob', 'char', 'nchar', 'nvarchar', 'nvarchar2') ): + and typeName not in ('varchar', 'nclob', 'char', 'nchar', + 'nvarchar', 'nvarchar2') ): out.write(' not null') if set([column.model]) in list(table.model.uniques()): out.write(' unique') @@ -265,6 +266,20 @@ out.write('\n);\n\n') + for (num, index) in enumerate(schema.model.indexes): + # Index names combine and repeat multiple table names and column names, + # so several of them conflict once oracle's length limit is applied. + # Luckily, index names don't matter to application code at all, so we + # can add a little disambiguating prefix without breaking anything. + # -glyph + uniqueIndexName = 'IDX_%d_%s' % (num, index.name) + shortIndexName = uniqueIndexName[:30] + shortTableName = index.table.name[:30] + out.write( + 'create index %s on %s (\n ' % (shortIndexName, shortTableName) + ) + out.write(',\n '.join([column.name for column in index.columns])) + out.write('\n);\n\n') if __name__ == '__main__':

1 0

[7404] CalendarServer/trunk/txdav/common/datastore/test/test_sql_tables.py
by source_changes＠macosforge.org 29 Apr '11

29 Apr '11

Revision: 7404 http://trac.macosforge.org/projects/calendarserver/changeset/7404 Author: glyph(a)apple.com Date: 2011-04-29 14:28:32 -0700 (Fri, 29 Apr 2011) Log Message: ----------- Make sure that changes to the schema still allow it to be translated. Modified Paths: -------------- CalendarServer/trunk/txdav/common/datastore/test/test_sql_tables.py Modified: CalendarServer/trunk/txdav/common/datastore/test/test_sql_tables.py =================================================================== --- CalendarServer/trunk/txdav/common/datastore/test/test_sql_tables.py 2011-04-29 21:28:01 UTC (rev 7403) +++ CalendarServer/trunk/txdav/common/datastore/test/test_sql_tables.py 2011-04-29 21:28:32 UTC (rev 7404) @@ -23,7 +23,9 @@ by L{txdav.base.datastore.test.test_parseschema}. """ -from txdav.common.datastore.sql_tables import schema +from cStringIO import StringIO + +from txdav.common.datastore.sql_tables import schema, _translateSchema from twisted.trial.unittest import TestCase class SampleSomeColumns(TestCase): @@ -36,3 +38,15 @@ self.assertEquals(schema.ADDRESSBOOK_OBJECT.RESOURCE_ID.model.name, "RESOURCE_ID") + + def test_schemaTranslation(self): + """ + Basic integration test to make sure that the schema can be translated + without exception. + """ + # TODO: better test coverage of the actual functionality here; there are + # no unit tests. + _translateSchema(StringIO()) + + +

1 0

[7403] CalendarServer/trunk/twext/enterprise/dal
by source_changes＠macosforge.org 29 Apr '11

29 Apr '11

Revision: 7403 http://trac.macosforge.org/projects/calendarserver/changeset/7403 Author: glyph(a)apple.com Date: 2011-04-29 14:28:01 -0700 (Fri, 29 Apr 2011) Log Message: ----------- track indexes in the schema parser and model Modified Paths: -------------- CalendarServer/trunk/twext/enterprise/dal/model.py CalendarServer/trunk/twext/enterprise/dal/parseschema.py CalendarServer/trunk/twext/enterprise/dal/test/test_parseschema.py Modified: CalendarServer/trunk/twext/enterprise/dal/model.py =================================================================== --- CalendarServer/trunk/twext/enterprise/dal/model.py 2011-04-29 19:52:59 UTC (rev 7402) +++ CalendarServer/trunk/twext/enterprise/dal/model.py 2011-04-29 21:28:01 UTC (rev 7403) @@ -329,7 +329,23 @@ yield set(constraint.affectsColumns) +class Index(object): + """ + An L{Index} is an SQL index. + """ + def __init__(self, schema, name, table): + self.name = name + self.table = table + self.columns = [] + schema.indexes.append(self) + + + def addColumn(self, column): + self.columns.append(column) + + + class Sequence(FancyEqMixin, object): """ A sequence object. @@ -337,10 +353,11 @@ compareAttributes = 'name'.split() - def __init__(self, name): + def __init__(self, schema, name): _checkstr(name) self.name = name self.referringColumns = [] + schema.sequences.append(self) def __repr__(self): @@ -348,6 +365,18 @@ +def _namedFrom(name, sequence): + """ + Retrieve an item with a given name attribute from a given sequence, or raise + a L{KeyError}. + """ + for item in sequence: + if item.name == name: + return item + raise KeyError(name) + + + class Schema(object): """ A schema containing tables, indexes, and sequences. @@ -356,6 +385,7 @@ def __init__(self, filename='<string>'): self.filename = filename self.tables = [] + self.indexes = [] self.sequences = [] @@ -364,17 +394,14 @@ def tableNamed(self, name): - for table in self.tables: - if table.name == name: - return table - raise KeyError(name) + return _namedFrom(name, self.tables) def sequenceNamed(self, name): - for sequence in self.sequences: - if sequence.name == name: - return sequence - raise KeyError(name) + return _namedFrom(name, self.sequences) + def indexNamed(self, name): + return _namedFrom(name, self.indexes) + Modified: CalendarServer/trunk/twext/enterprise/dal/parseschema.py =================================================================== --- CalendarServer/trunk/twext/enterprise/dal/parseschema.py 2011-04-29 19:52:59 UTC (rev 7402) +++ CalendarServer/trunk/twext/enterprise/dal/parseschema.py 2011-04-29 21:28:01 UTC (rev 7403) @@ -26,9 +26,8 @@ from sqlparse.sql import (Comment, Identifier, Parenthesis, IdentifierList, Function) -from twext.enterprise.dal.model import Schema, Table, SQLType, ProcedureCall -from twext.enterprise.dal.model import Constraint -from twext.enterprise.dal.model import Sequence +from twext.enterprise.dal.model import ( + Schema, Table, SQLType, ProcedureCall, Constraint, Sequence, Index) @@ -116,9 +115,31 @@ t = tableFromCreateStatement(schema, stmt) t.addComment(preface) elif createType == u'SEQUENCE': - schema.sequences.append( - Sequence( - stmt.token_next(2, True).get_name().encode('utf-8'))) + Sequence(schema, + stmt.token_next(2, True).get_name().encode('utf-8')) + elif createType == u'INDEX': + signifindex = iterSignificant(stmt) + expect(signifindex, ttype=Keyword.DDL, value='CREATE') + expect(signifindex, ttype=Keyword, value='INDEX') + indexName = nameOrIdentifier(signifindex.next()) + expect(signifindex, ttype=Keyword, value='ON') + [tableName, columnArgs] = iterSignificant(expect(signifindex, + cls=Function)) + tableName = nameOrIdentifier(tableName) + arggetter = iterSignificant(columnArgs) + + expect(arggetter, ttype=Punctuation, value=u'(') + valueOrValues = arggetter.next() + if isinstance(valueOrValues, IdentifierList): + valuelist = valueOrValues.get_identifiers() + else: + valuelist = [valueOrValues] + expect(arggetter, ttype=Punctuation, value=u')') + + idx = Index(schema, indexName, schema.tableNamed(tableName)) + for token in valuelist: + columnName = nameOrIdentifier(token) + idx.addColumn(idx.table.columnNamed(columnName)) elif stmt.get_type() == 'INSERT': insertTokens = iterSignificant(stmt) expect(insertTokens, ttype=Keyword.DML, value='INSERT') @@ -412,7 +433,7 @@ """ if ttype is not None: if nextval.ttype != ttype: - raise ViolatedExpectation(ttype, '%s:%s' % (nextval.ttype, nextval)) + raise ViolatedExpectation(ttype, '%s:%r' % (nextval.ttype, nextval)) if value is not None: if nextval.value.upper() != value.upper(): raise ViolatedExpectation(value, nextval.value) Modified: CalendarServer/trunk/twext/enterprise/dal/test/test_parseschema.py =================================================================== --- CalendarServer/trunk/twext/enterprise/dal/test/test_parseschema.py 2011-04-29 19:52:59 UTC (rev 7402) +++ CalendarServer/trunk/twext/enterprise/dal/test/test_parseschema.py 2011-04-29 21:28:01 UTC (rev 7403) @@ -244,3 +244,29 @@ self.assertEquals(s.tableNamed("c").columnNamed("d").cascade, True) + def test_indexes(self): + """ + A 'create index' statement will add an L{Index} object to a L{Schema}'s + C{indexes} list. + """ + s = Schema() + addSQLToSchema( + s, + """ + create table q (b integer); -- noise + create table a (b integer primary key, c integer); + create table z (c integer); -- make sure we get the right table + + create index idx_a_b on a(b); + create index idx_a_b_c on a(c, b); + """) + + a = s.tableNamed("a") + b = s.indexNamed("idx_a_b") + bc = s.indexNamed('idx_a_b_c') + self.assertEquals(b.table, a) + self.assertEquals(b.columns, [a.columnNamed("b")]) + self.assertEquals(bc.table, a) + self.assertEquals(bc.columns, [a.columnNamed("c"), a.columnNamed("b")]) + +

1 0

[7402] CalendarServer/trunk/support
by source_changes＠macosforge.org 29 Apr '11

29 Apr '11

Revision: 7402 http://trac.macosforge.org/projects/calendarserver/changeset/7402 Author: wsanchez(a)apple.com Date: 2011-04-29 12:52:59 -0700 (Fri, 29 Apr 2011) Log Message: ----------- This is now 3.1-dev Modified Paths: -------------- CalendarServer/trunk/support/submit CalendarServer/trunk/support/version.py Modified: CalendarServer/trunk/support/submit =================================================================== --- CalendarServer/trunk/support/submit 2011-04-29 19:51:33 UTC (rev 7401) +++ CalendarServer/trunk/support/submit 2011-04-29 19:52:59 UTC (rev 7402) @@ -23,7 +23,7 @@ set -e set -u -version="13"; +version="14"; wd="$(cd "$(dirname "$0")" && pwd)"; src="$(cd "${wd}/.." && pwd)"; Modified: CalendarServer/trunk/support/version.py =================================================================== --- CalendarServer/trunk/support/version.py 2011-04-29 19:51:33 UTC (rev 7401) +++ CalendarServer/trunk/support/version.py 2011-04-29 19:52:59 UTC (rev 7402) @@ -24,7 +24,7 @@ # Compute the version number. # - base_version = "3.0" + base_version = "3.1" branches = ( "tags/release/CalendarServer-" + base_version,

1 0

[7401] CalendarServer/branches/more-deferreds-4/
by source_changes＠macosforge.org 29 Apr '11

29 Apr '11

Revision: 7401 http://trac.macosforge.org/projects/calendarserver/changeset/7401 Author: wsanchez(a)apple.com Date: 2011-04-29 12:51:33 -0700 (Fri, 29 Apr 2011) Log Message: ----------- obsolete Removed Paths: ------------- CalendarServer/branches/more-deferreds-4/

1 0

[7400] CalendarServer/branches/more-deferreds-3/
by source_changes＠macosforge.org 29 Apr '11

29 Apr '11

Revision: 7400 http://trac.macosforge.org/projects/calendarserver/changeset/7400 Author: wsanchez(a)apple.com Date: 2011-04-29 12:51:31 -0700 (Fri, 29 Apr 2011) Log Message: ----------- obsolete Removed Paths: ------------- CalendarServer/branches/more-deferreds-3/

1 0

[7399] CalendarServer/branches/more-deferreds-2/
by source_changes＠macosforge.org 29 Apr '11

29 Apr '11

Revision: 7399 http://trac.macosforge.org/projects/calendarserver/changeset/7399 Author: wsanchez(a)apple.com Date: 2011-04-29 12:51:29 -0700 (Fri, 29 Apr 2011) Log Message: ----------- obsolete Removed Paths: ------------- CalendarServer/branches/more-deferreds-2/

1 0

[7398] CalendarServer/branches/more-deferreds/
by source_changes＠macosforge.org 29 Apr '11

29 Apr '11

Revision: 7398 http://trac.macosforge.org/projects/calendarserver/changeset/7398 Author: wsanchez(a)apple.com Date: 2011-04-29 12:51:27 -0700 (Fri, 29 Apr 2011) Log Message: ----------- obsolete Removed Paths: ------------- CalendarServer/branches/more-deferreds/

1 0

[7397] CalendarServer/branches/users/wsanchez/deployment-4548-fb-rollback/
by source_changes＠macosforge.org 29 Apr '11

29 Apr '11

Revision: 7397 http://trac.macosforge.org/projects/calendarserver/changeset/7397 Author: wsanchez(a)apple.com Date: 2011-04-29 12:50:56 -0700 (Fri, 29 Apr 2011) Log Message: ----------- obsolete Removed Paths: ------------- CalendarServer/branches/users/wsanchez/deployment-4548-fb-rollback/

1 0

[7396] CalendarServer/branches/users/wsanchez/deployment-fileprops/
by source_changes＠macosforge.org 29 Apr '11

29 Apr '11

Revision: 7396 http://trac.macosforge.org/projects/calendarserver/changeset/7396 Author: wsanchez(a)apple.com Date: 2011-04-29 12:50:52 -0700 (Fri, 29 Apr 2011) Log Message: ----------- obsolete Removed Paths: ------------- CalendarServer/branches/users/wsanchez/deployment-fileprops/

1 0