Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gg/prototype/timeseries range scan filter #145

Open
wants to merge 32 commits into
base: prototype/timeseries-range-scan-filter
Choose a base branch
from
Open

Gg/prototype/timeseries range scan filter #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c93682a
Merge branch '2.0' into develop
jaredmorrow Sep 4, 2014
074949b
Move spec to correct line so we can gen docs
russelldb Jan 8, 2015
10fcb78
Merge pull request #132 from basho/bug/rdb/doc-gen
borshop Jan 8, 2015
5bcb7ac
Merge branch '2.0' into develop-2.0-merge
cmeiklejohn Feb 13, 2015
a5b5148
Merge pull request #133 from basho/develop-2.0-merge
borshop Feb 13, 2015
1fb0a2d
use version 2.0.1 of cuttlefish
andrewjstone Feb 17, 2015
0e4e4e7
Merge pull request #134 from basho/the-great-versioning
borshop Feb 17, 2015
9df7c69
async_put (immutable work-in-progress)
jtuple Feb 19, 2015
26a1ac6
Fixed dialyzer spec for asyc_put
fadushin Mar 27, 2015
d946c61
Extended EQC test for async_put.
Mar 30, 2015
a36dbd6
Merge pull request #137 from basho/jdb-immutable-wip
borshop Mar 30, 2015
b544b75
Bumped leveldb version to pick up sequential tunings
May 29, 2015
6c39434
Merge pull request #139 from basho/jdm/update-leveldb-to-2.0.1
borshop May 29, 2015
58bb388
Update build_deps to pull leveldb 2.0.2
Jun 3, 2015
812335f
push leveldb version string into environment for build.
Jun 15, 2015
cbcee67
Bumping leveldb to 2.0.3
Jun 15, 2015
b51dce2
Merge branch '2.0' into develop
Jun 15, 2015
4f8e032
Merge pull request #140 from ahf/cleanup-lager
Jul 9, 2015
f9cae4f
interim commit of changed API for TS - needs dialyzer fix
Aug 7, 2015
e31a6de
backport develop to 2.1 branch on 8/11/15
Aug 11, 2015
90b263a
minor refactoring for time series integration
Aug 17, 2015
e726705
pin cuttlefish for e2e/ts
hmmr Aug 26, 2015
029ae98
Starting again, this time from gg/prototype/timeseries-range-scan-fil…
Aug 27, 2015
e7bee9f
Commented out macosx-version-min Opt from rebar.config.script, which …
Aug 27, 2015
a895dac
Removed macosx-min flag from rebar.config.script which prevents C++11…
Aug 27, 2015
5c767c3
First successful compile of merge of streaming folds + filtering code…
Aug 27, 2015
8f8d398
Added back range scan stuff for backwards compatibility (now supports…
Aug 27, 2015
606fccc
Fixed initializations preventing the code from compiling on buildbot
Aug 28, 2015
925a9bd
Fixed range_scan_ack declaration in eleveldb.erl that failed dialyzer…
Aug 28, 2015
072e905
Merging with changes I committed to end-to-end branch
Sep 1, 2015
78e2054
Merged with 2.1, end-to-end
Sep 1, 2015
3c73083
make decode_record return the thing, rather than {ok, Thing}
hmmr Sep 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions c_src/atoms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ extern ERL_NIF_TERM ATOM_RANGE_SCAN_END;
extern ERL_NIF_TERM ATOM_NEEDS_REACK;
extern ERL_NIF_TERM ATOM_TIME_SERIES;
extern ERL_NIF_TERM ATOM_RANGE_FILTER;
extern ERL_NIF_TERM ATOM_STREAMING_BATCH;
extern ERL_NIF_TERM ATOM_STREAMING_END;
extern ERL_NIF_TERM ATOM_LIMIT;
extern ERL_NIF_TERM ATOM_UNDEFINED;

} // namespace eleveldb

Expand Down
6 changes: 3 additions & 3 deletions c_src/build_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ if [ `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ]; then
fi
unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well

#LEVELDB_VSN="2.0.0"
LEVELDB_VSN="prototype/timeseries"

LEVELDB_VSN="feature/streaming-folds-filter"
SNAPPY_VSN="1.0.4"

set -e
Expand Down Expand Up @@ -48,6 +46,7 @@ case "$1" in
export CXXFLAGS="$CXXFLAGS -I $BASEDIR/system/include"
export LDFLAGS="$LDFLAGS -L$BASEDIR/system/lib"
export LD_LIBRARY_PATH="$BASEDIR/system/lib:$LD_LIBRARY_PATH"
export LEVELDB_VSN="$LEVELDB_VSN"

(cd leveldb && $MAKE check)

Expand All @@ -72,6 +71,7 @@ case "$1" in
export CXXFLAGS="$CXXFLAGS -I $BASEDIR/system/include"
export LDFLAGS="$LDFLAGS -L$BASEDIR/system/lib"
export LD_LIBRARY_PATH="$BASEDIR/system/lib:$LD_LIBRARY_PATH"
export LEVELDB_VSN="$LEVELDB_VSN"

if [ ! -d leveldb ]; then
git clone git://github.com/basho/leveldb
Expand Down
Loading