Skip to content

Commit 28c5cc9

Browse files
committed
Bump version to v0.2.0
1 parent 95cea36 commit 28c5cc9

File tree

10 files changed

+201
-117
lines changed

10 files changed

+201
-117
lines changed

.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ language: rust
1010
rust:
1111
- nightly
1212
cache: cargo
13-
before_script:
14-
- rustup component add clippy-preview
1513
script:
1614
- cargo test --all-features
1715
- cargo check --bench basic
18-
- cargo clippy
1916
notifications:
2017
email:
2118
on_success: never

Cargo.lock

Lines changed: 45 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
[package]
2-
authors = ["Clemens Winter <[email protected]>", "David Fisher"]
2+
authors = ["Clemens Winter <[email protected]>"]
33
name = "locustdb"
4-
version = "0.2.0-dev"
4+
version = "0.2.0"
5+
license-file = "LICENSE"
6+
description = "Embeddable high-performance analytics database."
57
[build-dependencies]
68
[build-dependencies.capnpc]
79
optional = true
@@ -49,6 +51,7 @@ version = "0.8.17"
4951

5052
[dependencies.locustdb-derive]
5153
path = "./locustdb-derive"
54+
version = "0.1.0"
5255

5356
[dependencies.log]
5457
features = ["max_level_trace", "release_max_level_debug"]

locustdb-derive/Cargo.lock

Lines changed: 90 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

locustdb-derive/Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ authors = ["Clemens Winter <[email protected]>"]
33
edition = "2018"
44
name = "locustdb-derive"
55
version = "0.1.0"
6+
license = "Apache-2.0"
7+
description = "Macros used internally by locustdb crate."
68
[dependencies]
7-
lazy_static = "*"
9+
lazy_static = "1.2"
810
quote = "0.6"
9-
regex = "*"
11+
regex = "1.1"
1012

1113
[dependencies.proc-macro2]
1214
features = ["nightly"]

locustdb-derive/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(proc_macro_non_items, proc_macro_diagnostic)]
1+
#![feature(proc_macro_hygiene, proc_macro_diagnostic)]
22
#![recursion_limit = "128"]
33
extern crate proc_macro;
44
#[macro_use]

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2018-09-17
1+
nightly-2018-12-30

src/engine/data_types/data.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ use std::string;
66

77
use engine::data_types::*;
88
use ingest::raw_val::RawVal;
9-
use mem_store::value::Val;
10-
use mem_store::column::DataSource;
119
use mem_store::codec::Codec;
12-
use super::NullableVec;
10+
use mem_store::column::DataSource;
11+
use mem_store::value::Val;
1312

13+
use super::NullableVec;
1414

1515
pub type BoxedData<'a> = Box<Data<'a> + 'a>;
1616

src/engine/data_types/scalar_data.rs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ use std::fmt;
22
use std::mem;
33

44
use ingest::raw_val::RawVal;
5+
56
use super::*;
67

78
#[derive(Debug)]
@@ -14,11 +15,11 @@ impl<'a> Data<'a> for ScalarVal<i64> {
1415
}
1516

1617
impl<'a> Data<'a> for ScalarVal<&'a str> {
17-
fn len(&self) -> usize { 1 }
18+
default fn len(&self) -> usize { 1 }
1819
fn get_raw(&self, _: usize) -> RawVal { RawVal::Str(self.val.to_string()) }
19-
fn get_type(&self) -> EncodingType { EncodingType::ScalarStr }
20-
fn slice_box<'b>(&'b self, _: usize, _: usize) -> BoxedData<'b> where 'a: 'b { panic!(self.type_error("slice_box")) }
21-
fn type_error(&self, func_name: &str) -> String { format!("Vec<{:?}>.{}", self.get_type(), func_name) }
20+
default fn get_type(&self) -> EncodingType { EncodingType::ScalarStr }
21+
default fn slice_box<'b>(&'b self, _: usize, _: usize) -> BoxedData<'b> where 'a: 'b { panic!(self.type_error("slice_box")) }
22+
default fn type_error(&self, func_name: &str) -> String { format!("Vec<{:?}>.{}", self.get_type(), func_name) }
2223

2324
fn append_all(&mut self, _: &Data<'a>, _: usize) -> Option<BoxedData<'a>> {
2425
panic!(self.type_error("slice_box"))
@@ -30,17 +31,17 @@ impl<'a> Data<'a> for ScalarVal<&'a str> {
3031
}
3132

3233
impl<'a, T: ScalarData<T>> Data<'a> for ScalarVal<T> {
33-
fn len(&self) -> usize { 1 }
34-
fn get_raw(&self, _: usize) -> RawVal { T::raw_val(&self.val) }
35-
fn get_type(&self) -> EncodingType { T::t() }
36-
fn slice_box<'b>(&'b self, _: usize, _: usize) -> BoxedData<'b> where 'a: 'b { panic!(self.type_error("slice_box")) }
37-
fn type_error(&self, func_name: &str) -> String { format!("Vec<{:?}>.{}", T::t(), func_name) }
34+
default fn len(&self) -> usize { 1 }
35+
default fn get_raw(&self, _: usize) -> RawVal { T::raw_val(&self.val) }
36+
default fn get_type(&self) -> EncodingType { T::t() }
37+
default fn slice_box<'b>(&'b self, _: usize, _: usize) -> BoxedData<'b> where 'a: 'b { panic!(self.type_error("slice_box")) }
38+
default fn type_error(&self, func_name: &str) -> String { format!("Vec<{:?}>.{}", T::t(), func_name) }
3839

