mirror of
https://github.com/python/cpython.git
synced 2025-11-01 06:01:29 +00:00
Fixes issue1371 and reenables those tests.
Merge r58757 and r58758 from trunk. Undoes incorrect dbtables fix and errant strdup introduced as described below: r58757 | gregory.p.smith | 2007-11-01 14:08:14 -0700 (Thu, 01 Nov 2007) | 4 lines Fix bug introduced in revision 58385. Database keys could no longer have NULL bytes in them. Replace the errant strdup with a malloc+memcpy. Adds a unit test for the correct behavior. r58758 | gregory.p.smith | 2007-11-01 14:15:36 -0700 (Thu, 01 Nov 2007) | 3 lines Undo revision 58533 58534 fixes. Those were a workaround for a problem introduced by 58385.
This commit is contained in:
parent
48decfe740
commit
568065e9d1
3 changed files with 52 additions and 20 deletions
|
|
@ -362,12 +362,11 @@ def __new_rowid(self, table, txn) :
|
|||
unique = 0
|
||||
while not unique:
|
||||
# Generate a random 64-bit row ID string
|
||||
# (note: this code has <64 bits of randomness
|
||||
# (note: might have <64 bits of randomness
|
||||
# but it's plenty for our database id needs!)
|
||||
# We must ensure that no null bytes are in the id value.
|
||||
blist = []
|
||||
for x in range(_rowid_str_len):
|
||||
blist.append(random.randint(1,255))
|
||||
blist.append(random.randint(0,255))
|
||||
newid = bytes(blist)
|
||||
|
||||
# Guarantee uniqueness by adding this key to the database
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue