public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Storage: Switch from tenant to namespace & remove GRN (#79250)

Browse Source 
* remove GRN and switch tenant to namespace

* clean up remaining references

* simplify and remove inconsistency in With* parameters

* parse listing keys so we can use db index

* bump the schema version

---------

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
This commit is contained in:
Dan Cech
2023-12-11 18:26:05 +01:00
committed by GitHub
parent bb4aa16b13
commit 9f6144059a
24 changed files with 906 additions and 2412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/store/entity/sqlstash/folder_support.go
+10 -10
View File
@@ -34,17 +34,17 @@ type folderInfo struct {
// This will replace all entries in `entity_folder`
// This is pretty heavy weight, but it does give us a sorted folder list
// NOTE: this could be done async with a mutex/lock? reconciler pattern
func updateFolderTree(ctx context.Context, tx *session.SessionTx, tenantId int64) error {
_, err := tx.Exec(ctx, "DELETE FROM entity_folder WHERE tenant_id=?", tenantId)
func updateFolderTree(ctx context.Context, tx *session.SessionTx, namespace string) error {
_, err := tx.Exec(ctx, "DELETE FROM entity_folder WHERE namespace=?", namespace)
if err != nil {
return err
}
query := "SELECT guid,uid,folder,name,slug" +
" FROM entity" +
" WHERE kind=? AND tenant_id=?" +
" WHERE group=? AND resource=? AND namespace=?" +
" ORDER BY slug asc"
args := []interface{}{entity.StandardKindFolder, tenantId}
args := []interface{}{entity.FolderGroupName, entity.FolderResourceName, namespace}
all := []*folderInfo{}
rows, err := tx.Query(ctx, query, args...)
@@ -69,13 +69,13 @@ func updateFolderTree(ctx context.Context, tx *session.SessionTx, tenantId int64
return err
}
err = insertFolderInfo(ctx, tx, tenantId, root, false)
err = insertFolderInfo(ctx, tx, namespace, root, false)
if err != nil {
return err
}
for _, folder := range lost {
err = insertFolderInfo(ctx, tx, tenantId, folder, true)
err = insertFolderInfo(ctx, tx, namespace, folder, true)
if err != nil {
return err
}
@@ -137,14 +137,14 @@ func setMPTTOrder(folder *folderInfo, stack []*folderInfo, idx int32) (int32, er
return folder.right, nil
}
func insertFolderInfo(ctx context.Context, tx *session.SessionTx, tenantId int64, folder *folderInfo, isDetached bool) error {
func insertFolderInfo(ctx context.Context, tx *session.SessionTx, namespace string, folder *folderInfo, isDetached bool) error {
js, _ := json.Marshal(folder.stack)
_, err := tx.Exec(ctx,
`INSERT INTO entity_folder `+
"(guid, tenant_id, uid, slug_path, tree, depth, lft, rgt, detached) "+
"(guid, namespace, uid, slug_path, tree, depth, lft, rgt, detached) "+
`VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
folder.Guid,
tenantId,
namespace,
folder.UID,
folder.SlugPath,
string(js),
@@ -158,7 +158,7 @@ func insertFolderInfo(ctx context.Context, tx *session.SessionTx, tenantId int64
}
for _, sub := range folder.children {
err := insertFolderInfo(ctx, tx, tenantId, sub, isDetached)
err := insertFolderInfo(ctx, tx, namespace, sub, isDetached)
if err != nil {
return err
}