open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DB schema change: rename 'when' to 'server_rx'

Browse Source
This commit is contained in:
Brian Warner 2016-05-05 18:27:01 -07:00
parent cd9f6e4377
commit fe2dfc1a35
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wormhole/server/db-schemas/v1.sql
View File

@ -15,7 +15,7 @@ CREATE TABLE `messages`
`phase` VARCHAR, -- not numeric, more of a PAKE-phase indicator string
-- phase="_allocate" and "_deallocate" are used internally
`body` VARCHAR,
`when` INTEGER
`server_rx` INTEGER
);
CREATE INDEX `messages_idx` ON `messages` (`appid`, `channelid`);

20
src/wormhole/server/rendezvous.py
View File

@ -36,7 +36,7 @@ class Channel:
db = self._db
for row in db.execute("SELECT * FROM `messages`"
" WHERE `appid`=? AND `channelid`=?"
" ORDER BY `when` ASC",
" ORDER BY `server_rx` ASC",
(self._appid, self._channelid)).fetchall():
if row["phase"] in (u"_allocate", u"_deallocate"):
continue
@ -57,7 +57,7 @@ class Channel:
def _add_message(self, side, phase, body):
db = self._db
db.execute("INSERT INTO `messages`"
" (`appid`, `channelid`, `side`, `phase`, `body`, `when`)"
" (`appid`, `channelid`, `side`, `phase`, `body`, `server_rx`)"
" VALUES (?,?,?,?, ?,?)",
(self._appid, self._channelid, side, phase,
body, time.time()))
@ -91,15 +91,15 @@ class Channel:
def is_idle(self):
if self._listeners:
return False
c = self._db.execute("SELECT `when` FROM `messages`"
c = self._db.execute("SELECT `server_rx` FROM `messages`"
" WHERE `appid`=? AND `channelid`=?"
" ORDER BY `when` DESC LIMIT 1",
" ORDER BY `server_rx` DESC LIMIT 1",
(self._appid, self._channelid))
rows = c.fetchall()
if not rows:
return True
old = time.time() - CHANNEL_EXPIRATION_TIME
if rows[0]["when"] < old:
if rows[0]["server_rx"] < old:
return True
return False
@ -121,7 +121,7 @@ class Channel:
log.msg("_summarize was given zero messages") # shouldn't happen
return
started = min([m["when"] for m in messages])
started = min([m["server_rx"] for m in messages])
# 'total_time' is how long the channel was occupied. That ends now,
# both for channels that got pruned for inactivity, and for channels
# that got pruned because of two DEALLOCATE messages
@ -134,12 +134,12 @@ class Channel:
return (started, "crowded", total_time, None)
# exactly two sides were involved
A_side = sorted(messages, key=lambda m: m["when"])[0]["side"]
A_side = sorted(messages, key=lambda m: m["server_rx"])[0]["side"]
B_side = list(all_sides - set([A_side]))[0]
# How long did the first side wait until the second side showed up?
first_A = min([m["when"] for m in messages if m["side"] == A_side])
first_B = min([m["when"] for m in messages if m["side"] == B_side])
first_A = min([m["server_rx"] for m in messages if m["side"] == A_side])
first_B = min([m["server_rx"] for m in messages if m["side"] == B_side])
waiting_time = first_B - first_A
# now, were all sides closed? If not, this is "pruney"
@ -168,7 +168,7 @@ class Channel:
db = self._db
c = self._db.execute("SELECT * FROM `messages`"
" WHERE `appid`=? AND `channelid`=?"
" ORDER BY `when`",
" ORDER BY `server_rx`",
(self._appid, self._channelid))
messages = c.fetchall()
summary = self._summarize(messages, time.time())

26
src/wormhole/test/test_server.py
View File

@ -728,33 +728,33 @@ class Summary(unittest.TestCase):
A = rendezvous.ALLOCATE
D = rendezvous.DEALLOCATE
messages = [{"when": 1, "side": "a", "phase": A}]
messages = [{"server_rx": 1, "side": "a", "phase": A}]
self.failUnlessEqual(c._summarize(messages, 2),
(1, "lonely", 1, None))
messages = [{"when": 1, "side": "a", "phase": A},
{"when": 2, "side": "a", "phase": D, "body": "lonely"},
messages = [{"server_rx": 1, "side": "a", "phase": A},
{"server_rx": 2, "side": "a", "phase": D, "body": "lonely"},
]
self.failUnlessEqual(c._summarize(messages, 3),
(1, "lonely", 2, None))
messages = [{"when": 1, "side": "a", "phase": A},
{"when": 2, "side": "b", "phase": A},
{"when": 3, "side": "c", "phase": A},
messages = [{"server_rx": 1, "side": "a", "phase": A},
{"server_rx": 2, "side": "b", "phase": A},
{"server_rx": 3, "side": "c", "phase": A},
]
self.failUnlessEqual(c._summarize(messages, 4),
(1, "crowded", 3, None))
base = [{"when": 1, "side": "a", "phase": A},
{"when": 2, "side": "a", "phase": "pake", "body": "msg1"},
{"when": 10, "side": "b", "phase": "pake", "body": "msg2"},
{"when": 11, "side": "b", "phase": "data", "body": "msg3"},
{"when": 20, "side": "a", "phase": "data", "body": "msg4"},
base = [{"server_rx": 1, "side": "a", "phase": A},
{"server_rx": 2, "side": "a", "phase": "pake", "body": "msg1"},
{"server_rx": 10, "side": "b", "phase": "pake", "body": "msg2"},
{"server_rx": 11, "side": "b", "phase": "data", "body": "msg3"},
{"server_rx": 20, "side": "a", "phase": "data", "body": "msg4"},
]
def make_moods(A_mood, B_mood):
return base + [
{"when": 21, "side": "a", "phase": D, "body": A_mood},
{"when": 30, "side": "b", "phase": D, "body": B_mood},
{"server_rx": 21, "side": "a", "phase": D, "body": A_mood},
{"server_rx": 30, "side": "b", "phase": D, "body": B_mood},
]
self.failUnlessEqual(c._summarize(make_moods("happy", "happy"), 41),