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

soon

Browse source
This commit is contained in:
rutherford-jasper 2023-04-07 10:55:37 -05:00
parent c173559f3b
commit ef5aa3093c
3 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dax/controller/client/client.go
View file

@ -702,12 +702,10 @@ func (c *Client) SnapshotTable(ctx context.Context, qtid dax.QualifiedTableID) e
return nil
}
func (c *Client) GetDatabaseNumberOfWorkers() (int, error) {
//url := fmt.Sprintf("%s/database-number-of-workers", c.address.WithScheme(defaultScheme))
//url := fmt.Sprintf("%s/database-number-of-workers", "localhost:8080/controller")
// url := fmt.Sprintf("%s/database-number-of-workers", c.address.WithScheme(defaultScheme))
url := fmt.Sprintf("%s/database-number-of-workers", "http://localhost:8080/controller")
func (c *Client) GetDatabaseNumberOfWorkers(ctx context.Context, orgID string, databaseID string) (int, error) {
// baseEndpoint := c.address.WithScheme(defaultScheme)
baseEndpoint := "http://localhost:8080/controller"
url := fmt.Sprintf("%s/database-number-of-workers/%s/%s", baseEndpoint, orgID, databaseID)
// print something
//fmt.Println("GetDatabaseNumberOfWorkers url: %s", url)

13
dax/controller/http/handler.go
View file

@ -25,7 +25,7 @@ func Handler(c *controller.Controller) http.Handler {
router.HandleFunc("/database-by-name", server.postDatabaseByName).Methods("POST").Name("PostDatabaseByName")
router.HandleFunc("/databases", server.postDatabases).Methods("POST").Name("PostDatabases")
router.HandleFunc("/database/options", server.patchDatabaseOptions).Methods("PATCH").Name("PatchDatabaseOptions")
router.HandleFunc("/database-number-of-workers", server.getDatabaseNumberOfWorkers).Methods("GET").Name("DatabaseWorkers")
router.HandleFunc("/database-number-of-workers/{organization-id}/{database-id}", server.getDatabaseNumberOfWorkers).Methods("GET").Name("DatabaseWorkers")
router.HandleFunc("/create-table", server.postCreateTable).Methods("POST").Name("PostCreateTable")
router.HandleFunc("/drop-table", server.postDropTable).Methods("POST").Name("PostDropTable")
@ -229,13 +229,10 @@ func (s *server) getDatabaseNumberOfWorkers(w http.ResponseWriter, r *http.Reque
// get the context
ctx := r.Context()
// create a variable to hold the id
var id dax.QualifiedDatabaseID
// for now, fill the id with a hard-coded value
id = dax.QualifiedDatabaseID{
OrganizationID: dax.OrganizationID("3ff24bf5-2dff-4c33-993a-8459d53c92c2"),
DatabaseID: dax.DatabaseID("b75114bf-75d4-4581-8899-7ba758548f56"),
// get the id from the request
id := dax.QualifiedDatabaseID{
OrganizationID: dax.OrganizationID(mux.Vars(r)["organization-id"]),
DatabaseID: dax.DatabaseID(mux.Vars(r)["database-id"]),
}
//send the id into the controller, get the number of workers back

9
dax/controller/sqldb/workerjob.go
View file

@ -87,22 +87,17 @@ func (w *workerJobService) WorkerCount(tx dax.Transaction, roleType dax.RoleType
if roleType != "" {
// print the role type
query = query.Where("role = ?", roleType)
query = query.Where(fmt.Sprintf("role_%s = true", roleType))
}
fmt.Println("query before: ", query)
if qdbid.DatabaseID != "" {
// print the database id
fmt.Println("database id: [", qdbid.DatabaseID, "]")
query = query.Where("database_id = ?", qdbid.DatabaseID)
}
// sql := fmt.Sprintf("role_%s = true and database_id = ?", roleType)
// cnt, err := dt.C.Where(sql, qdbid.DatabaseID).Count(worker)
// print the query
fmt.Println("query after: ", query)
count, err := query.Count(worker)
return count, errors.Wrap(err, "getting count")
}