scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-08-28 02:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

code review tweaks

Browse source
This commit is contained in:
Matthew Jaffee 2022-12-14 12:13:07 -06:00 • committed by Matthew Jaffee
parent 4366ad41fb
commit cf1c9dae9a
2 changed files with 14 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
api_directive.go
View file

@ -357,21 +357,18 @@ func (api *API) loadTableKeys(ctx context.Context, idx *Index, tkey dax.TableKey
mgr := api.serverlessStorage.GetTableKeyManager(qtid, partition)
if mgr.IsLocked() {
api.logger().Debugf("skipping loadTableKeys (already held) %s %d", tkey, partition)
api.logger().Warnf("skipping loadTableKeys (already held) %s %d", tkey, partition)
return nil
}
// load latest snapshot
rc, err := mgr.LoadLatestSnapshot()
if err != nil {
if rc, err := mgr.LoadLatestSnapshot(); err != nil {
return errors.Wrap(err, "loading table key snapshot")
}
if rc != nil {
} else if rc != nil {
defer rc.Close()
if err := api.TranslateIndexDB(ctx, string(tkey), int(partition), rc); err != nil {
return errors.Wrap(err, "restoring table keys")
}
}
// define write log loading in a function since we have to do it
@ -434,16 +431,14 @@ func (api *API) loadFieldKeys(ctx context.Context, tkey dax.TableKey, field dax.
mgr := api.serverlessStorage.GetFieldKeyManager(qtid, field)
if mgr.IsLocked() {
api.logger().Debugf("skipping loadFieldKeys (already held) %s %s", tkey, field)
api.logger().Warnf("skipping loadFieldKeys (already held) %s %s", tkey, field)
return nil
}
// load latest snapshot
rc, err := mgr.LoadLatestSnapshot()
if err != nil {
if rc, err := mgr.LoadLatestSnapshot(); err != nil {
return errors.Wrap(err, "loading field key snapshot")
}
if rc != nil {
} else if rc != nil {
defer rc.Close()
if err := api.TranslateFieldDB(ctx, string(tkey), string(field), rc); err != nil {
return errors.Wrap(err, "restoring field keys")
@ -522,15 +517,13 @@ func (api *API) loadShard(ctx context.Context, tkey dax.TableKey, shard dax.Shar
mgr := api.serverlessStorage.GetShardManager(qtid, partition, shard)
if mgr.IsLocked() {
api.logger().Debugf("skipping loadShard (already held) %s %d", tkey, shard)
api.logger().Warnf("skipping loadShard (already held) %s %d", tkey, shard)
return nil
}
rc, err := mgr.LoadLatestSnapshot()
if err != nil {
if rc, err := mgr.LoadLatestSnapshot(); err != nil {
return errors.Wrap(err, "reading latest snapshot for shard")
}
if rc != nil {
} else if rc != nil {
defer rc.Close()
if err := api.RestoreShard(ctx, string(tkey), uint64(shard), rc); err != nil {
return errors.Wrap(err, "restoring shard data")

10
dax/storage/storage.go
View file

@ -182,11 +182,11 @@ func (mm *ManagerManager) RemoveAll() error {
return nil
}
// Manager wraps the snapshotter and writelogger to implement the
// ServerlessStorage interface and maintain messy state between
// calls. Manager is *not* threadsafe, care should be taken that
// concurrent calls are not made to Manager methods. The exception
// being that Snapshot and Append are safe to call concurrently.
// Manager wraps the snapshotter and writelogger to maintain messy
// state between calls. Manager is *not* threadsafe, care should be
// taken that concurrent calls are not made to Manager methods. The
// exception being that Snapshot and Append are safe to call
// concurrently.
type Manager struct {
snapshotter computer.SnapshotService
writeLogger computer.WriteLogService