remove unused refpath index, use take and add txn options

Hitenjain14 · Hitenjain14 · commit 9205fad524ff · 2024-06-15T01:21:58.000+05:30
diff --git a/code/go/0chain.net/blobbercore/allocation/entity.go b/code/go/0chain.net/blobbercore/allocation/entity.go
@@ -207,7 +207,7 @@ func AddToPending(ctx context.Context, clientID, allocationID string, pendingWri
 	defer lock.Unlock()
 
 	pending := new(Pending)
-	err = db.Model(&Pending{}).Where("id=?", key).First(pending).Error
+	err = db.Model(&Pending{}).Where("id=?", key).Take(pending).Error
 	switch {
 	case err == nil:
 		pending.PendingWrite += pendingWrite
diff --git a/code/go/0chain.net/blobbercore/challenge/timing.go b/code/go/0chain.net/blobbercore/challenge/timing.go
@@ -183,7 +183,7 @@ func GetChallengeTiming(challengeID string) (*ChallengeTiming, error) {
 
 	err := datastore.GetStore().WithNewTransaction(func(ctx context.Context) error {
 		tx := datastore.GetStore().GetTransaction(ctx)
-		return tx.Model(&ChallengeTiming{}).Where("challenge_id = ?", challengeID).First(&ch).Error
+		return tx.Model(&ChallengeTiming{}).Where("challenge_id = ?", challengeID).Take(&ch).Error
 	})
 	return ch, err
 }
diff --git a/code/go/0chain.net/blobbercore/datastore/mocket.go b/code/go/0chain.net/blobbercore/datastore/mocket.go
@@ -2,6 +2,7 @@ package datastore
 
 import (
 	"context"
+	"database/sql"
 
 	. "github.com/0chain/blobber/code/go/0chain.net/core/logging"
 	mocket "github.com/selvatico/go-mocket"
@@ -71,7 +72,7 @@ func (store *Mocket) Close() {
 	}
 }
 
-func (store *Mocket) CreateTransaction(ctx context.Context) context.Context {
+func (store *Mocket) CreateTransaction(ctx context.Context,opts ...*sql.TxOptions) context.Context {
 	db := store.db.Begin()
 	return context.WithValue(ctx, ContextKeyTransaction, EnhanceDB(db))
 }
diff --git a/code/go/0chain.net/blobbercore/datastore/postgres.go b/code/go/0chain.net/blobbercore/datastore/postgres.go
@@ -2,6 +2,7 @@ package datastore
 
 import (
 	"context"
+	"database/sql"
 	"fmt"
 	"time"
 
@@ -84,7 +85,7 @@ func (store *postgresStore) Close() {
 	}
 }
 
-func (store *postgresStore) CreateTransaction(ctx context.Context) context.Context {
+func (store *postgresStore) CreateTransaction(ctx context.Context, opts ...*sql.TxOptions) context.Context {
 	db := store.db.WithContext(ctx).Begin()
 	return context.WithValue(ctx, ContextKeyTransaction, EnhanceDB(db))
 }
diff --git a/code/go/0chain.net/blobbercore/datastore/sqlmock.go b/code/go/0chain.net/blobbercore/datastore/sqlmock.go
@@ -2,6 +2,7 @@ package datastore
 
 import (
 	"context"
+	"database/sql"
 
 	. "github.com/0chain/blobber/code/go/0chain.net/core/logging"
 	"github.com/DATA-DOG/go-sqlmock"
@@ -66,7 +67,7 @@ func (store *Sqlmock) Close() {
 	}
 }
 
-func (store *Sqlmock) CreateTransaction(ctx context.Context) context.Context {
+func (store *Sqlmock) CreateTransaction(ctx context.Context, opts ...*sql.TxOptions) context.Context {
 	db := store.db.Begin()
 	return context.WithValue(ctx, ContextKeyTransaction, db)
 }
diff --git a/code/go/0chain.net/blobbercore/datastore/store.go b/code/go/0chain.net/blobbercore/datastore/store.go
@@ -2,6 +2,7 @@ package datastore
 
 import (
 	"context"
+	"database/sql"
 
 	"gorm.io/gorm"
 )
@@ -41,7 +42,7 @@ type Store interface {
 	// GetDB get raw gorm db
 	GetDB() *gorm.DB
 	// CreateTransaction create transaction, and save it in context
-	CreateTransaction(ctx context.Context) context.Context
+	CreateTransaction(ctx context.Context, opts ...*sql.TxOptions) context.Context
 	// GetTransaction get transaction from context
 	GetTransaction(ctx context.Context) *EnhancedDB
 	WithNewTransaction(f func(ctx context.Context) error) error
diff --git a/code/go/0chain.net/blobbercore/handler/handler.go b/code/go/0chain.net/blobbercore/handler/handler.go
@@ -18,18 +18,20 @@ package handler
 
 import (
 	"context"
+	"database/sql"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/0chain/gosdk/core/zcncrypto"
 	"net/http"
 	"os"
 	"runtime/pprof"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/0chain/gosdk/core/zcncrypto"
+
 	"github.com/0chain/blobber/code/go/0chain.net/core/transaction"
 
 	"github.com/go-openapi/runtime/middleware"
@@ -276,7 +278,9 @@ func setupHandlers(r *mux.Router) {
 
 func WithReadOnlyConnection(handler common.JSONResponderF) common.JSONResponderF {
 	return func(ctx context.Context, r *http.Request) (interface{}, error) {
-		ctx = GetMetaDataStore().CreateTransaction(ctx)
+		ctx = GetMetaDataStore().CreateTransaction(ctx, &sql.TxOptions{
+			ReadOnly: true,
+		})
 		tx := GetMetaDataStore().GetTransaction(ctx)
 		defer func() {
 			tx.Rollback()
diff --git a/code/go/0chain.net/blobbercore/handler/handler_common.go b/code/go/0chain.net/blobbercore/handler/handler_common.go
@@ -2,6 +2,7 @@ package handler
 
 import (
 	"context"
+	"database/sql"
 	"errors"
 	"fmt"
 	"net/http"
@@ -133,7 +134,9 @@ func WithStatusConnectionForWM(handler common.StatusCodeResponderF) common.Statu
 		}
 		mutex.Lock()
 		defer mutex.Unlock()
-		ctx = GetMetaDataStore().CreateTransaction(ctx)
+		ctx = GetMetaDataStore().CreateTransaction(ctx, &sql.TxOptions{
+			Isolation: sql.LevelRepeatableRead,
+		})
 		tx := GetMetaDataStore().GetTransaction(ctx)
 		resp, statusCode, err = handler(ctx, r)
 
diff --git a/code/go/0chain.net/blobbercore/readmarker/readmarker.go b/code/go/0chain.net/blobbercore/readmarker/readmarker.go
@@ -126,7 +126,7 @@ func (rm *ReadMarkerEntity) VerifyMarker(ctx context.Context, sa *allocation.All
 func GetLatestReadMarkerEntity(ctx context.Context, clientID, allocID string) (*ReadMarkerEntity, error) {
 	db := datastore.GetStore().GetTransaction(ctx)
 	rm := &ReadMarkerEntity{}
-	err := db.First(rm, "client_id = ? AND allocation_id = ?", clientID, allocID).Error
+	err := db.Take(rm, "client_id = ? AND allocation_id = ?", clientID, allocID).Error
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		latestRM, err := GetLatestReadMarkerEntityFromChain(clientID, allocID)
 		if err != nil {
diff --git a/code/go/0chain.net/blobbercore/reference/ref.go b/code/go/0chain.net/blobbercore/reference/ref.go
@@ -207,21 +207,16 @@ func Mkdir(ctx context.Context, allocationID, destpath string) (*Ref, error) {
 
 // GetReference get FileRef with allcationID and path from postgres
 func GetReference(ctx context.Context, allocationID, path string) (*Ref, error) {
-	ref := &Ref{}
-	db := datastore.GetStore().GetTransaction(ctx)
-	err := db.Where(&Ref{AllocationID: allocationID, Path: path}).First(ref).Error
-	if err != nil {
-		return nil, err
-	}
-	return ref, nil
+	lookupHash := GetReferenceLookup(allocationID, path)
+	return GetReferenceByLookupHash(ctx, allocationID, lookupHash)
 }
 
 // GetLimitedRefFieldsByPath get FileRef selected fields with allocationID and path from postgres
 func GetLimitedRefFieldsByPath(ctx context.Context, allocationID, path string, selectedFields []string) (*Ref, error) {
 	ref := &Ref{}
 	t := datastore.GetStore().GetTransaction(ctx)
 	db := t.Select(selectedFields)
-	err := db.Where(&Ref{AllocationID: allocationID, Path: path}).First(ref).Error
+	err := db.Where(&Ref{AllocationID: allocationID, Path: path}).Take(ref).Error
 	if err != nil {
 		return nil, err
 	}
@@ -236,7 +231,7 @@ func GetLimitedRefFieldsByLookupHashWith(ctx context.Context, allocationID, look
 	err := db.
 		Select(selectedFields).
 		Where(&Ref{LookupHash: lookupHash}).
-		First(ref).Error
+		Take(ref).Error
 
 	if err != nil {
 		return nil, err
@@ -249,7 +244,7 @@ func GetLimitedRefFieldsByLookupHash(ctx context.Context, allocationID, lookupHa
 	ref := &Ref{}
 	t := datastore.GetStore().GetTransaction(ctx)
 	db := t.Select(selectedFields)
-	err := db.Where(&Ref{LookupHash: lookupHash}).First(ref).Error
+	err := db.Where(&Ref{LookupHash: lookupHash}).Take(ref).Error
 	if err != nil {
 		return nil, err
 	}
@@ -259,7 +254,7 @@ func GetLimitedRefFieldsByLookupHash(ctx context.Context, allocationID, lookupHa
 func GetReferenceByLookupHash(ctx context.Context, allocationID, pathHash string) (*Ref, error) {
 	ref := &Ref{}
 	db := datastore.GetStore().GetTransaction(ctx)
-	err := db.Where(&Ref{LookupHash: pathHash}).First(ref).Error
+	err := db.Where(&Ref{LookupHash: pathHash}).Take(ref).Error
 	if err != nil {
 		return nil, err
 	}
@@ -271,7 +266,7 @@ func GetReferenceByLookupHashForDownload(ctx context.Context, allocationID, path
 	db := datastore.GetStore().GetTransaction(ctx)
 
 	err := db.Transaction(func(tx *gorm.DB) error {
-		err := tx.Clauses(clause.Locking{Strength: "SHARE"}).Where(&Ref{LookupHash: pathHash}).First(ref).Error
+		err := tx.Clauses(clause.Locking{Strength: "SHARE"}).Where(&Ref{LookupHash: pathHash}).Take(ref).Error
 		if err != nil {
 			return err
 		}
@@ -403,7 +398,7 @@ func GetRefWithDirListFields(ctx context.Context, pathHash string) (*Ref, error)
 	db := datastore.GetStore().GetTransaction(ctx)
 	err := db.Select(dirListFields).
 		Where(&Ref{LookupHash: pathHash}).
-		First(ref).Error
+		Take(ref).Error
 	if err != nil {
 		return nil, err
 	}
diff --git a/code/go/0chain.net/blobbercore/writemarker/entity.go b/code/go/0chain.net/blobbercore/writemarker/entity.go
@@ -139,7 +139,6 @@ func (wm *WriteMarkerEntity) OnChain() bool {
 func GetWriteMarkerEntity(ctx context.Context, allocation_root string) (*WriteMarkerEntity, error) {
 	db := datastore.GetStore().GetTransaction(ctx)
 	wm := &WriteMarkerEntity{}
-	// err := db.First(wm, "allocation_root = ?", allocation_root).Error
 	err := db.Table((WriteMarkerEntity{}).TableName()).
 		Where("allocation_root=?", allocation_root).
 		Order("sequence desc").
diff --git a/goose/migrations/1718391849_ref_index.sql b/goose/migrations/1718391849_ref_index.sql
@@ -0,0 +1,5 @@
+-- +goose Up
+-- +goose StatementBegin
+DROP INDEX idx_created_at,idx_updated_at,idx_lookup_hash,path_idx;
+CREATE UNIQUE INDEX idx_lookup_deleted_at ON reference_objects USING btree(lookup_hash,deleted_at);
+-- +goose StatementEnd

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func GetChallengeTiming(challengeID string) (*ChallengeTiming, error) {`
`183`	`183`
`184`	`184`	`err := datastore.GetStore().WithNewTransaction(func(ctx context.Context) error {`
`185`	`185`	`tx := datastore.GetStore().GetTransaction(ctx)`
`186`		`- return tx.Model(&ChallengeTiming{}).Where("challenge_id = ?", challengeID).First(&ch).Error`
	`186`	`+ return tx.Model(&ChallengeTiming{}).Where("challenge_id = ?", challengeID).Take(&ch).Error`
`187`	`187`	`})`
`188`	`188`	`return ch, err`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package datastore`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+ "database/sql"`
`5`	`6`
`6`	`7`	`. "github.com/0chain/blobber/code/go/0chain.net/core/logging"`
`7`	`8`	`mocket "github.com/selvatico/go-mocket"`
`@@ -71,7 +72,7 @@ func (store *Mocket) Close() {`
`71`	`72`	`}`
`72`	`73`	`}`
`73`	`74`
`74`		`-func (store *Mocket) CreateTransaction(ctx context.Context) context.Context {`
	`75`	`+func (store Mocket) CreateTransaction(ctx context.Context,opts ...sql.TxOptions) context.Context {`
`75`	`76`	`db := store.db.Begin()`
`76`	`77`	`return context.WithValue(ctx, ContextKeyTransaction, EnhanceDB(db))`
`77`	`78`	`}`