database: make Block also remove packages in newCrawl and search index
The method was used in the gddo-admin block command. It adds the URL
to the blocked list and removes everything under that URL from the
database. To make it useful, this change should also remove anything
under the URL from the newCrawl queue and the App Engine search index.
Change-Id: I02020801556418616f6628dca9afa39db09ad88f
Reviewed-on: https://go-review.googlesource.com/c/gddo/+/130756
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
diff --git a/database/database.go b/database/database.go
index c25dd5d..a99a145 100644
--- a/database/database.go
+++ b/database/database.go
@@ -776,15 +776,38 @@
if _, err := c.Do("SADD", "block", root); err != nil {
return err
}
+
+ // Remove all packages under the project root.
keys, err := redis.Strings(c.Do("HKEYS", "ids"))
if err != nil {
return err
}
+ ctx := context.Background()
for _, key := range keys {
if key == root || strings.HasPrefix(key, root) && key[len(root)] == '/' {
+ id, err := redis.String(c.Do("HGET", "ids", key))
+ if err != nil {
+ return fmt.Errorf("cannot get package id for %s: %v", key, err)
+ }
if _, err := deleteScript.Do(c, key); err != nil {
return err
}
+ if err := deleteIndex(db.RemoteClient.NewContext(ctx), id); err != nil && err != search.ErrNoSuchDocument {
+ return err
+ }
+ }
+ }
+
+ // Remove all packages in the newCrawl set under the project root.
+ newCrawls, err := redis.Strings(c.Do("SORT", "newCrawl", "BY", "nosort"))
+ if err != nil {
+ return fmt.Errorf("cannot list newCrawl: %v", err)
+ }
+ for _, nc := range newCrawls {
+ if nc == root || strings.HasPrefix(nc, root) && nc[len(root)] == '/' {
+ if _, err := deleteScript.Do(c, nc); err != nil {
+ return err
+ }
}
}
return nil
