Skip to content

Commit 1bc7af6

Browse files
committed
Review feedback, outdated comments, dead code.
1 parent b43358e commit 1bc7af6

File tree

1 file changed

+0
-14
lines changed
  • nexus/db-queries/src/db/datastore

1 file changed

+0
-14
lines changed

nexus/db-queries/src/db/datastore/probe.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -367,12 +367,6 @@ impl super::DataStore {
367367
}
368368

369369
// Construct a page of probe-create parameters for a specific sled.
370-
//
371-
// # Panics
372-
//
373-
// This panics if the `pagparams` is not in ascending order. This method
374-
// paginates a big join of all the tables needed to build these parameters.
375-
// We can't use the existing `paginated` method for that.
376370
async fn list_probe_create_params_for_sled(
377371
&self,
378372
opctx: &OpContext,
@@ -383,11 +377,6 @@ impl super::DataStore {
383377
external_ip, network_interface, probe, vpc, vpc_subnet,
384378
};
385379

386-
/*
387-
assert_eq!(pagparams.direction, dropshot::PaginationOrder::Ascending);
388-
let marker = pagparams.marker.cloned().unwrap_or_default();
389-
*/
390-
391380
// TODO-correctness: This inner join below assumes exactly one external
392381
// IP for each probe. That's true today because of how we specify the
393382
// create-params in the external API. That has one IP Pool, and we
@@ -416,15 +405,12 @@ impl super::DataStore {
416405
.inner_join(
417406
vpc::dsl::vpc.on(vpc::dsl::id.eq(vpc_subnet::dsl::vpc_id)),
418407
)
419-
//.filter(probe::dsl::id.gt(marker))
420408
.filter(probe::dsl::sled.eq(sled_id.into_untyped_uuid()))
421409
.filter(probe::dsl::time_deleted.is_null())
422410
.filter(external_ip::dsl::time_deleted.is_null())
423411
.filter(network_interface::dsl::time_deleted.is_null())
424412
.filter(vpc_subnet::dsl::time_deleted.is_null())
425413
.filter(vpc::dsl::time_deleted.is_null())
426-
//.order(probe::dsl::id.asc())
427-
//.limit(pagparams.limit.get().into())
428414
.select((
429415
probe::dsl::id,
430416
external_ip::dsl::ip,

0 commit comments

Comments
 (0)