Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(BEDS 628) refactor vdb blocks query #998

Open
wants to merge 8 commits into
base: staging
Choose a base branch
from
+304 −302
Open

(BEDS 628) refactor vdb blocks query #998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52db45f
scheduled blocks retrieval (WIP)
remoterami Oct 16, 2024
0c9248a
Merge branch 'BEDS-599/Blocks_table_wrong_when_sorted' into BEDS-628/…
remoterami Oct 17, 2024
ee68064
base query (WIP)
remoterami Oct 17, 2024
cf997c4
union past and scheduled blocks, syntax fixed
remoterami Oct 18, 2024
327a88e
extended sorting/paging features, fixed blocks query
remoterami Oct 21, 2024
effeb35
Merge remote-tracking branch 'origin/staging' into BEDS-628/refactor-…
remoterami Oct 21, 2024
3d4b614
goqu quirck workaround
remoterami Oct 21, 2024
2b662d8
Merge remote-tracking branch 'origin/staging' into BEDS-628/refactor-…
remoterami Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions backend/pkg/api/data_access/general.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ func applySortAndPagination(defaultColumns []types.SortColumn, primary types.Sor
if cursor.IsReverse() {
column.Desc = !column.Desc
}
colOrder := goqu.C(column.Column).Asc()
colOrder := column.Column.Asc()
if column.Desc {
colOrder = goqu.C(column.Column).Desc()
colOrder = column.Column.Desc()
}
queryOrder = append(queryOrder, colOrder)
}
Expand All @@ -87,15 +87,21 @@ func applySortAndPagination(defaultColumns []types.SortColumn, primary types.Sor
// reverse order to nest conditions
for i := len(queryOrderColumns) - 1; i >= 0; i-- {
column := queryOrderColumns[i]
colWhere := goqu.C(column.Column).Gt(column.Offset)
var colWhere exp.Expression

// current convention is the psql default (ASC: nulls last, DESC: nulls first)
colWhere = goqu.Or(column.Column.Gt(column.Offset), column.Column.IsNull())
if column.Desc {
colWhere = goqu.C(column.Column).Lt(column.Offset)
colWhere = column.Column.Lt(column.Offset)
if column.Offset == nil {
colWhere = goqu.Or(colWhere, column.Column.IsNull())
}
}

if queryWhere == nil {
queryWhere = colWhere
} else {
queryWhere = goqu.And(goqu.C(column.Column).Eq(column.Offset), queryWhere)
queryWhere = goqu.And(column.Column.Eq(column.Offset), queryWhere)
queryWhere = goqu.Or(colWhere, queryWhere)
}
}
Expand Down
38 changes: 19 additions & 19 deletions backend/pkg/api/data_access/notifications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,14 +339,14 @@ func (d *DataAccessService) GetDashboardNotifications(ctx context.Context, userI

// sorting
defaultColumns := []t.SortColumn{
{Column: enums.NotificationsDashboardsColumns.Timestamp.ToString(), Desc: true, Offset: currentCursor.Epoch},
{Column: enums.NotificationsDashboardsColumns.DashboardName.ToString(), Desc: false, Offset: currentCursor.DashboardName},
{Column: enums.NotificationsDashboardsColumns.DashboardId.ToString(), Desc: false, Offset: currentCursor.DashboardId},
{Column: enums.NotificationsDashboardsColumns.GroupName.ToString(), Desc: false, Offset: currentCursor.GroupName},
{Column: enums.NotificationsDashboardsColumns.GroupId.ToString(), Desc: false, Offset: currentCursor.GroupId},
{Column: enums.NotificationsDashboardsColumns.ChainId.ToString(), Desc: true, Offset: currentCursor.ChainId},
}
order, directions := applySortAndPagination(defaultColumns, t.SortColumn{Column: colSort.Column.ToString(), Desc: colSort.Desc}, currentCursor.GenericCursor)
{Column: enums.NotificationsDashboardsColumns.Timestamp.ToExpr(), Desc: true, Offset: currentCursor.Epoch},
{Column: enums.NotificationsDashboardsColumns.DashboardName.ToExpr(), Desc: false, Offset: currentCursor.DashboardName},
{Column: enums.NotificationsDashboardsColumns.DashboardId.ToExpr(), Desc: false, Offset: currentCursor.DashboardId},
{Column: enums.NotificationsDashboardsColumns.GroupName.ToExpr(), Desc: false, Offset: currentCursor.GroupName},
{Column: enums.NotificationsDashboardsColumns.GroupId.ToExpr(), Desc: false, Offset: currentCursor.GroupId},
{Column: enums.NotificationsDashboardsColumns.ChainId.ToExpr(), Desc: true, Offset: currentCursor.ChainId},
}
order, directions := applySortAndPagination(defaultColumns, t.SortColumn{Column: colSort.Column.ToExpr(), Desc: colSort.Desc}, currentCursor.GenericCursor)
unionQuery = unionQuery.Order(order...)
if directions != nil {
unionQuery = unionQuery.Where(directions)
Expand Down Expand Up @@ -725,9 +725,9 @@ func (d *DataAccessService) GetMachineNotifications(ctx context.Context, userId

// Sorting and limiting if cursor is present
defaultColumns := []t.SortColumn{
{Column: enums.NotificationsMachinesColumns.Timestamp.ToString(), Desc: true, Offset: currentCursor.Epoch},
{Column: enums.NotificationsMachinesColumns.MachineId.ToString(), Desc: false, Offset: currentCursor.MachineId},
{Column: enums.NotificationsMachinesColumns.EventType.ToString(), Desc: false, Offset: currentCursor.EventType},
{Column: enums.NotificationsMachinesColumns.Timestamp.ToExpr(), Desc: true, Offset: currentCursor.Epoch},
{Column: enums.NotificationsMachinesColumns.MachineId.ToExpr(), Desc: false, Offset: currentCursor.MachineId},
{Column: enums.NotificationsMachinesColumns.EventType.ToExpr(), Desc: false, Offset: currentCursor.EventType},
}
var offset interface{}
switch colSort.Column {
Expand All @@ -737,7 +737,7 @@ func (d *DataAccessService) GetMachineNotifications(ctx context.Context, userId
offset = currentCursor.EventThreshold
}

order, directions := applySortAndPagination(defaultColumns, t.SortColumn{Column: colSort.Column.ToString(), Desc: colSort.Desc, Offset: offset}, currentCursor.GenericCursor)
order, directions := applySortAndPagination(defaultColumns, t.SortColumn{Column: colSort.Column.ToExpr(), Desc: colSort.Desc, Offset: offset}, currentCursor.GenericCursor)
ds = ds.Order(order...)
if directions != nil {
ds = ds.Where(directions)
Expand Down Expand Up @@ -846,10 +846,10 @@ func (d *DataAccessService) GetClientNotifications(ctx context.Context, userId u
// Sorting and limiting if cursor is present
// Rows can be uniquely identified by (epoch, client)
defaultColumns := []t.SortColumn{
{Column: enums.NotificationsClientsColumns.Timestamp.ToString(), Desc: true, Offset: currentCursor.Epoch},
{Column: enums.NotificationsClientsColumns.ClientName.ToString(), Desc: false, Offset: currentCursor.Client},
{Column: enums.NotificationsClientsColumns.Timestamp.ToExpr(), Desc: true, Offset: currentCursor.Epoch},
{Column: enums.NotificationsClientsColumns.ClientName.ToExpr(), Desc: false, Offset: currentCursor.Client},
}
order, directions := applySortAndPagination(defaultColumns, t.SortColumn{Column: colSort.Column.ToString(), Desc: colSort.Desc}, currentCursor.GenericCursor)
order, directions := applySortAndPagination(defaultColumns, t.SortColumn{Column: colSort.Column.ToExpr(), Desc: colSort.Desc}, currentCursor.GenericCursor)
ds = ds.Order(order...)
if directions != nil {
ds = ds.Where(directions)
Expand Down Expand Up @@ -1137,11 +1137,11 @@ func (d *DataAccessService) GetNetworkNotifications(ctx context.Context, userId
// Sorting and limiting if cursor is present
// Rows can be uniquely identified by (epoch, network, event_type)
defaultColumns := []t.SortColumn{
{Column: enums.NotificationNetworksColumns.Timestamp.ToString(), Desc: true, Offset: currentCursor.Epoch},
{Column: enums.NotificationNetworksColumns.Network.ToString(), Desc: false, Offset: currentCursor.Network},
{Column: enums.NotificationNetworksColumns.EventType.ToString(), Desc: false, Offset: currentCursor.EventType},
{Column: enums.NotificationNetworksColumns.Timestamp.ToExpr(), Desc: true, Offset: currentCursor.Epoch},
{Column: enums.NotificationNetworksColumns.Network.ToExpr(), Desc: false, Offset: currentCursor.Network},
{Column: enums.NotificationNetworksColumns.EventType.ToExpr(), Desc: false, Offset: currentCursor.EventType},
}
order, directions := applySortAndPagination(defaultColumns, t.SortColumn{Column: colSort.Column.ToString(), Desc: colSort.Desc}, currentCursor.GenericCursor)
order, directions := applySortAndPagination(defaultColumns, t.SortColumn{Column: colSort.Column.ToExpr(), Desc: colSort.Desc}, currentCursor.GenericCursor)
ds = ds.Order(order...)
if directions != nil {
ds = ds.Where(directions)
Expand Down
Loading
Loading