1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
*** sqlsem.py-orig Tue Oct 6 22:35:53 1998
--- sqlsem.py Thu Jun 14 16:31:03 2001
***************
*** 17,28 ****
###
# use kjbuckets builtin if available
try:
import kjbuckets
except ImportError:
import kjbuckets0
kjbuckets = kjbuckets0
!
Tuple = kjbuckets.kjDict
Graph = kjbuckets.kjGraph
Set = kjbuckets.kjSet
--- 17,31 ----
###
# use kjbuckets builtin if available
+ pyd=0
try:
import kjbuckets
+ pyd=1
except ImportError:
import kjbuckets0
kjbuckets = kjbuckets0
!
!
Tuple = kjbuckets.kjDict
Graph = kjbuckets.kjGraph
Set = kjbuckets.kjSet
***************
*** 1279,1284 ****
--- 1282,1288 ----
def map(self, assnlist):
"""remap btlist by self. return (tuplelist, attorder)"""
# DON'T eliminate nulls
+ #kjbuckets.debug()
from types import IntType
tt = type
values = []
***************
*** 1296,1302 ****
valtups[i] = 0 # null/false
else:
tup = valtups[i]
! valtups[i] = kjUndump(undumper, tup)
return (valtups, self.attorder)
def relbind(self, dict, db):
--- 1300,1311 ----
valtups[i] = 0 # null/false
else:
tup = valtups[i]
! if pyd:
! valtups[i] = kjUndump((undumper, tup))
! else:
! valtups[i] = kjUndump(undumper, tup)
!
! #kjbuckets.debug(0)
return (valtups, self.attorder)
def relbind(self, dict, db):
***************
*** 2505,2519 ****
undumper = map(None, [0]*ndynamic, range(ndynamic))
undumper = tuple(undumper)
result = list(dynamic)
! kjUndump = kjbuckets.kjUndump
for i in xrange(len(dynamic)):
dyn = dynamic[i]
ldyn = len(dyn)
! #print undumper, dyn
if ldyn==1:
! dynresult = kjUndump(undumper, dyn[0])
else:
! dynresult = kjUndump(undumper, dyn)
result[i] = dynresult
return result
--- 2514,2541 ----
undumper = map(None, [0]*ndynamic, range(ndynamic))
undumper = tuple(undumper)
result = list(dynamic)
!
! #Ad Modified
! #kjUndump = kjbuckets.kjUndump
! kjUndump = kjbuckets.kjUndump
!
for i in xrange(len(dynamic)):
dyn = dynamic[i]
ldyn = len(dyn)
!
!
if ldyn==1:
! if pyd:
! dynresult = kjUndump((undumper, dyn[0]))
! else:
! dynresult = kjUndump(undumper, dyn[0])
else:
! if pyd:
! #Ad convert before calling C module if not error non-unary tuple
! dyntuple=tuple(dyn)
! dynresult = kjUndump(undumper, dyntuple)
! else:
! dynresult = kjUndump(undumper, dyn)
result[i] = dynresult
return result
|
