WIP on file-lookup for expand-query

disk/src/binned/binnedfrompbv.rs

@@ -101,14 +101,12 @@ where
                                 self.res = Some(s2);
                                 continue 'outer;
                             } else {
-                                error!(
+                                let msg = format!(
                                     "PreBinnedValueFetchedStream  got non-OK result from sub request: {:?}",
                                     res
                                 );
-                                let e = Error::with_msg(format!(
-                                    "PreBinnedValueFetchedStream  got non-OK result from sub request: {:?}",
-                                    res
-                                ));
+                                error!("{}", msg);
+                                let e = Error::with_msg_no_trace(msg);
                                 self.errored = true;
                                 Ready(Some(Err(e)))
                             }

disk/src/binned/pbv.rs

@@ -129,7 +129,7 @@ where
         }
         // TODO do I need to set up more transformations or binning to deliver the requested data?
         let count = self.query.patch().patch_t_len() / self.query.patch().bin_t_len();
-        let range = BinnedRange::covering_range(evq.range.clone(), count as u32, self.node_config.node.bin_grain_kind)?
+        let range = BinnedRange::covering_range(evq.range.clone(), count as u32)?
             .ok_or(Error::with_msg("covering_range returns None"))?;
         let perf_opts = PerfOpts { inmem_bufcap: 512 };
         let s = MergedFromRemotes::<ENP>::new(evq, perf_opts, self.node_config.node_config.cluster.clone());
@@ -209,11 +209,7 @@ where
 
     fn try_setup_fetch_prebinned_higher_res(&mut self) -> Result<(), Error> {
         let range = self.query.patch().patch_range();
-        match PreBinnedPatchRange::covering_range(
-            range,
-            self.query.patch().bin_count() + 1,
-            self.node_config.node.bin_grain_kind,
-        ) {
+        match PreBinnedPatchRange::covering_range(range, self.query.patch().bin_count() + 1) {
             Ok(Some(range)) => {
                 self.fut2 = Some(self.setup_from_higher_res_prebinned(range)?);
             }