diff --git a/p6walkthrough.mp4 b/oldp6walkthrough.mp4 similarity index 100% rename from p6walkthrough.mp4 rename to oldp6walkthrough.mp4 diff --git a/p6.md b/p6.md index 02aff1e40d097ad1a7c65c7ba993fb837a18be8e..344b0d864a89f4f0c38af8a85db649e71c5a206a 100644 --- a/p6.md +++ b/p6.md @@ -159,6 +159,23 @@ only by `Apply()` calls. These calls are immediate for non-transactional updates, but *calls for transactional updates are delayed until a transaction is known to have committed*. +**Note:** All transactions can read their own writes without issue. In +other words, reads of transaction-local writes are not added to the +annotations. In the following assume the last write prior to +transaction $t_1$ is version 4: +``` +START trans 1 +read 12,1: "before trans" +write 12,1: "in trans" +read 12,1: "in trans" +FINISH,12-4 +``` +the second write is not added to the annotation, only the first +is. Note that it is correct to have multiple entries for a given oid +in the readset, but only a the *first* version for a given oid needs +to be included in the annotation. + + ## Details - Start/finish transaction commands should have *oids* matching their *tids*. - Distinct transactions should have distinct *tids*. diff --git a/p6intCRDT.mp4 b/p6intCRDT.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..d0da1be9c4559e9a6ba66081ff904707dd5f3bbb Binary files /dev/null and b/p6intCRDT.mp4 differ diff --git a/p6kv.2.mp4 b/p6kv.2.mp4 new file mode 100644 index 0000000000000000000000000000000000000000..c38ee6497ab80ab6e974f6e4501d766790527c09 Binary files /dev/null and b/p6kv.2.mp4 differ diff --git a/p6scripts.png b/p6scripts.png new file mode 100644 index 0000000000000000000000000000000000000000..e28c3a6ac8f872d88ddb95ed54b4ab2bda7ae44a Binary files /dev/null and b/p6scripts.png differ