diff --git a/synapse/api/events/factory.py b/synapse/api/events/factory.py
index 0d94850cec..74d0ef77f4 100644
--- a/synapse/api/events/factory.py
+++ b/synapse/api/events/factory.py
@@ -58,8 +58,8 @@ class EventFactory(object):
random_string(10), self.hs.hostname
)
- if "ts" not in kwargs:
- kwargs["ts"] = int(self.clock.time_msec())
+ if "origin_server_ts" not in kwargs:
+ kwargs["origin_server_ts"] = int(self.clock.time_msec())
# The "age" key is a delta timestamp that should be converted into an
# absolute timestamp the minute we see it.
diff --git a/synapse/federation/pdu_codec.py b/synapse/federation/pdu_codec.py
index cef61108dd..e8180d94fd 100644
--- a/synapse/federation/pdu_codec.py
+++ b/synapse/federation/pdu_codec.py
@@ -96,7 +96,7 @@ class PduCodec(object):
if k not in ["event_id", "room_id", "type", "prev_events"]
})
- if "ts" not in kwargs:
- kwargs["ts"] = int(self.clock.time_msec())
+ if "origin_server_ts" not in kwargs:
+ kwargs["origin_server_ts"] = int(self.clock.time_msec())
return Pdu(**kwargs)
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py
index de36a80e41..7043fcc504 100644
--- a/synapse/federation/persistence.py
+++ b/synapse/federation/persistence.py
@@ -157,7 +157,7 @@ class TransactionActions(object):
transaction.prev_ids = yield self.store.prep_send_transaction(
transaction.transaction_id,
transaction.destination,
- transaction.ts,
+ transaction.origin_server_ts,
[(p["pdu_id"], p["origin"]) for p in transaction.pdus]
)
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index 9363ac7300..092411eaf9 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -421,7 +421,7 @@ class ReplicationLayer(object):
return Transaction(
origin=self.server_name,
pdus=pdus,
- ts=int(self._clock.time_msec()),
+ origin_server_ts=int(self._clock.time_msec()),
destination=None,
)
@@ -589,7 +589,7 @@ class _TransactionQueue(object):
logger.debug("TX [%s] Persisting transaction...", destination)
transaction = Transaction.create_new(
- ts=self._clock.time_msec(),
+ origin_server_ts=self._clock.time_msec(),
transaction_id=str(self._next_txn_id),
origin=self.server_name,
destination=destination,
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index d97aeb698e..dccac2aca7 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -40,7 +40,7 @@ class Pdu(JsonEncodedObject):
{
"pdu_id": "78c",
- "ts": 1404835423000,
+ "origin_server_ts": 1404835423000,
"origin": "bar",
"prev_ids": [
["23b", "foo"],
@@ -55,7 +55,7 @@ class Pdu(JsonEncodedObject):
"pdu_id",
"context",
"origin",
- "ts",
+ "origin_server_ts",
"pdu_type",
"destinations",
"transaction_id",
@@ -82,7 +82,7 @@ class Pdu(JsonEncodedObject):
"pdu_id",
"context",
"origin",
- "ts",
+ "origin_server_ts",
"pdu_type",
"content",
]
@@ -186,7 +186,7 @@ class Transaction(JsonEncodedObject):
"transaction_id",
"origin",
"destination",
- "ts",
+ "origin_server_ts",
"previous_ids",
"pdus",
"edus",
@@ -203,7 +203,7 @@ class Transaction(JsonEncodedObject):
"transaction_id",
"origin",
"destination",
- "ts",
+ "origin_server_ts",
"pdus",
]
@@ -225,10 +225,10 @@ class Transaction(JsonEncodedObject):
@staticmethod
def create_new(pdus, **kwargs):
""" Used to create a new transaction. Will auto fill out
- transaction_id and ts keys.
+ transaction_id and origin_server_ts keys.
"""
- if "ts" not in kwargs:
- raise KeyError("Require 'ts' to construct a Transaction")
+ if "origin_server_ts" not in kwargs:
+ raise KeyError("Require 'origin_server_ts' to construct a Transaction")
if "transaction_id" not in kwargs:
raise KeyError(
"Require 'transaction_id' to construct a Transaction"
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index dba50f1213..30c5103cdd 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -361,7 +361,7 @@ class SQLBaseStore(object):
if "age_ts" not in d:
# For compatibility
- d["age_ts"] = d["ts"] if "ts" in d else 0
+ d["age_ts"] = d["origin_server_ts"] if "origin_server_ts" in d else 0
return self.event_factory.create_event(
etype=d["type"],
diff --git a/synapse/storage/pdu.py b/synapse/storage/pdu.py
index d70467dcd6..61ea979b8a 100644
--- a/synapse/storage/pdu.py
+++ b/synapse/storage/pdu.py
@@ -789,7 +789,7 @@ class PdusTable(Table):
"origin",
"context",
"pdu_type",
- "ts",
+ "origin_server_ts",
"depth",
"is_state",
"content_json",
diff --git a/synapse/storage/schema/pdu.sql b/synapse/storage/schema/pdu.sql
index 16e111a56c..5cc8669912 100644
--- a/synapse/storage/schema/pdu.sql
+++ b/synapse/storage/schema/pdu.sql
@@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS pdus(
origin TEXT,
context TEXT,
pdu_type TEXT,
- ts INTEGER,
+ origin_server_ts INTEGER,
depth INTEGER DEFAULT 0 NOT NULL,
is_state BOOL,
content_json TEXT,
diff --git a/synapse/storage/schema/transactions.sql b/synapse/storage/schema/transactions.sql
index 88e3e4e04d..5f8d01327a 100644
--- a/synapse/storage/schema/transactions.sql
+++ b/synapse/storage/schema/transactions.sql
@@ -16,7 +16,7 @@
CREATE TABLE IF NOT EXISTS received_transactions(
transaction_id TEXT,
origin TEXT,
- ts INTEGER,
+ origin_server_ts INTEGER,
response_code INTEGER,
response_json TEXT,
has_been_referenced BOOL default 0, -- Whether thishas been referenced by a prev_tx
@@ -35,7 +35,7 @@ CREATE TABLE IF NOT EXISTS sent_transactions(
destination TEXT,
response_code INTEGER DEFAULT 0,
response_json TEXT,
- ts INTEGER
+ origin_server_ts INTEGER
);
CREATE INDEX IF NOT EXISTS sent_transaction_dest ON sent_transactions(destination);
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py
index ab4599b468..a9fa959d49 100644
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@@ -87,7 +87,7 @@ class TransactionStore(SQLBaseStore):
txn.execute(query, (code, response_json, transaction_id, origin))
- def prep_send_transaction(self, transaction_id, destination, ts, pdu_list):
+ def prep_send_transaction(self, transaction_id, destination, origin_server_ts, pdu_list):
"""Persists an outgoing transaction and calculates the values for the
previous transaction id list.
@@ -97,7 +97,7 @@ class TransactionStore(SQLBaseStore):
Args:
transaction_id (str)
destination (str)
- ts (int)
+ origin_server_ts (int)
pdu_list (list)
Returns:
@@ -106,10 +106,10 @@ class TransactionStore(SQLBaseStore):
return self.runInteraction(
self._prep_send_transaction,
- transaction_id, destination, ts, pdu_list
+ transaction_id, destination, origin_server_ts, pdu_list
)
- def _prep_send_transaction(self, txn, transaction_id, destination, ts,
+ def _prep_send_transaction(self, txn, transaction_id, destination, origin_server_ts,
pdu_list):
# First we find out what the prev_txs should be.
@@ -131,7 +131,7 @@ class TransactionStore(SQLBaseStore):
None,
transaction_id=transaction_id,
destination=destination,
- ts=ts,
+ origin_server_ts=origin_server_ts,
response_code=0,
response_json=None
))
@@ -251,7 +251,7 @@ class ReceivedTransactionsTable(Table):
fields = [
"transaction_id",
"origin",
- "ts",
+ "origin_server_ts",
"response_code",
"response_json",
"has_been_referenced",
@@ -267,7 +267,7 @@ class SentTransactions(Table):
"id",
"transaction_id",
"destination",
- "ts",
+ "origin_server_ts",
"response_code",
"response_json",
]
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index d86ce83b28..8b1202f6e4 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -99,7 +99,7 @@ class FederationTestCase(unittest.TestCase):
origin="red",
context="my-context",
pdu_type="m.topic",
- ts=123456789000,
+ origin_server_ts=123456789000,
depth=1,
is_state=True,
content_json='{"topic":"The topic"}',
@@ -134,7 +134,7 @@ class FederationTestCase(unittest.TestCase):
origin="red",
context="my-context",
pdu_type="m.text",
- ts=123456789001,
+ origin_server_ts=123456789001,
depth=1,
content_json='{"text":"Here is the message"}',
)
@@ -158,7 +158,7 @@ class FederationTestCase(unittest.TestCase):
origin="red",
destinations=["remote"],
context="my-context",
- ts=123456789002,
+ origin_server_ts=123456789002,
pdu_type="m.test",
content={"testing": "content here"},
depth=1,
@@ -170,14 +170,14 @@ class FederationTestCase(unittest.TestCase):
"remote",
path="/_matrix/federation/v1/send/1000000/",
data={
- "ts": 1000000,
+ "origin_server_ts": 1000000,
"origin": "test",
"pdus": [
{
"origin": "red",
"pdu_id": "abc123def456",
"prev_pdus": [],
- "ts": 123456789002,
+ "origin_server_ts": 123456789002,
"context": "my-context",
"pdu_type": "m.test",
"is_state": False,
@@ -207,7 +207,7 @@ class FederationTestCase(unittest.TestCase):
path="/_matrix/federation/v1/send/1000000/",
data={
"origin": "test",
- "ts": 1000000,
+ "origin_server_ts": 1000000,
"pdus": [],
"edus": [
{
@@ -234,7 +234,7 @@ class FederationTestCase(unittest.TestCase):
"/_matrix/federation/v1/send/1001000/",
"""{
"origin": "remote",
- "ts": 1001000,
+ "origin_server_ts": 1001000,
"pdus": [],
"edus": [
{
diff --git a/tests/federation/test_pdu_codec.py b/tests/federation/test_pdu_codec.py
index 344e1baf60..0754ef92e8 100644
--- a/tests/federation/test_pdu_codec.py
+++ b/tests/federation/test_pdu_codec.py
@@ -68,7 +68,7 @@ class PduCodecTestCase(unittest.TestCase):
context="rooooom",
pdu_type="m.room.message",
origin="bar.com",
- ts=12345,
+ origin_server_ts=12345,
depth=5,
prev_pdus=[("alice", "bob.com")],
is_state=False,
@@ -123,7 +123,7 @@ class PduCodecTestCase(unittest.TestCase):
context="rooooom",
pdu_type="m.room.topic",
origin="bar.com",
- ts=12345,
+ origin_server_ts=12345,
depth=5,
prev_pdus=[("alice", "bob.com")],
is_state=True,
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 35c3a4df7b..219b2c4c5e 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -68,7 +68,7 @@ class FederationTestCase(unittest.TestCase):
pdu_type=MessageEvent.TYPE,
context="foo",
content={"msgtype": u"fooo"},
- ts=0,
+ origin_server_ts=0,
pdu_id="a",
origin="b",
)
@@ -95,7 +95,7 @@ class FederationTestCase(unittest.TestCase):
target_host=self.hostname,
context=room_id,
content={},
- ts=0,
+ origin_server_ts=0,
pdu_id="a",
origin="b",
)
@@ -127,7 +127,7 @@ class FederationTestCase(unittest.TestCase):
state_key="@red:not%s" % self.hostname,
context=room_id,
content={},
- ts=0,
+ origin_server_ts=0,
pdu_id="a",
origin="b",
)
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 84985a8066..1850deacf5 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -39,7 +39,7 @@ ONLINE = PresenceState.ONLINE
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,
- "ts": 1000000,
+ "origin_server_ts": 1000000,
"pdus": [],
"edus": [
{
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index b685373deb..f1d3b27f74 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -29,7 +29,7 @@ from synapse.handlers.typing import TypingNotificationHandler
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,
- "ts": 1000000,
+ "origin_server_ts": 1000000,
"pdus": [],
"edus": [
{
diff --git a/tests/test_state.py b/tests/test_state.py
index b1624f0b25..4b1feaf410 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -599,7 +599,7 @@ def new_fake_pdu(pdu_id, context, pdu_type, state_key, prev_state_id,
prev_state_id=prev_state_id,
origin="example.com",
context="context",
- ts=1405353060021,
+ origin_server_ts=1405353060021,
depth=depth,
content_json="{}",
unrecognized_keys="{}",
|
