ALTER TABLE message RENAME TO message_old;

DROP INDEX message_senderTimestamp;
DROP INDEX message_receiverTimestamp;
DROP INDEX i_msg_1;
DROP INDEX i_msg_2;

CREATE TABLE message (
  pubsubTopic BYTEA NOT NULL,
  contentTopic BYTEA NOT NULL,
  payload BYTEA,
  version INTEGER NOT NULL DEFAULT 0,
  timestamp BIGINT NOT NULL,
  id BYTEA,
  messageHash BYTEA, -- Newly added, this will be populated with a counter value
  storedAt BIGINT NOT NULL,
  PRIMARY KEY (messageHash)
);

CREATE INDEX i_ts ON Message (storedAt);
CREATE INDEX i_query ON Message (contentTopic, pubsubTopic, storedAt, id);

INSERT INTO message(pubsubTopic, contentTopic, payload, version, timestamp, id, messageHash, storedAt)
SELECT pubsubTopic, contentTopic, payload, version, senderTimestamp, id, id, receiverTimestamp
FROM message_old;

DROP TABLE message_old;