Skip to content

Commit 8b258e9

Browse files
committed
Cleanup
1 parent 743b8af commit 8b258e9

4 files changed

Lines changed: 27 additions & 8 deletions

File tree

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//! differential dataflow computations from declaratively specified
55
//! programs, without any additional compilation.
66
7-
// #![forbid(missing_docs)]
7+
#![forbid(missing_docs)]
88

99
#[macro_use]
1010
extern crate log;

src/plan/graphql_v2.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ fn selection_set_to_paths(
252252
}
253253

254254
impl GraphQl {
255+
/// See Implementable::dependencies, as GraphQl v2 can't implement
256+
/// Implementable directly.
255257
pub fn dependencies(&self) -> Dependencies {
256258
let mut dependencies = Dependencies::none();
257259

@@ -262,6 +264,8 @@ impl GraphQl {
262264
dependencies
263265
}
264266

267+
/// See Implementable::implement, as GraphQl v2 can't implement
268+
/// Implementable directly.
265269
pub fn implement<'b, T, I, S>(
266270
&self,
267271
nested: &mut Iterative<'b, S, u64>,
@@ -481,9 +485,9 @@ fn pointer_mut<'a>(v: &'a mut JValue, tokens: &[String]) -> &'a mut JValue {
481485
}
482486
}
483487

484-
fn parse_index(s: &str) -> Option<usize> {
485-
if s.starts_with('+') || (s.starts_with('0') && s.len() != 1) {
486-
return None;
487-
}
488-
s.parse().ok()
489-
}
488+
// fn parse_index(s: &str) -> Option<usize> {
489+
// if s.starts_with('+') || (s.starts_with('0') && s.len() != 1) {
490+
// return None;
491+
// }
492+
// s.parse().ok()
493+
// }

src/plan/pull_v2.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ use crate::plan::{Dependencies, ImplContext, Implementable, Plan};
1414
use crate::{Aid, Value, Var};
1515
use crate::{Relation, ShutdownHandle, VariableMap};
1616

17+
/// A sequence of attributes that uniquely identify a nesting level in
18+
/// a Pull query.
1719
pub type PathId = Vec<Aid>;
1820

1921
/// A plan stage for extracting all matching [e a v] tuples for a
@@ -34,6 +36,8 @@ pub struct PullLevel<P: Implementable> {
3436
}
3537

3638
impl<P: Implementable> PullLevel<P> {
39+
/// See Implementable::dependencies, as PullLevel v2 can't
40+
/// implement Implementable directly.
3741
fn dependencies(&self) -> Dependencies {
3842
let mut dependencies = self.plan.dependencies();
3943

@@ -45,6 +49,8 @@ impl<P: Implementable> PullLevel<P> {
4549
dependencies
4650
}
4751

52+
/// See Implementable::implement, as PullLevel v2 can't implement
53+
/// Implementable directly.
4854
fn implement<'b, T, I, S>(
4955
&self,
5056
nested: &mut Iterative<'b, S, u64>,
@@ -143,6 +149,8 @@ pub struct PullAll {
143149
}
144150

145151
impl PullAll {
152+
/// See Implementable::dependencies, as PullAll v2 can't implement
153+
/// Implementable directly.
146154
fn dependencies(&self) -> Dependencies {
147155
let mut dependencies = Dependencies::none();
148156

@@ -154,6 +162,8 @@ impl PullAll {
154162
dependencies
155163
}
156164

165+
/// See Implementable::implement, as PullAll v2 can't implement
166+
/// Implementable directly.
157167
fn implement<'b, T, I, S>(
158168
&self,
159169
nested: &mut Iterative<'b, S, u64>,
@@ -220,13 +230,17 @@ pub enum Pull {
220230
}
221231

222232
impl Pull {
233+
/// See Implementable::dependencies, as Pull v2 can't implement
234+
/// Implementable directly.
223235
pub fn dependencies(&self) -> Dependencies {
224236
match self {
225237
Pull::All(ref pull) => pull.dependencies(),
226238
Pull::Level(ref pull) => pull.dependencies(),
227239
}
228240
}
229241

242+
/// See Implementable::implement, as Pull v2 can't implement
243+
/// Implementable directly.
230244
pub fn implement<'b, T, I, S>(
231245
&self,
232246
nested: &mut Iterative<'b, S, u64>,

src/server/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::time::{Duration, Instant};
99
use timely::communication::Allocate;
1010
use timely::dataflow::operators::capture::event::link::EventLink;
1111
use timely::dataflow::{ProbeHandle, Scope};
12-
use timely::logging::{BatchLogger, Logger, TimelyEvent};
12+
use timely::logging::{BatchLogger, TimelyEvent};
1313
use timely::progress::Timestamp;
1414
use timely::worker::Worker;
1515

@@ -396,6 +396,7 @@ where
396396
source: Box<dyn Sourceable<S>>,
397397
scope: &mut S,
398398
) -> Result<(), Error> {
399+
// use timely::logging::Logger;
399400
// let timely_logger = scope.log_register().remove("timely");
400401

401402
// let differential_logger = scope.log_register().remove("differential/arrange");

0 commit comments

Comments
 (0)