remove the use of max commit from the code where possible (treeverse#374)

nopcoder · web-flow · commit 7864a977c8ff · 2020-08-03T10:54:07.000+03:00
Former-commit-id: c7a1f1944d52d56c79bac1c79a5b4151bcff8df9
diff --git a/catalog/cataloger_commit.go b/catalog/cataloger_commit.go
@@ -85,9 +85,9 @@ func (c *cataloger) Commit(ctx context.Context, repository, branch string, messa
 func commitUpdateCommittedEntriesWithMaxCommit(tx sqlx.Execer, branchID int64, commitID CommitID) (int64, error) {
 	res, err := tx.Exec(`UPDATE catalog_entries_v SET max_commit = $2
 			WHERE branch_id = $1 AND is_committed
-				AND max_commit = $3
+				AND max_commit = catalog_max_commit_id()
 				AND path in (SELECT path FROM catalog_entries_v WHERE branch_id = $1 AND NOT is_committed)`,
-		branchID, commitID, MaxCommitID)
+		branchID, commitID)
 	if err != nil {
 		return 0, err
 	}
diff --git a/catalog/cataloger_create_entry.go b/catalog/cataloger_create_entry.go
@@ -55,9 +55,9 @@ func insertEntry(tx db.Tx, branchID int64, entry *Entry) (string, error) {
 	err := tx.Get(&ctid, `INSERT INTO catalog_entries (branch_id,path,physical_address,checksum,size,metadata,creation_date,is_expired)
                         VALUES ($1,$2,$3,$4,$5,$6, COALESCE($7, NOW()), $8)
 			ON CONFLICT (branch_id,path,min_commit)
-			DO UPDATE SET physical_address=$3, checksum=$4, size=$5, metadata=$6, creation_date=EXCLUDED.creation_date, is_expired=EXCLUDED.is_expired, max_commit=$9
+			DO UPDATE SET physical_address=$3, checksum=$4, size=$5, metadata=$6, creation_date=EXCLUDED.creation_date, is_expired=EXCLUDED.is_expired, max_commit=catalog_max_commit_id()
 			RETURNING ctid`,
-		branchID, entry.Path, entry.PhysicalAddress, entry.Checksum, entry.Size, entry.Metadata, dbTime, entry.Expired, MaxCommitID)
+		branchID, entry.Path, entry.PhysicalAddress, entry.Checksum, entry.Size, entry.Metadata, dbTime, entry.Expired)
 	if err != nil {
 		return "", fmt.Errorf("insert entry: %w", err)
 	}
diff --git a/catalog/cataloger_merge.go b/catalog/cataloger_merge.go
@@ -128,8 +128,8 @@ func (c *cataloger) doMergeByRelation(tx db.Tx, relation RelationType, leftID, r
 
 func (c *cataloger) mergeFromFather(tx db.Tx, previousMaxCommitID, nextCommitID CommitID, fatherID, sonID int64, committer string, msg string, metadata Metadata) error {
 	_, err := tx.Exec(`UPDATE catalog_entries SET max_commit = $2
-			WHERE branch_id = $1 AND max_commit = $3 AND path in (SELECT path FROM `+diffResultsTableName+` WHERE diff_type IN ($4,$5))`,
-		sonID, previousMaxCommitID, MaxCommitID, DifferenceTypeRemoved, DifferenceTypeChanged)
+			WHERE branch_id = $1 AND max_commit = catalog_max_commit_id() AND path in (SELECT path FROM `+diffResultsTableName+` WHERE diff_type IN ($3,$4))`,
+		sonID, previousMaxCommitID, DifferenceTypeRemoved, DifferenceTypeChanged)
 	if err != nil {
 		return err
 	}