39-
fn append_all(&mut self, _: &Data<'a>, _: usize) -> Option<BoxedData<'a>> {
40+
default fn append_all(&mut self, _: &Data<'a>, _: usize) -> Option<BoxedData<'a>> {
4041
panic!(self.type_error("slice_box"))
4142
}
4243

43-
fn display(&self) -> String { format!("Scalar<{:?}>{:?}", T::t(), &self) }
44+
default fn display(&self) -> String { format!("Scalar<{:?}>{:?}", T::t(), &self) }
4445
}
4546

4647
impl<'a> Data<'a> for ScalarVal<String> {

src/lib.rs

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,57 @@
1-
#![feature(fn_traits, integer_atomics, refcell_replace_swap, specialization, trait_alias, core_intrinsics, box_patterns, int_to_from_bytes, tool_lints, proc_macro_non_items, extern_prelude)]
2-
extern crate sqlparser;
3-
#[macro_use]
4-
extern crate failure_derive;
5-
#[macro_use]
6-
extern crate log;
1+
#![feature(fn_traits, integer_atomics, refcell_replace_swap, specialization, trait_alias, core_intrinsics, box_patterns, proc_macro_hygiene)]
2+
extern crate aliasmethod;
3+
extern crate byteorder;
4+
#[cfg(feature = "enable_rocksdb")]
5+
extern crate capnp;
76
extern crate chrono;
7+
extern crate crypto;
88
extern crate failure;
9-
extern crate futures_core;
10-
extern crate futures_util;
9+
#[macro_use]
10+
extern crate failure_derive;
11+
extern crate fnv;
1112
extern crate futures_channel;
13+
extern crate futures_core;
1214
extern crate futures_executor;
15+
extern crate futures_util;
16+
extern crate heapsize;
1317
#[macro_use]
1418
extern crate heapsize_derive;
15-
extern crate heapsize;
19+
extern crate hex;
1620
extern crate itertools;
21+
#[macro_use]
22+
extern crate lazy_static;
23+
extern crate locustdb_derive;
24+
#[macro_use]
25+
extern crate log;
26+
extern crate lru;
1727
extern crate num;
1828
extern crate num_cpus;
29+
extern crate rand;
1930
extern crate regex;
2031
extern crate seahash;
21-
extern crate time;
22-
extern crate tempdir;
23-
extern crate fnv;
24-
extern crate byteorder;
25-
extern crate lru;
26-
extern crate crypto;
27-
extern crate hex;
28-
#[cfg(feature = "enable_rocksdb")]
29-
extern crate capnp;
32+
extern crate sqlparser;
3033
extern crate std_semaphore;
31-
extern crate aliasmethod;
32-
extern crate rand;
33-
extern crate locustdb_derive;
34-
#[macro_use]
35-
extern crate lazy_static;
34+
extern crate tempdir;
35+
extern crate time;
3636

3737

38+
pub use disk_store::noop_storage::NoopStorage;
39+
pub use engine::query_task::QueryOutput;
40+
pub use errors::QueryError;
41+
pub use ingest::colgen;
42+
pub use ingest::csv_loader::Options as LoadOptions;
43+
pub use ingest::extractor;
44+
pub use ingest::nyc_taxi_data;
45+
pub use ingest::raw_val::RawVal as Value;
46+
pub use ingest::raw_val::syntax as value_syntax;
47+
pub use locustdb::LocustDB as LocustDB;
48+
pub use locustdb::Options as Options;
49+
pub use mem_store::table::TableStats;
50+
#[doc(hidden)]
51+
pub use trace::_replace;
52+
#[doc(hidden)]
53+
pub use trace::_start;
54+
3855
#[macro_use]
3956
mod trace;
4057
#[macro_use]
@@ -50,26 +67,8 @@ mod stringpack;
5067
mod bitvec;
5168
pub mod unit_fmt;
5269

53-
pub use engine::query_task::QueryOutput;
54-
pub use errors::QueryError;
55-
pub use ingest::csv_loader::Options as LoadOptions;
56-
pub use ingest::extractor;
57-
pub use ingest::nyc_taxi_data;
58-
pub use ingest::raw_val::RawVal as Value;
59-
pub use ingest::raw_val::syntax as value_syntax;
60-
pub use ingest::colgen;
61-
pub use locustdb::LocustDB as LocustDB;
62-
pub use locustdb::Options as Options;
63-
pub use mem_store::table::TableStats;
64-
pub use disk_store::noop_storage::NoopStorage;
65-
6670
pub type QueryResult = Result<QueryOutput, QueryError>;
6771

68-
#[doc(hidden)]
69-
pub use trace::_replace;
70-
#[doc(hidden)]
71-
pub use trace::_start;
72-
7372
#[allow(warnings)]
7473
#[cfg(feature = "enable_rocksdb")]
7574
pub(crate) mod storage_format_capnp {

0 commit comments

Comments
 (0)