Merge lp:~therve/storm/fix-compile-cache into lp:storm

[Thomas Herve]

The problem here is that we use the same compile cache for different backends. It's likely to only happen in storm test suite, but I solved it in a generic way anyway using the compiler to identify the cache.

[Jamu Kakar (jkakar)]

Nice one, +1!

review: Approve

=== modified file 'storm/expr.py'
--- storm/expr.py	2011-09-14 15:27:52 +0000
+++ storm/expr.py	2011-09-14 17:58:01 +0000
@@ -801,7 +801,7 @@
         according to this column.
     """
     __slots__ = ("name", "table", "primary", "variable_factory",
-                 "compile_cache")
+                 "compile_cache", "compile_id")
 
     def __init__(self, name=Undef, table=Undef, primary=False,
                  variable_factory=None):
@@ -810,6 +810,7 @@
         self.primary = int(primary)
         self.variable_factory = variable_factory or Variable
         self.compile_cache = None
+        self.compile_id = None
 
 @compile.when(Column)
 def compile_column(compile, column, state):
@@ -821,14 +822,16 @@
             alias = state.aliases.get(column)
             if alias is not None:
                 return compile(alias.name, state, token=True)
-        if column.compile_cache is None:
+        if column.compile_id != id(compile):
             column.compile_cache = compile(column.name, state, token=True)
+            column.compile_id = id(compile)
         return column.compile_cache
     state.push("context", COLUMN_PREFIX)
     table = compile(column.table, state, token=True)
     state.pop()
-    if column.compile_cache is None:
+    if column.compile_id != id(compile):
         column.compile_cache = compile(column.name, state, token=True)
+        column.compile_id = id(compile)
     return "%s.%s" % (table, column.compile_cache)
 
 @compile_python.when(Column)
@@ -876,16 +879,19 @@
 
 
 class Table(FromExpr):
-    __slots__ = ("name", "compile_cache")
+    __slots__ = ("name", "compile_cache", "compile_id")
 
     def __init__(self, name):
         self.name = name
         self.compile_cache = None
+        self.compile_id = None
+
 
 @compile.when(Table)
 def compile_table(compile, table, state):
-    if table.compile_cache is None:
+    if table.compile_id != id(compile):
         table.compile_cache = compile(table.name, state, token=True)
+        table.compile_id = id(compile)
     return table.compile_cache