テスト追加＆バグ修正

Author: uchijo

plan/multi_buffer_product_plan.go

@@ -41,15 +41,15 @@ func (m *MultiBufferProductPlan) Open() (scan.Scan, error) {
 		return nil, fmt.Errorf("tried to create copy records from rhs in MultiBuffProduct: %w", err)
 	}
 
-	return query.NewMultiBufferProductScan(m.tx, leftScan, temp.TableName(), temp.Layout())
+	return query.NewMultiBufferProductScan(m.tx, leftScan, temp.TableName() + ".tbl", temp.Layout())
 }
 
 func (m *MultiBufferProductPlan) copyRecordsFrom(p Plan) (*query.TempTable, error) {
 	src, err := p.Open()
 	if err != nil {
 		return nil, fmt.Errorf("tried to open TablePlan in MultiBufferProduct: %w", err)
 	}
-	schema := m.Schema()
+	schema := p.Schema()
 	tt, err := query.NewTempTable(m.tx, schema)
 	if err != nil {
 		return nil, fmt.Errorf("tried to create TempTable in MultiBufferProduct: %w", err)

plan/multi_buffer_product_test.go

@@ -0,0 +1,68 @@
+package plan
+
+import (
+	"testing"
+)
+
+func TestMultiBufferProduct(t *testing.T) {
+	db, planner, _ := createTester(t)
+
+	// Create a transaction
+	tx, err := db.NewTx()
+	if err != nil {
+		t.Fatalf("Failed to create transaction: %v", err)
+	}
+	defer tx.Commit()
+
+	// Create a query plan for todo table
+	plan1, err := planner.CreateQueryPlan("SELECT id, title FROM todo", tx)
+	if err != nil {
+		t.Fatalf("Failed to create query plan: %v", err)
+	}
+
+	// create a query plan for todo_detail table
+	plan2, err := planner.CreateQueryPlan("SELECT todo_id, detail, some_score FROM todo_detail", tx)
+	if err != nil {
+		t.Fatalf("Failed to create query plan for todo_detail: %v", err)
+	}
+
+	// Create a MultiBufferProductPlan
+	multiBufferProductPlan := NewMultiBufferProductPcan(tx, plan1, plan2)
+	if multiBufferProductPlan == nil {
+		t.Fatal("Failed to create MultiBufferProductPlan")
+	}
+
+	// check schema
+	if len(multiBufferProductPlan.Schema().Fields()) != 5 {
+		t.Errorf("Expected 5 fields, got %d", len(multiBufferProductPlan.Schema().Fields()))
+	}
+	if !multiBufferProductPlan.Schema().HasField("id") ||
+		!multiBufferProductPlan.Schema().HasField("title") ||
+		!multiBufferProductPlan.Schema().HasField("todo_id") ||
+		!multiBufferProductPlan.Schema().HasField("detail") {
+		t.Error("Schema does not contain expected fields")
+	}
+
+	// Open the scan
+	scan, err := multiBufferProductPlan.Open()
+	if err != nil {
+		t.Fatalf("Failed to open scan: %v", err)
+	}
+	defer scan.Close()
+
+	// check scan length
+	length := 0
+	for {
+		ok, err := scan.Next()
+		if err != nil {
+			t.Fatalf("Failed to get next record: %v", err)
+		}
+		if !ok {
+			break
+		}
+		length++
+	}
+	if length != 12 {
+		t.Errorf("Expected 6 records, got %d", length)
+	}
+}

query/multi_buffer_product_scan.go

@@ -2,6 +2,7 @@ package query
 
 import (
 	"fmt"
+	"log"
 
 	"github.com/team-gonyo/gonyo-db/buffer"
 	"github.com/team-gonyo/gonyo-db/record"
@@ -51,7 +52,10 @@ func NewMultiBufferProductScan(
 func (m *MultiBufferProductScan) BeforeFirst() {
 	m.nextBlockNum = 0
 	// FIXME: エラー握りつぶし
-	_, _ = m.useNextChunk()
+	_, err := m.useNextChunk()
+	if err != nil {
+		log.Printf("failed to invoke MultiBufferProductScan#BeforeFirst(): %v", err)
+	}
 }
 
 // チャンクを移動する

tx/buffer_list.go

@@ -37,7 +37,10 @@ func (bl *bufferList) pin(blk file.BlockId) error {
 }
 
 func (bl *bufferList) unpin(blk file.BlockId) {
-	buff := bl.buffers[blk]
+	buff, ok := bl.buffers[blk]
+	if !ok {
+		return // ブロックが存在しない場合は何もしない
+	}
 	bl.bufferManager.Unpin(buff)
 
 	bl.pins[blk]--