From a78b0c40ed2698e31c749a8c73db5e9bbf6b2424 Mon Sep 17 00:00:00 2001
From: Benjamin Wang <wachao@vmware.com>
Date: Fri, 19 May 2023 19:33:21 +0800
Subject: [PATCH] set page flags directly instead of XOR the value

Signed-off-by: Benjamin Wang <wachao@vmware.com>
---
 freelist.go             |  2 +-
 internal/common/meta.go |  2 +-
 internal/common/page.go | 24 ++++++++++--------------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/freelist.go b/freelist.go
index 81cb1fd..2b09e76 100644
--- a/freelist.go
+++ b/freelist.go
@@ -302,7 +302,7 @@ func (f *freelist) write(p *common.Page) error {
 	// Combine the old free pgids and pgids waiting on an open transaction.
 
 	// Update the header flag.
-	p.FlagsXOR(common.FreelistPageFlag)
+	p.SetFlags(common.FreelistPageFlag)
 
 	// The page.count can only hold up to 64k elements so if we overflow that
 	// number then we handle it by putting the size in the first element.
diff --git a/internal/common/meta.go b/internal/common/meta.go
index b97949a..4517d37 100644
--- a/internal/common/meta.go
+++ b/internal/common/meta.go
@@ -49,7 +49,7 @@ func (m *Meta) Write(p *Page) {
 
 	// Page id is either going to be 0 or 1 which we can determine by the transaction ID.
 	p.id = Pgid(m.txid % 2)
-	p.flags |= MetaPageFlag
+	p.SetFlags(MetaPageFlag)
 
 	// Calculate the checksum.
 	m.checksum = m.Sum64()
diff --git a/internal/common/page.go b/internal/common/page.go
index 504feb8..808484c 100644
--- a/internal/common/page.go
+++ b/internal/common/page.go
@@ -58,19 +58,19 @@ func (p *Page) Typ() string {
 }
 
 func (p *Page) IsBranchPage() bool {
-	return p.flags&BranchPageFlag != 0
+	return p.flags == BranchPageFlag
 }
 
 func (p *Page) IsLeafPage() bool {
-	return p.flags&LeafPageFlag != 0
+	return p.flags == LeafPageFlag
 }
 
 func (p *Page) IsMetaPage() bool {
-	return p.flags&MetaPageFlag != 0
+	return p.flags == MetaPageFlag
 }
 
 func (p *Page) IsFreelistPage() bool {
-	return p.flags&FreelistPageFlag != 0
+	return p.flags == FreelistPageFlag
 }
 
 // Meta returns a pointer to the metadata section of the page.
@@ -81,10 +81,10 @@ func (p *Page) Meta() *Meta {
 func (p *Page) FastCheck(id Pgid) {
 	Assert(p.id == id, "Page expected to be: %v, but self identifies as %v", id, p.id)
 	// Only one flag of page-type can be set.
-	Assert(p.flags == BranchPageFlag ||
-		p.flags == LeafPageFlag ||
-		p.flags == MetaPageFlag ||
-		p.flags == FreelistPageFlag,
+	Assert(p.IsBranchPage() ||
+		p.IsLeafPage() ||
+		p.IsMetaPage() ||
+		p.IsFreelistPage(),
 		"page %v: has unexpected type/flags: %x", p.id, p.flags)
 }
 
@@ -123,7 +123,7 @@ func (p *Page) BranchPageElements() []branchPageElement {
 }
 
 func (p *Page) FreelistPageCount() (int, int) {
-	Assert(p.flags == FreelistPageFlag, fmt.Sprintf("can't get freelist page count from a non-freelist page: %2x", p.flags))
+	Assert(p.IsFreelistPage(), fmt.Sprintf("can't get freelist page count from a non-freelist page: %2x", p.flags))
 
 	// If the page.count is at the max uint16 value (64k) then it's considered
 	// an overflow and the size of the freelist is stored as the first element.
@@ -141,7 +141,7 @@ func (p *Page) FreelistPageCount() (int, int) {
 }
 
 func (p *Page) FreelistPageIds() []Pgid {
-	Assert(p.flags == FreelistPageFlag, fmt.Sprintf("can't get freelist page IDs from a non-freelist page: %2x", p.flags))
+	Assert(p.IsFreelistPage(), fmt.Sprintf("can't get freelist page IDs from a non-freelist page: %2x", p.flags))
 
 	idx, count := p.FreelistPageCount()
 
@@ -185,10 +185,6 @@ func (p *Page) SetFlags(v uint16) {
 	p.flags = v
 }
 
-func (p *Page) FlagsXOR(v uint16) {
-	p.flags |= v
-}
-
 func (p *Page) Count() uint16 {
 	return p.count
 }