unified-storage: sqlkv skeleton (#115176)

* implement sqlkv skeleton and include sqlkv in badgerkv tests

pkg/storage/unified/testing/kv.go

@@ -35,7 +35,8 @@ type NewKVFunc func(ctx context.Context) resource.KV
 
 // KVTestOptions configures which tests to run
 type KVTestOptions struct {
-	NSPrefix string // namespace prefix for isolation
+	SkipTests map[string]bool
+	NSPrefix  string // namespace prefix for isolation
 }
 
 // GenerateRandomKVPrefix creates a random namespace prefix for test isolation
@@ -72,6 +73,11 @@ func RunKVTest(t *testing.T, newKV NewKVFunc, opts *KVTestOptions) {
 	}
 
 	for _, tc := range cases {
+		if shouldSkip := opts.SkipTests[tc.name]; shouldSkip {
+			t.Logf("Skipping test: %s", tc.name)
+			continue
+		}
+
 		t.Run(tc.name, func(t *testing.T) {
 			tc.fn(t, newKV(context.Background()), opts.NSPrefix)
 		})

pkg/storage/unified/testing/kv_test.go

@@ -7,7 +7,11 @@ import (
 	badger "github.com/dgraph-io/badger/v4"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
+	"github.com/grafana/grafana/pkg/storage/unified/sql/db/dbimpl"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 func TestBadgerKV(t *testing.T) {
@@ -26,3 +30,33 @@ func TestBadgerKV(t *testing.T) {
 		NSPrefix: "badger-kv-test",
 	})
 }
+
+func TestMain(m *testing.M) {
+	testsuite.Run(m)
+}
+
+func TestSQLKV(t *testing.T) {
+	RunKVTest(t, func(ctx context.Context) resource.KV {
+		dbstore := db.InitTestDB(t)
+		eDB, err := dbimpl.ProvideResourceDB(dbstore, setting.NewCfg(), nil)
+		require.NoError(t, err)
+
+		kv, err := resource.NewSQLKV(eDB)
+		require.NoError(t, err)
+		return kv
+	}, &KVTestOptions{
+		NSPrefix: "sql-kv-test",
+		SkipTests: map[string]bool{
+			TestKVGet:            true,
+			TestKVSave:           true,
+			TestKVDelete:         true,
+			TestKVKeys:           true,
+			TestKVKeysWithLimits: true,
+			TestKVKeysWithSort:   true,
+			TestKVConcurrent:     true,
+			TestKVUnixTimestamp:  true,
+			TestKVBatchGet:       true,
+			TestKVBatchDelete:    true,
+		},
+	})
+}

pkg/storage/unified/testing/storage_backend_test.go

@@ -7,7 +7,11 @@ import (
 	badger "github.com/dgraph-io/badger/v4"
 	"github.com/stretchr/testify/require"
 
+	"github.com/grafana/grafana/pkg/infra/db"
+	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/storage/unified/resource"
+	sqldb "github.com/grafana/grafana/pkg/storage/unified/sql/db"
+	"github.com/grafana/grafana/pkg/storage/unified/sql/db/dbimpl"
 )
 
 func TestBadgerKVStorageBackend(t *testing.T) {
@@ -25,7 +29,7 @@ func TestBadgerKVStorageBackend(t *testing.T) {
 		require.NoError(t, err)
 		return backend
 	}, &TestOptions{
-		NSPrefix: "kvstorage-test",
+		NSPrefix: "badgerkvstorage-test",
 		SkipTests: map[string]bool{
 			// TODO: fix these tests and remove this skip
 			TestBlobSupport:       true,
@@ -35,3 +39,50 @@ func TestBadgerKVStorageBackend(t *testing.T) {
 		},
 	})
 }
+
+func TestSQLKVStorageBackend(t *testing.T) {
+	newBackendFunc := func(ctx context.Context) (resource.StorageBackend, sqldb.DB) {
+		dbstore := db.InitTestDB(t)
+		eDB, err := dbimpl.ProvideResourceDB(dbstore, setting.NewCfg(), nil)
+		require.NoError(t, err)
+		kv, err := resource.NewSQLKV(eDB)
+		require.NoError(t, err)
+		kvOpts := resource.KVBackendOptions{
+			KvStore: kv,
+		}
+		backend, err := resource.NewKVStorageBackend(kvOpts)
+		require.NoError(t, err)
+		db, err := eDB.Init(ctx)
+		require.NoError(t, err)
+		return backend, db
+	}
+
+	RunStorageBackendTest(t, func(ctx context.Context) resource.StorageBackend {
+		backend, _ := newBackendFunc(ctx)
+		return backend
+	}, &TestOptions{
+		NSPrefix: "sqlkvstorage-test",
+		SkipTests: map[string]bool{
+			TestHappyPath:                 true,
+			TestWatchWriteEvents:          true,
+			TestList:                      true,
+			TestBlobSupport:               true,
+			TestGetResourceStats:          true,
+			TestListHistory:               true,
+			TestListHistoryErrorReporting: true,
+			TestListModifiedSince:         true,
+			TestListTrash:                 true,
+			TestCreateNewResource:         true,
+			TestGetResourceLastImportTime: true,
+			TestOptimisticLocking:         true,
+			TestKeyPathGeneration:         true,
+		},
+	})
+
+	RunSQLStorageBackendCompatibilityTest(t, newBackendFunc, &TestOptions{
+		NSPrefix: "sqlkvstorage-compatibility-test",
+		SkipTests: map[string]bool{
+			TestKeyPathGeneration: true,
+		},
+	})
+}