From 02bd55488349db9bd026b0d9566645e198d2d315 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 25 Jan 2023 11:01:00 -0600 Subject: [PATCH 1/4] chore: Remove unused sql functions - GetProvisionerDaemonByID - UpdateProvisionerDaemonByID --- coderd/database/databasefake/databasefake.go | 33 -------------- coderd/database/querier.go | 2 - coderd/database/queries.sql.go | 45 ------------------- .../database/queries/provisionerdaemons.sql | 17 ------- 4 files changed, 97 deletions(-) diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go index 402149a56a981..b86fa49db7944 100644 --- a/coderd/database/databasefake/databasefake.go +++ b/coderd/database/databasefake/databasefake.go @@ -2289,19 +2289,6 @@ func (q *fakeQuerier) GetWorkspaceAppByAgentIDAndSlug(_ context.Context, arg dat return database.WorkspaceApp{}, sql.ErrNoRows } -func (q *fakeQuerier) GetProvisionerDaemonByID(_ context.Context, id uuid.UUID) (database.ProvisionerDaemon, error) { - q.mutex.RLock() - defer q.mutex.RUnlock() - - for _, provisionerDaemon := range q.provisionerDaemons { - if provisionerDaemon.ID != id { - continue - } - return provisionerDaemon, nil - } - return database.ProvisionerDaemon{}, sql.ErrNoRows -} - func (q *fakeQuerier) GetProvisionerJobByID(_ context.Context, id uuid.UUID) (database.ProvisionerJob, error) { q.mutex.RLock() defer q.mutex.RUnlock() @@ -3238,26 +3225,6 @@ func (q *fakeQuerier) UpdateTemplateVersionDescriptionByJobID(_ context.Context, return sql.ErrNoRows } -func (q *fakeQuerier) UpdateProvisionerDaemonByID(_ context.Context, arg database.UpdateProvisionerDaemonByIDParams) error { - if err := validateDatabaseType(arg); err != nil { - return err - } - - q.mutex.Lock() - defer q.mutex.Unlock() - - for index, daemon := range q.provisionerDaemons { - if arg.ID != daemon.ID { - continue - } - daemon.UpdatedAt = arg.UpdatedAt - daemon.Provisioners = arg.Provisioners - q.provisionerDaemons[index] = daemon - return nil - } - return sql.ErrNoRows -} - func (q *fakeQuerier) UpdateWorkspaceAgentConnectionByID(_ context.Context, arg database.UpdateWorkspaceAgentConnectionByIDParams) error { if err := validateDatabaseType(arg); err != nil { return err diff --git a/coderd/database/querier.go b/coderd/database/querier.go index 7e9ddecea7c56..428d4d833f8dd 100644 --- a/coderd/database/querier.go +++ b/coderd/database/querier.go @@ -69,7 +69,6 @@ type sqlcQuerier interface { GetParameterSchemasCreatedAfter(ctx context.Context, createdAt time.Time) ([]ParameterSchema, error) GetParameterValueByScopeAndName(ctx context.Context, arg GetParameterValueByScopeAndNameParams) (ParameterValue, error) GetPreviousTemplateVersion(ctx context.Context, arg GetPreviousTemplateVersionParams) (TemplateVersion, error) - GetProvisionerDaemonByID(ctx context.Context, id uuid.UUID) (ProvisionerDaemon, error) GetProvisionerDaemons(ctx context.Context) ([]ProvisionerDaemon, error) GetProvisionerJobByID(ctx context.Context, id uuid.UUID) (ProvisionerJob, error) GetProvisionerJobsByIDs(ctx context.Context, ids []uuid.UUID) ([]ProvisionerJob, error) @@ -178,7 +177,6 @@ type sqlcQuerier interface { UpdateGitSSHKey(ctx context.Context, arg UpdateGitSSHKeyParams) (GitSSHKey, error) UpdateGroupByID(ctx context.Context, arg UpdateGroupByIDParams) (Group, error) UpdateMemberRoles(ctx context.Context, arg UpdateMemberRolesParams) (OrganizationMember, error) - UpdateProvisionerDaemonByID(ctx context.Context, arg UpdateProvisionerDaemonByIDParams) error UpdateProvisionerJobByID(ctx context.Context, arg UpdateProvisionerJobByIDParams) error UpdateProvisionerJobWithCancelByID(ctx context.Context, arg UpdateProvisionerJobWithCancelByIDParams) error UpdateProvisionerJobWithCompleteByID(ctx context.Context, arg UpdateProvisionerJobWithCompleteByIDParams) error diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 938bdf878177a..7792c07315c1c 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -2204,30 +2204,6 @@ func (q *sqlQuerier) ParameterValues(ctx context.Context, arg ParameterValuesPar return items, nil } -const getProvisionerDaemonByID = `-- name: GetProvisionerDaemonByID :one -SELECT - id, created_at, updated_at, name, provisioners, replica_id, tags -FROM - provisioner_daemons -WHERE - id = $1 -` - -func (q *sqlQuerier) GetProvisionerDaemonByID(ctx context.Context, id uuid.UUID) (ProvisionerDaemon, error) { - row := q.db.QueryRowContext(ctx, getProvisionerDaemonByID, id) - var i ProvisionerDaemon - err := row.Scan( - &i.ID, - &i.CreatedAt, - &i.UpdatedAt, - &i.Name, - pq.Array(&i.Provisioners), - &i.ReplicaID, - &i.Tags, - ) - return i, err -} - const getProvisionerDaemons = `-- name: GetProvisionerDaemons :many SELECT id, created_at, updated_at, name, provisioners, replica_id, tags @@ -2308,27 +2284,6 @@ func (q *sqlQuerier) InsertProvisionerDaemon(ctx context.Context, arg InsertProv return i, err } -const updateProvisionerDaemonByID = `-- name: UpdateProvisionerDaemonByID :exec -UPDATE - provisioner_daemons -SET - updated_at = $2, - provisioners = $3 -WHERE - id = $1 -` - -type UpdateProvisionerDaemonByIDParams struct { - ID uuid.UUID `db:"id" json:"id"` - UpdatedAt sql.NullTime `db:"updated_at" json:"updated_at"` - Provisioners []ProvisionerType `db:"provisioners" json:"provisioners"` -} - -func (q *sqlQuerier) UpdateProvisionerDaemonByID(ctx context.Context, arg UpdateProvisionerDaemonByIDParams) error { - _, err := q.db.ExecContext(ctx, updateProvisionerDaemonByID, arg.ID, arg.UpdatedAt, pq.Array(arg.Provisioners)) - return err -} - const getProvisionerLogsByIDBetween = `-- name: GetProvisionerLogsByIDBetween :many SELECT job_id, created_at, source, level, stage, output, id diff --git a/coderd/database/queries/provisionerdaemons.sql b/coderd/database/queries/provisionerdaemons.sql index 65908876e8a36..ccbbf9891b309 100644 --- a/coderd/database/queries/provisionerdaemons.sql +++ b/coderd/database/queries/provisionerdaemons.sql @@ -1,11 +1,3 @@ --- name: GetProvisionerDaemonByID :one -SELECT - * -FROM - provisioner_daemons -WHERE - id = $1; - -- name: GetProvisionerDaemons :many SELECT * @@ -23,12 +15,3 @@ INSERT INTO ) VALUES ($1, $2, $3, $4, $5) RETURNING *; - --- name: UpdateProvisionerDaemonByID :exec -UPDATE - provisioner_daemons -SET - updated_at = $2, - provisioners = $3 -WHERE - id = $1; From b3aee49cc55b512a7baea51a5c62f4b532f0b962 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 25 Jan 2023 11:02:11 -0600 Subject: [PATCH 2/4] Drop unused GetUserGroups function --- coderd/database/databasefake/databasefake.go | 4 -- coderd/database/querier.go | 1 - coderd/database/queries.sql.go | 42 -------------------- coderd/database/queries/groups.sql | 12 ------ 4 files changed, 59 deletions(-) diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go index b86fa49db7944..7fe23ffd32a61 100644 --- a/coderd/database/databasefake/databasefake.go +++ b/coderd/database/databasefake/databasefake.go @@ -4013,10 +4013,6 @@ func (q *fakeQuerier) InsertGroup(_ context.Context, arg database.InsertGroupPar return group, nil } -func (*fakeQuerier) GetUserGroups(_ context.Context, _ uuid.UUID) ([]database.Group, error) { - panic("not implemented") -} - func (q *fakeQuerier) GetGroupMembers(_ context.Context, groupID uuid.UUID) ([]database.User, error) { q.mutex.RLock() defer q.mutex.RUnlock() diff --git a/coderd/database/querier.go b/coderd/database/querier.go index 428d4d833f8dd..bf6ee1f7f81e5 100644 --- a/coderd/database/querier.go +++ b/coderd/database/querier.go @@ -96,7 +96,6 @@ type sqlcQuerier interface { GetUserByEmailOrUsername(ctx context.Context, arg GetUserByEmailOrUsernameParams) (User, error) GetUserByID(ctx context.Context, id uuid.UUID) (User, error) GetUserCount(ctx context.Context) (int64, error) - GetUserGroups(ctx context.Context, userID uuid.UUID) ([]Group, error) GetUserLinkByLinkedID(ctx context.Context, linkedID string) (UserLink, error) GetUserLinkByUserIDLoginType(ctx context.Context, arg GetUserLinkByUserIDLoginTypeParams) (UserLink, error) // This will never return deleted users. diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 7792c07315c1c..314e20dd143bd 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -1178,48 +1178,6 @@ func (q *sqlQuerier) GetGroupsByOrganizationID(ctx context.Context, organization return items, nil } -const getUserGroups = `-- name: GetUserGroups :many -SELECT - groups.id, groups.name, groups.organization_id, groups.avatar_url, groups.quota_allowance -FROM - groups -JOIN - group_members -ON - groups.id = group_members.group_id -WHERE - group_members.user_id = $1 -` - -func (q *sqlQuerier) GetUserGroups(ctx context.Context, userID uuid.UUID) ([]Group, error) { - rows, err := q.db.QueryContext(ctx, getUserGroups, userID) - if err != nil { - return nil, err - } - defer rows.Close() - var items []Group - for rows.Next() { - var i Group - if err := rows.Scan( - &i.ID, - &i.Name, - &i.OrganizationID, - &i.AvatarURL, - &i.QuotaAllowance, - ); err != nil { - return nil, err - } - items = append(items, i) - } - if err := rows.Close(); err != nil { - return nil, err - } - if err := rows.Err(); err != nil { - return nil, err - } - return items, nil -} - const insertAllUsersGroup = `-- name: InsertAllUsersGroup :one INSERT INTO groups ( id, diff --git a/coderd/database/queries/groups.sql b/coderd/database/queries/groups.sql index dba2ae79b0ee5..3aa5c77e22771 100644 --- a/coderd/database/queries/groups.sql +++ b/coderd/database/queries/groups.sql @@ -20,18 +20,6 @@ AND LIMIT 1; --- name: GetUserGroups :many -SELECT - groups.* -FROM - groups -JOIN - group_members -ON - groups.id = group_members.group_id -WHERE - group_members.user_id = $1; - -- name: GetGroupMembers :many SELECT users.* From e853d5fc223bf0043e42f1675d31801e2d85e0a5 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 25 Jan 2023 11:03:40 -0600 Subject: [PATCH 3/4] Remove GetWorkspaceCountByUserID and GetLatestAgentStat --- coderd/database/databasefake/databasefake.go | 27 -------------- coderd/database/querier.go | 2 - coderd/database/queries.sql.go | 39 +------------------- coderd/database/queries/agentstats.sql | 5 +-- coderd/database/queries/workspaces.sql | 10 ----- 5 files changed, 2 insertions(+), 81 deletions(-) diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go index 7fe23ffd32a61..7b6b95578693c 100644 --- a/coderd/database/databasefake/databasefake.go +++ b/coderd/database/databasefake/databasefake.go @@ -283,33 +283,6 @@ func (q *fakeQuerier) InsertAgentStat(_ context.Context, p database.InsertAgentS return stat, nil } -func (q *fakeQuerier) GetLatestAgentStat(_ context.Context, agentID uuid.UUID) (database.AgentStat, error) { - q.mutex.RLock() - defer q.mutex.RUnlock() - - found := false - latest := database.AgentStat{} - for _, agentStat := range q.agentStats { - if agentStat.AgentID != agentID { - continue - } - if !found { - latest = agentStat - found = true - continue - } - if agentStat.CreatedAt.After(latest.CreatedAt) { - latest = agentStat - found = true - continue - } - } - if !found { - return database.AgentStat{}, sql.ErrNoRows - } - return latest, nil -} - func (q *fakeQuerier) GetTemplateDAUs(_ context.Context, templateID uuid.UUID) ([]database.GetTemplateDAUsRow, error) { q.mutex.Lock() defer q.mutex.Unlock() diff --git a/coderd/database/querier.go b/coderd/database/querier.go index bf6ee1f7f81e5..339eadc159c8c 100644 --- a/coderd/database/querier.go +++ b/coderd/database/querier.go @@ -52,7 +52,6 @@ type sqlcQuerier interface { GetGroupMembers(ctx context.Context, groupID uuid.UUID) ([]User, error) GetGroupsByOrganizationID(ctx context.Context, organizationID uuid.UUID) ([]Group, error) GetLastUpdateCheck(ctx context.Context) (string, error) - GetLatestAgentStat(ctx context.Context, agentID uuid.UUID) (AgentStat, error) GetLatestWorkspaceBuildByWorkspaceID(ctx context.Context, workspaceID uuid.UUID) (WorkspaceBuild, error) GetLatestWorkspaceBuilds(ctx context.Context) ([]WorkspaceBuild, error) GetLatestWorkspaceBuildsByWorkspaceIDs(ctx context.Context, ids []uuid.UUID) ([]WorkspaceBuild, error) @@ -122,7 +121,6 @@ type sqlcQuerier interface { GetWorkspaceByAgentID(ctx context.Context, agentID uuid.UUID) (Workspace, error) GetWorkspaceByID(ctx context.Context, id uuid.UUID) (Workspace, error) GetWorkspaceByOwnerIDAndName(ctx context.Context, arg GetWorkspaceByOwnerIDAndNameParams) (Workspace, error) - GetWorkspaceCountByUserID(ctx context.Context, ownerID uuid.UUID) (int64, error) GetWorkspaceOwnerCountsByTemplateIDs(ctx context.Context, ids []uuid.UUID) ([]GetWorkspaceOwnerCountsByTemplateIDsRow, error) GetWorkspaceResourceByID(ctx context.Context, id uuid.UUID) (WorkspaceResource, error) GetWorkspaceResourceMetadataByResourceIDs(ctx context.Context, ids []uuid.UUID) ([]WorkspaceResourceMetadatum, error) diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index 314e20dd143bd..9d6f97fa8ad3f 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -25,27 +25,8 @@ func (q *sqlQuerier) DeleteOldAgentStats(ctx context.Context) error { return err } -const getLatestAgentStat = `-- name: GetLatestAgentStat :one -SELECT id, created_at, user_id, agent_id, workspace_id, template_id, payload FROM agent_stats WHERE agent_id = $1 ORDER BY created_at DESC LIMIT 1 -` - -func (q *sqlQuerier) GetLatestAgentStat(ctx context.Context, agentID uuid.UUID) (AgentStat, error) { - row := q.db.QueryRowContext(ctx, getLatestAgentStat, agentID) - var i AgentStat - err := row.Scan( - &i.ID, - &i.CreatedAt, - &i.UserID, - &i.AgentID, - &i.WorkspaceID, - &i.TemplateID, - &i.Payload, - ) - return i, err -} - const getTemplateDAUs = `-- name: GetTemplateDAUs :many -SELECT +SELECT (created_at at TIME ZONE 'UTC')::date as date, user_id FROM @@ -6499,24 +6480,6 @@ func (q *sqlQuerier) GetWorkspaceByOwnerIDAndName(ctx context.Context, arg GetWo return i, err } -const getWorkspaceCountByUserID = `-- name: GetWorkspaceCountByUserID :one -SELECT - COUNT(id) -FROM - workspaces -WHERE - owner_id = $1 - -- Ignore deleted workspaces - AND deleted != true -` - -func (q *sqlQuerier) GetWorkspaceCountByUserID(ctx context.Context, ownerID uuid.UUID) (int64, error) { - row := q.db.QueryRowContext(ctx, getWorkspaceCountByUserID, ownerID) - var count int64 - err := row.Scan(&count) - return count, err -} - const getWorkspaceOwnerCountsByTemplateIDs = `-- name: GetWorkspaceOwnerCountsByTemplateIDs :many SELECT template_id, diff --git a/coderd/database/queries/agentstats.sql b/coderd/database/queries/agentstats.sql index 4d94cd98b9f25..1bb1fec08b11f 100644 --- a/coderd/database/queries/agentstats.sql +++ b/coderd/database/queries/agentstats.sql @@ -12,11 +12,8 @@ INSERT INTO VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING *; --- name: GetLatestAgentStat :one -SELECT * FROM agent_stats WHERE agent_id = $1 ORDER BY created_at DESC LIMIT 1; - -- name: GetTemplateDAUs :many -SELECT +SELECT (created_at at TIME ZONE 'UTC')::date as date, user_id FROM diff --git a/coderd/database/queries/workspaces.sql b/coderd/database/queries/workspaces.sql index 08fc3c4dbf673..4221364ca0eaa 100644 --- a/coderd/database/queries/workspaces.sql +++ b/coderd/database/queries/workspaces.sql @@ -236,16 +236,6 @@ WHERE GROUP BY template_id; --- name: GetWorkspaceCountByUserID :one -SELECT - COUNT(id) -FROM - workspaces -WHERE - owner_id = @owner_id - -- Ignore deleted workspaces - AND deleted != true; - -- name: InsertWorkspace :one INSERT INTO workspaces ( From 122ce057469aa5f8dc5e10682d7f2d255c183ab6 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 25 Jan 2023 11:07:56 -0600 Subject: [PATCH 4/4] Remove unused funciton --- coderd/database/databasefake/databasefake.go | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go index 7b6b95578693c..d5e298053c1ca 100644 --- a/coderd/database/databasefake/databasefake.go +++ b/coderd/database/databasefake/databasefake.go @@ -1278,22 +1278,6 @@ func (q *fakeQuerier) GetWorkspaceBuildByID(_ context.Context, id uuid.UUID) (da return database.WorkspaceBuild{}, sql.ErrNoRows } -func (q *fakeQuerier) GetWorkspaceCountByUserID(_ context.Context, id uuid.UUID) (int64, error) { - q.mutex.RLock() - defer q.mutex.RUnlock() - var count int64 - for _, workspace := range q.workspaces { - if workspace.OwnerID == id { - if workspace.Deleted { - continue - } - - count++ - } - } - return count, nil -} - func (q *fakeQuerier) GetWorkspaceBuildByJobID(_ context.Context, jobID uuid.UUID) (database.WorkspaceBuild, error) { q.mutex.RLock() defer q.mutex.RUnlock()