Abstract: Data races are resolved and rows are deduplicated between upqueries and updates to an underlying database, in a database caching layer on top of the underlying database. The caching layer maintains a dataflow graph of nodes representing row data of the underlying database, database operators, and partially or fully materialized queries, wherein queries that use common row data and/or database operators share corresponding nodes. A data race resolution and row deduplication algorithm may be applied on every node that contains a partial materialization, and is correct regardless of how many times this node is reused throughout the dataflow graph. It prevents any of the nodes from seeing duplicated packets between the external upqueries that are originated from each node and any underlying database change events which the node observes.

Abstract: A branch of a main database is created, comprising a copy of the main database schema. A user edits the branch and requests that it be merged back into the main database. A schema diff is generated and used to determine differences between the main database and the edited branch. The merge is performed if it does not create a conflict. A second branch is created and edited by a second user. When the second user indicates to merge the second branch back into the main database, differences between the two branches are determined, relative to the main database. If merging the second branch back into the main database on top of the first branch does not create a conflict, a three-way merge is performed of the first branch, the second branch, and the version of the main database from which the first and second branches were generated.

Abstract: A branch of a main database is created, comprising a copy of the main database schema. A user edits the branch and requests that it be merged back into the main database. A schema diff is generated and used to determine differences between the main database and the edited branch. The merge is performed if it does not create a conflict. A second branch is created and edited by a second user. When the second user indicates to merge the second branch back into the main database, differences between the two branches are determined, relative to the main database. If merging the second branch back into the main database on top of the first branch does not create a conflict, a three-way merge is performed of the first branch, the second branch, and the version of the main database from which the first and second branches were generated.

Abstract: A branch of a main database is created, comprising a copy of the main database schema. A user edits the branch and requests that it be merged back into the main database. A schema diff is generated and used to determine differences between the main database and the edited branch. The merge is performed if it does not create a conflict. A second branch is created and edited by a second user. When the second user indicates to merge the second branch back into the main database, differences between the two branches are determined, relative to the main database. If merging the second branch back into the main database on top of the first branch does not create a conflict, a three-way merge is performed of the first branch, the second branch, and the version of the main database from which the first and second branches were generated.