From b74cf4b6ea8553aee6f253b08db810d0f1974e49 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Tue, 30 Oct 2018 19:14:16 +0000
Subject: [PATCH] Update comments in sqlite3session.c to describe the format of
 "rebase blobs", as well as changesets and patchsets.

FossilOrigin-Name: bf93f7b56b1d15682988daf3f1c293caf755433defdecd52ba8782fc40e92bd7
---
 ext/session/sqlite3session.c | 36 ++++++++++++++++++++++++++++++++++++
 manifest                     | 14 +++++++-------
 manifest.uuid                |  2 +-
 3 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c
index 465af8d6e1..df4323f3bd 100644
--- a/ext/session/sqlite3session.c
+++ b/ext/session/sqlite3session.c
@@ -246,6 +246,42 @@ struct SessionTable {
 ** The records associated with INSERT changes are in the same format as for
 ** changesets. It is not possible for a record associated with an INSERT
 ** change to contain a field set to "undefined".
+**
+** REBASE BLOB FORMAT:
+**
+** A rebase blob may be output by sqlite3changeset_apply_v2() and its 
+** streaming equivalent for use with the sqlite3_rebaser APIs to rebase
+** existing changesets. A rebase blob contains one entry for each conflict
+** resolved using either the OMIT or REPLACE strategies within the apply_v2()
+** call.
+**
+** The format used for a rebase blob is very similar to that used for
+** changesets. All entries related to a single table are grouped together.
+**
+** Each group of entries begins with a table header in changeset format:
+**
+**   1 byte: Constant 0x54 (capital 'T')
+**   Varint: Number of columns in the table.
+**   nCol bytes: 0x01 for PK columns, 0x00 otherwise.
+**   N bytes: Unqualified table name (encoded using UTF-8). Nul-terminated.
+**
+** Followed by one or more entries associated with the table.
+**
+**   1 byte: Either SQLITE_INSERT (0x12), DELETE (0x09).
+**   1 byte: Flag. 0x01 for REPLACE, 0x00 for OMIT.
+**   record: (in the record format defined above).
+**
+** In a rebase blob, the first field is set to SQLITE_INSERT if the change
+** that caused the conflict was an INSERT or UPDATE, or to SQLITE_DELETE if
+** it was a DELETE. The second field is set to 0x01 if the conflict 
+** resolution strategy was REPLACE, or 0x00 if it was OMIT.
+**
+** If the change that caused the conflict was a DELETE, then the single
+** record is a copy of the old.* record from the original changeset. If it
+** was an INSERT, then the single record is a copy of the new.* record. If
+** the conflicting change was an UPDATE, then the single record is a copy
+** of the new.* record with the PK fields filled in based on the original
+** old.* record.
 */
 
 /*
diff --git a/manifest b/manifest
index 39de619cd5..1e5c72be28 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Split\sthe\sSQLITE_WriteSchema\sflag\sin\stwo\sflags,\sWriteSchema\sand\nSQLITE_NoSchemaError.\s\sSet\sonly\sWriteSchema\son\sa\sVACUUM\sto\savoid\sproblems\nwhen\strying\sto\svacuum\sa\scorrupt\sdatabase.\s\sWith\sthis\schange,\sthe\ssize\nof\sthe\sflags\sfield\son\ssqlite3\smust\sgrow\sfrom\s32\sto\s64\sbytes.
-D 2018-10-30T16:25:35.241
+C Update\scomments\sin\ssqlite3session.c\sto\sdescribe\sthe\sformat\sof\s"rebase\sblobs",\nas\swell\sas\schangesets\sand\spatchsets.
+D 2018-10-30T19:14:16.577
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 64113b9c489de88bf5ea29d7426fa3f63938ee5f5e4a4fea1f6e62a25efba177
@@ -417,7 +417,7 @@ F ext/session/sessioninvert.test ae1a003a9ab1f8d64227dbb5c3a4c97e65b561b01e7b295
 F ext/session/sessionrebase.test 4e1bcfd26fd8ed8ac571746f56cceeb45184f4d65490ea0d405227cfc8a9cba8
 F ext/session/sessionstat1.test 41cd97c2e48619a41cdf8ae749e1b25f34719de638689221aa43971be693bf4e
 F ext/session/sessionwor.test 2f3744236dc8b170a695b7d8ddc8c743c7e79fdc
-F ext/session/sqlite3session.c 8772d3cb9124a14f85c7c9ca2bc4931f1180ee99acf5386bdfdd6892455b2443
+F ext/session/sqlite3session.c dbd6f7a89c1236d8e7b58f4e217391670ce91b9e6f85c16ba02832674ef0cf3c
 F ext/session/sqlite3session.h 05351d2f50a1203fdffbeb590fdbbc796c9a6bfcd0c9b26cf6db3854e3eb4294
 F ext/session/test_session.c 98797aba475a799376c9a42214f2d1debf2d0c3cb657d9c8bbf4f70bf3fb4aec
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
@@ -1774,7 +1774,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 90b2a684f775e1468d63bf950119cf0aaa62b5a449f518e7cc513c314191dd14
-R debb9c0d1e782e1821ad97f71be70e84
-U drh
-Z 85000e55a119438a8ba57afecbd7a3a5
+P 4f9878107a54356b7105fa1db7655ee239685d570436f6ad4d4221c9bd829b3d
+R 622ca62823c1f2dbd276de64ff12f603
+U dan
+Z 735b392b2384d31c91535992371336a6
diff --git a/manifest.uuid b/manifest.uuid
index 4e4d0bdd96..995f71869d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4f9878107a54356b7105fa1db7655ee239685d570436f6ad4d4221c9bd829b3d
\ No newline at end of file
+bf93f7b56b1d15682988daf3f1c293caf755433defdecd52ba8782fc40e92bd7
\ No newline at end of file