Skip to content

Commit 1c809d3

Browse files
Ilse Macíasmsrd0
Ilse Macías
authored and
msrd0
committed
Lowercase Timestamps variants (#40)
1 parent d09b85a commit 1c809d3

File tree

6 files changed

+47
-47
lines changed

6 files changed

+47
-47
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ let client = Client::new("http://localhost:8086", "test");
6767
// Let's write something to InfluxDB. First we're creating a
6868
// WriteQuery to write some data.
6969
// This creates a query which writes a new measurement into a series called `weather`
70-
let write_query = Query::write_query(Timestamp::NOW, "weather")
70+
let write_query = Query::write_query(Timestamp::Now, "weather")
7171
.add_field("temperature", 82);
7272

7373
// Since this library is async by default, we're going to need a Runtime,

‎src/client/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ impl Client {
170170
///
171171
/// let client = Client::new("http://localhost:8086", "test");
172172
/// let _future = client.query(
173-
/// &Query::write_query(Timestamp::NOW, "weather")
173+
/// &Query::write_query(Timestamp::Now, "weather")
174174
/// .add_field("temperature", 82)
175175
/// );
176176
/// ```

‎src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
//! // Let's write something to InfluxDB. First we're creating a
3939
//! // WriteQuery to write some data.
4040
//! // This creates a query which writes a new measurement into a series called `weather`
41-
//! let write_query = Query::write_query(Timestamp::NOW, "weather")
41+
//! let write_query = Query::write_query(Timestamp::Now, "weather")
4242
//! .add_field("temperature", 82);
4343
//!
4444
//! // Since this library is async by default, we're going to need a Runtime,

‎src/query/mod.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//! ```rust
77
//! use influxdb::{Query, Timestamp};
88
//!
9-
//! let write_query = Query::write_query(Timestamp::NOW, "measurement")
9+
//! let write_query = Query::write_query(Timestamp::Now, "measurement")
1010
//! .add_field("field1", 5)
1111
//! .add_tag("author", "Gero")
1212
//! .build();
@@ -28,22 +28,22 @@ use crate::{Error, ReadQuery, WriteQuery};
2828

2929
#[derive(PartialEq)]
3030
pub enum Timestamp {
31-
NOW,
32-
NANOSECONDS(usize),
33-
MICROSECONDS(usize),
34-
MILLISECONDS(usize),
35-
SECONDS(usize),
36-
MINUTES(usize),
37-
HOURS(usize),
31+
Now,
32+
Nanoseconds(usize),
33+
Microseconds(usize),
34+
Milliseconds(usize),
35+
Seconds(usize),
36+
Minutes(usize),
37+
Hours(usize),
3838
}
3939

4040
impl fmt::Display for Timestamp {
4141
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
4242
use Timestamp::*;
4343
match self {
44-
NOW => write!(f, ""),
45-
NANOSECONDS(ts) | MICROSECONDS(ts) | MILLISECONDS(ts) | SECONDS(ts) | MINUTES(ts)
46-
| HOURS(ts) => write!(f, "{}", ts),
44+
Now => write!(f, ""),
45+
Nanoseconds(ts) | Microseconds(ts) | Milliseconds(ts) | Seconds(ts) | Minutes(ts)
46+
| Hours(ts) => write!(f, "{}", ts),
4747
}
4848
}
4949
}
@@ -76,10 +76,10 @@ pub trait Query {
7676
/// ```rust
7777
/// use influxdb::{Query, Timestamp};
7878
///
79-
/// let invalid_query = Query::write_query(Timestamp::NOW, "measurement").build();
79+
/// let invalid_query = Query::write_query(Timestamp::Now, "measurement").build();
8080
/// assert!(invalid_query.is_err());
8181
///
82-
/// let valid_query = Query::write_query(Timestamp::NOW, "measurement").add_field("myfield1", 11).build();
82+
/// let valid_query = Query::write_query(Timestamp::Now, "measurement").add_field("myfield1", 11).build();
8383
/// assert!(valid_query.is_ok());
8484
/// ```
8585
fn build(&self) -> Result<ValidQuery, Error>;
@@ -95,7 +95,7 @@ impl dyn Query {
9595
/// ```rust
9696
/// use influxdb::{Query, Timestamp};
9797
///
98-
/// Query::write_query(Timestamp::NOW, "measurement"); // Is of type [`WriteQuery`](crate::WriteQuery)
98+
/// Query::write_query(Timestamp::Now, "measurement"); // Is of type [`WriteQuery`](crate::WriteQuery)
9999
/// ```
100100
pub fn write_query<S>(timestamp: Timestamp, measurement: S) -> WriteQuery
101101
where
@@ -174,11 +174,11 @@ mod tests {
174174

175175
#[test]
176176
fn test_format_for_timestamp_now() {
177-
assert!(format!("{}", Timestamp::NOW) == "");
177+
assert!(format!("{}", Timestamp::Now) == "");
178178
}
179179

180180
#[test]
181181
fn test_format_for_timestamp_else() {
182-
assert!(format!("{}", Timestamp::NANOSECONDS(100)) == "100");
182+
assert!(format!("{}", Timestamp::Nanoseconds(100)) == "100");
183183
}
184184
}

‎src/query/write_query.rs

+17-17
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ impl WriteQuery {
5656
/// ```rust
5757
/// use influxdb::{Query, Timestamp};
5858
///
59-
/// Query::write_query(Timestamp::NOW, "measurement").add_field("field1", 5).build();
59+
/// Query::write_query(Timestamp::Now, "measurement").add_field("field1", 5).build();
6060
/// ```
6161
pub fn add_field<S, F>(mut self, tag: S, value: F) -> Self
6262
where
@@ -77,7 +77,7 @@ impl WriteQuery {
7777
/// ```rust
7878
/// use influxdb::{Query, Timestamp};
7979
///
80-
/// Query::write_query(Timestamp::NOW, "measurement")
80+
/// Query::write_query(Timestamp::Now, "measurement")
8181
/// .add_tag("field1", 5); // calling `.build()` now would result in a `Err(Error::InvalidQueryError)`
8282
/// ```
8383
pub fn add_tag<S, I>(mut self, tag: S, value: I) -> Self
@@ -92,13 +92,13 @@ impl WriteQuery {
9292

9393
pub fn get_precision(&self) -> String {
9494
let modifier = match self.timestamp {
95-
Timestamp::NOW => return String::from(""),
96-
Timestamp::NANOSECONDS(_) => "ns",
97-
Timestamp::MICROSECONDS(_) => "u",
98-
Timestamp::MILLISECONDS(_) => "ms",
99-
Timestamp::SECONDS(_) => "s",
100-
Timestamp::MINUTES(_) => "m",
101-
Timestamp::HOURS(_) => "h",
95+
Timestamp::Now => return String::from(""),
96+
Timestamp::Nanoseconds(_) => "ns",
97+
Timestamp::Microseconds(_) => "u",
98+
Timestamp::Milliseconds(_) => "ms",
99+
Timestamp::Seconds(_) => "s",
100+
Timestamp::Minutes(_) => "m",
101+
Timestamp::Hours(_) => "h",
102102
};
103103
modifier.to_string()
104104
}
@@ -178,7 +178,7 @@ impl Query for WriteQuery {
178178
tags = tags,
179179
fields = fields,
180180
time = match self.timestamp {
181-
Timestamp::NOW => String::from(""),
181+
Timestamp::Now => String::from(""),
182182
_ => format!(" {}", self.timestamp),
183183
}
184184
)))
@@ -195,14 +195,14 @@ mod tests {
195195

196196
#[test]
197197
fn test_write_builder_empty_query() {
198-
let query = Query::write_query(Timestamp::HOURS(5), "marina_3").build();
198+
let query = Query::write_query(Timestamp::Hours(5), "marina_3").build();
199199

200200
assert!(query.is_err(), "Query was not empty");
201201
}
202202

203203
#[test]
204204
fn test_write_builder_single_field() {
205-
let query = Query::write_query(Timestamp::HOURS(11), "weather")
205+
let query = Query::write_query(Timestamp::Hours(11), "weather")
206206
.add_field("temperature", 82)
207207
.build();
208208

@@ -212,7 +212,7 @@ mod tests {
212212

213213
#[test]
214214
fn test_write_builder_multiple_fields() {
215-
let query = Query::write_query(Timestamp::HOURS(11), "weather")
215+
let query = Query::write_query(Timestamp::Hours(11), "weather")
216216
.add_field("temperature", 82)
217217
.add_field("wind_strength", 3.7)
218218
.build();
@@ -226,7 +226,7 @@ mod tests {
226226

227227
#[test]
228228
fn test_write_builder_optional_fields() {
229-
let query = Query::write_query(Timestamp::HOURS(11), "weather")
229+
let query = Query::write_query(Timestamp::Hours(11), "weather")
230230
.add_field("temperature", Some(82u64))
231231
.add_field("wind_strength", <Option<u64>>::None)
232232
.build();
@@ -237,7 +237,7 @@ mod tests {
237237

238238
#[test]
239239
fn test_write_builder_only_tags() {
240-
let query = Query::write_query(Timestamp::HOURS(11), "weather")
240+
let query = Query::write_query(Timestamp::Hours(11), "weather")
241241
.add_tag("season", "summer")
242242
.build();
243243

@@ -246,7 +246,7 @@ mod tests {
246246

247247
#[test]
248248
fn test_write_builder_full_query() {
249-
let query = Query::write_query(Timestamp::HOURS(11), "weather")
249+
let query = Query::write_query(Timestamp::Hours(11), "weather")
250250
.add_field("temperature", 82)
251251
.add_tag("location", "us-midwest")
252252
.add_tag("season", "summer")
@@ -263,7 +263,7 @@ mod tests {
263263
fn test_correct_query_type() {
264264
use crate::query::QueryType;
265265

266-
let query = Query::write_query(Timestamp::HOURS(11), "weather")
266+
let query = Query::write_query(Timestamp::Hours(11), "weather")
267267
.add_field("temperature", 82)
268268
.add_tag("location", "us-midwest")
269269
.add_tag("season", "summer");

‎tests/integration_tests.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ fn test_authed_write_and_read() {
115115

116116
let client = Client::new("http://localhost:9086", test_name).with_auth("admin", "password");
117117
let write_query =
118-
Query::write_query(Timestamp::HOURS(11), "weather").add_field("temperature", 82);
118+
Query::write_query(Timestamp::Hours(11), "weather").add_field("temperature", 82);
119119
let write_result = get_runtime().block_on(client.query(&write_query));
120120
assert_result_ok(&write_result);
121121

@@ -155,7 +155,7 @@ fn test_wrong_authed_write_and_read() {
155155
let client =
156156
Client::new("http://localhost:9086", test_name).with_auth("wrong_user", "password");
157157
let write_query =
158-
Query::write_query(Timestamp::HOURS(11), "weather").add_field("temperature", 82);
158+
Query::write_query(Timestamp::Hours(11), "weather").add_field("temperature", 82);
159159
let write_result = get_runtime().block_on(client.query(&write_query));
160160
assert_result_err(&write_result);
161161
match write_result {
@@ -216,7 +216,7 @@ fn test_non_authed_write_and_read() {
216216
};
217217
let non_authed_client = Client::new("http://localhost:9086", test_name);
218218
let write_query =
219-
Query::write_query(Timestamp::HOURS(11), "weather").add_field("temperature", 82);
219+
Query::write_query(Timestamp::Hours(11), "weather").add_field("temperature", 82);
220220
let write_result = get_runtime().block_on(non_authed_client.query(&write_query));
221221
assert_result_err(&write_result);
222222
match write_result {
@@ -254,7 +254,7 @@ fn test_write_and_read_field() {
254254

255255
let client = create_client(test_name);
256256
let write_query =
257-
Query::write_query(Timestamp::HOURS(11), "weather").add_field("temperature", 82);
257+
Query::write_query(Timestamp::Hours(11), "weather").add_field("temperature", 82);
258258
let write_result = get_runtime().block_on(client.query(&write_query));
259259
assert_result_ok(&write_result);
260260

@@ -286,7 +286,7 @@ fn test_write_and_read_option() {
286286

287287
let client = create_client(test_name);
288288
// Todo: Convert this to derive based insert for easier comparison of structs
289-
let write_query = Query::write_query(Timestamp::HOURS(11), "weather")
289+
let write_query = Query::write_query(Timestamp::Hours(11), "weather")
290290
.add_field("temperature", 82)
291291
.add_field("wind_strength", <Option<u64>>::None);
292292
let write_result = get_runtime().block_on(client.query(&write_query));
@@ -338,7 +338,7 @@ fn test_json_query() {
338338

339339
// todo: implement deriving so objects can easily be placed in InfluxDB
340340
let write_query =
341-
Query::write_query(Timestamp::HOURS(11), "weather").add_field("temperature", 82);
341+
Query::write_query(Timestamp::Hours(11), "weather").add_field("temperature", 82);
342342
let write_result = get_runtime().block_on(client.query(&write_query));
343343
assert_result_ok(&write_result);
344344

@@ -385,11 +385,11 @@ fn test_json_query_vec() {
385385

386386
let client = create_client(test_name);
387387
let write_query1 =
388-
Query::write_query(Timestamp::HOURS(11), "temperature_vec").add_field("temperature", 16);
388+
Query::write_query(Timestamp::Hours(11), "temperature_vec").add_field("temperature", 16);
389389
let write_query2 =
390-
Query::write_query(Timestamp::HOURS(12), "temperature_vec").add_field("temperature", 17);
390+
Query::write_query(Timestamp::Hours(12), "temperature_vec").add_field("temperature", 17);
391391
let write_query3 =
392-
Query::write_query(Timestamp::HOURS(13), "temperature_vec").add_field("temperature", 18);
392+
Query::write_query(Timestamp::Hours(13), "temperature_vec").add_field("temperature", 18);
393393

394394
let _write_result = get_runtime().block_on(client.query(&write_query1));
395395
let _write_result2 = get_runtime().block_on(client.query(&write_query2));
@@ -442,9 +442,9 @@ fn test_serde_multi_query() {
442442

443443
let client = create_client(test_name);
444444
let write_query =
445-
Query::write_query(Timestamp::HOURS(11), "temperature").add_field("temperature", 16);
445+
Query::write_query(Timestamp::Hours(11), "temperature").add_field("temperature", 16);
446446
let write_query2 =
447-
Query::write_query(Timestamp::HOURS(11), "humidity").add_field("humidity", 69);
447+
Query::write_query(Timestamp::Hours(11), "humidity").add_field("humidity", 69);
448448

449449
let write_result = get_runtime().block_on(client.query(&write_query));
450450
let write_result2 = get_runtime().block_on(client.query(&write_query2));

0 commit comments

Comments
 (0)