complete

Author: wss404

db/btree.go

@@ -89,8 +89,8 @@ func (p *LeafPage) leafNodeValue(cellNum uint32_t) *Row {
 }
 
 func (p *LeafPage) initializeLeafNode() {
-	p.setPageType(PageLeaf) // actually, it's not necessary since default PageType is PageLeaf
-	p.setNodeRoot(false)
+	//p.setPageType(PageLeaf) // actually, it's not necessary since default PageType is PageLeaf
+	//p.setNodeRoot(false)
 	*p.leafNodeNumCells() = 0
 	*p.leafNodeNextLeaf() = 0
 }
@@ -143,8 +143,6 @@ func (c *Cursor) leafNodeSplitAndInsert(key uint32_t, value *Row) {
 	if oldPage.header.isRoot != 0 {
 		c.table.createNewRoot(newPageNum)
 	} else {
-		//fmt.Println("Need to implement updating parent after split.")
-		//os.Exit(ExitFailure)
 		parentPageNum := oldPage.header.parentPointer
 		newMax := oldPage.getMaxKey()
 		parentHeader, parentBody := c.table.pager.getPage(parentPageNum)
@@ -161,8 +159,6 @@ func (p *Pager) getUnusedPageNum() uint32_t { return p.numPages }
 
 func (t *Table) createNewRoot(rightChildPageNum uint32_t) {
 	rootHeader, rootBody := t.pager.getPage(t.rootPageNum)
-	//root := LeafPage{header: rootHeader, body: (*LeafPageBody)(rootBody)}
-	//rightChild := t.pager.getPage(rightChildPageNum)
 	leftChildPageNum := t.pager.getUnusedPageNum()
 	leftChildHeader, leftChildBody := t.pager.getPage(leftChildPageNum)
 	leftChild := LeafPage{header: leftChildHeader, body: (*LeafPageBody)(leftChildBody)}
@@ -172,7 +168,6 @@ func (t *Table) createNewRoot(rightChildPageNum uint32_t) {
 	copy((*[PageBodySize]byte)(leftChildBody)[:], (*[PageBodySize]byte)(rootBody)[:])
 	leftChild.setNodeRoot(false)
 
-	//internalNode := InternalPage{header: new(PageHeader), body: new(InternalPageBody)}
 	newRootHeader := new(PageHeader)
 	newRootBody := new(InternalPageBody)
 	newRoot := InternalPage{header: newRootHeader, body: newRootBody}
@@ -352,19 +347,20 @@ func (t *Table) internalNodeInsert(parentPageNum, childPageNum uint32_t) {
 	}
 
 	rightChildPageNum := *parentPage.internalNodeRightChild()
-	rightChildHeader, _ := t.pager.getPage(rightChildPageNum)
+	rightChildHeader, rightChildBody := t.pager.getPage(rightChildPageNum)
 
 	var rightChildMaxKey uint32_t
 	if rightChildHeader.pageType == PageLeaf {
-		rightChildPage := LeafPage{header: childHeader, body: (*LeafPageBody)(childBody)}
+		rightChildPage := &LeafPage{header: rightChildHeader, body: (*LeafPageBody)(rightChildBody)}
 		rightChildMaxKey = rightChildPage.getMaxKey()
 	} else {
-		rightChildPage := InternalPage{header: childHeader, body: (*InternalPageBody)(childBody)}
+		rightChildPage := &InternalPage{header: rightChildHeader, body: (*InternalPageBody)(rightChildBody)}
 		rightChildMaxKey = rightChildPage.getMaxKey()
 	}
 	if childMaxKey > rightChildMaxKey {
 		*parentPage.internalNodeChild(originalNumKeys) = rightChildPageNum
 		*parentPage.internalNodeKey(originalNumKeys) = rightChildMaxKey
+		*parentPage.internalNodeRightChild() = childPageNum
 	} else {
 		for i := originalNumKeys; i > index; i-- {
 			destination := parentPage.internalNodeCell(i)

db/db_tutorial.go

@@ -98,11 +98,6 @@ const (
 	PageBodySize   = PageSize - PageHeaderSize
 )
 
-//type Page struct { // to create a pagesize memory without malloc()
-//	header PageHeader
-//	body   [PageBodySize]byte
-//}
-
 type LeafPage struct {
 	header *PageHeader
 	body   *LeafPageBody
@@ -135,7 +130,7 @@ type LeafPageCell struct {
 }
 
 type InternalPageCell struct {
-	value uint32_t        //pageNum
+	value uint32_t //pageNum
 	key   uint32_t
 }
 
@@ -378,9 +373,6 @@ func doMetaCommand(inputBuffer *InputBuffer, table *Table) MetaCommandResult {
 		return MetaCommandSuccess
 	} else if strings.TrimSpace(string(inputBuffer.buffer)) == ".btree" {
 		fmt.Println("Tree:")
-		//header, body := table.pager.getPage(0)
-		//leafPage := LeafPage{header: header, body: (*LeafPageBody)(body)}
-		//leafPage.printLeafNode()
 		table.pager.printTree(0, 0)
 		return MetaCommandSuccess
 	} else if strings.TrimSpace(string(inputBuffer.buffer)) == ".pages" {
@@ -390,29 +382,59 @@ func doMetaCommand(inputBuffer *InputBuffer, table *Table) MetaCommandResult {
 		}
 		return MetaCommandSuccess
 	} else if strings.TrimSpace(string(inputBuffer.buffer)) == ".keys" {
-		fmt.Println("keys:")
-	  	for i := uint32_t(0); i < table.pager.numPages; i++ {
-	  		header, body := table.pager.getPage(i)
-	  		if header.pageType == PageLeaf {
-	  			cells := (*LeafPageBody)(body).cells
-	  			fmt.Println("leaf page ", i)
-	  			for _, c := range cells {
-	  				fmt.Println(c.key)
-				}
-			} else if header.pageType == PageInternal {
-				fmt.Println("internal page ", i)
-				cells := (*InternalPageBody)(body).cells
-				for _, c := range cells {
-					fmt.Println(c.key)
-				}
-			}
-	  	}
-	  	return MetaCommandSuccess
-	  }
+		printKeys(table)
+		return MetaCommandSuccess
+	} else if strings.TrimSpace(string(inputBuffer.buffer)) == ".kvs" {
+		printKvs(table)
+		return MetaCommandSuccess
+	}
 
 	return MetaCommandUnrecognizedCommand
 }
 
+func printKeys(table *Table) {
+	fmt.Println("keys:")
+	for i := uint32_t(0); i < table.pager.numPages; i++ {
+		header, body := table.pager.getPage(i)
+		if header.pageType == PageLeaf {
+			cells := (*LeafPageBody)(body).cells
+			fmt.Println("leaf page ", i)
+			for _, c := range cells {
+				fmt.Println(c.key)
+			}
+		} else if header.pageType == PageInternal {
+			fmt.Println("internal page ", i)
+			cells := (*InternalPageBody)(body).cells
+			for _, c := range cells {
+				fmt.Println(c.key)
+			}
+		}
+	}
+}
+
+func printKvs(table *Table) {
+	fmt.Println("keys&values:")
+	for i := uint32_t(0); i < table.pager.numPages; i++ {
+		header, body := table.pager.getPage(i)
+		if header.pageType == PageLeaf {
+			cells := (*LeafPageBody)(body).cells
+			fmt.Println("leaf page ", i)
+			fmt.Println("num rows: ", header.numCells)
+			for _, c := range cells {
+				fmt.Println(c.key)
+			}
+		} else if header.pageType == PageInternal {
+			fmt.Println("internal page ", i)
+			fmt.Println("num rows: ", header.numCells)
+			fmt.Println("right child: ", (*InternalPageBody)(body).rightChild)
+			cells := (*InternalPageBody)(body).cells
+			for _, c := range cells {
+				fmt.Println(c.key, c.value)
+			}
+		}
+	}
+}
+
 func prepareStatement(inputBuffer *InputBuffer, statement *Statement) PrepareResult {
 	bufferContent := strings.TrimSpace(string(inputBuffer.buffer))
 	if len(bufferContent) >= 6 {