@@ -240,14 +240,13 @@ func ListNodeAccessLogIPTrend(query NodeAccessLogIPTrendQuery) (items []*NodeAcc
240240}
241241
242242func DeleteNodeAccessLogsBefore (before time.Time ) (deleted int64 , err error ) {
243- for _ , table := range observabilityShardTables ("node_access_logs" ) {
244- result := DB .Table (table ).Where ("logged_at < ?" , before ).Delete (& NodeAccessLog {})
245- if result .Error != nil {
246- return deleted , result .Error
247- }
248- deleted += result .RowsAffected
249- }
250- return deleted , nil
243+ return deleteAcrossShards (DB , "node_access_logs" , & NodeAccessLog {}, func (tx * gorm.DB ) * gorm.DB {
244+ return tx .Where ("logged_at < ?" , before )
245+ })
246+ }
247+
248+ func DeleteAllNodeAccessLogs (db * gorm.DB ) (deleted int64 , err error ) {
249+ return deleteAcrossShards (db , "node_access_logs" , & NodeAccessLog {}, nil )
251250}
252251
253252func NodeAccessLogExists (db * gorm.DB , record * NodeAccessLog ) (bool , error ) {
@@ -279,15 +278,9 @@ func NodeAccessLogExists(db *gorm.DB, record *NodeAccessLog) (bool, error) {
279278}
280279
281280func DeleteNodeAccessLogsByNodeBefore (db * gorm.DB , nodeID string , before time.Time ) (deleted int64 , err error ) {
282- db = normalizeShardedDB (db )
283- for _ , table := range observabilityShardTables ("node_access_logs" ) {
284- result := db .Table (table ).Where ("node_id = ? AND logged_at < ?" , nodeID , before ).Delete (& NodeAccessLog {})
285- if result .Error != nil {
286- return deleted , result .Error
287- }
288- deleted += result .RowsAffected
289- }
290- return deleted , nil
281+ return deleteAcrossShards (db , "node_access_logs" , & NodeAccessLog {}, func (tx * gorm.DB ) * gorm.DB {
282+ return tx .Where ("node_id = ? AND logged_at < ?" , nodeID , before )
283+ })
291284}
292285
293286func buildNodeAccessLogQuery (db * gorm.DB , query NodeAccessLogQuery ) * gorm.DB {
0 commit comments