Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 1 addition & 13 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
CACHEGRIND=qcachegrind
REBAR3=$(shell which rebar3)
ifeq ($(REBAR3),)
REBAR3=./bin/rebar3
Expand All @@ -22,21 +21,10 @@ eunit:
@echo "Running rebar3 eunit..."
@$(REBAR3) do eunit -cv, cover -v

profile:
@echo "Profiling..."
@$(REBAR3) as test compile
@erl -noshell \
-pa _build/test/lib/*/ebin \
-pa _build/test/lib/*/test \
-eval 'marina_profile:fprofx()' \
-eval 'init:stop()'
@_build/test/lib/fprofx/erlgrindx -p fprofx.analysis
@$(CACHEGRIND) fprofx.cgrind

test: xref eunit dialyzer

xref:
@echo "Running rebar3 xref..."
@$(REBAR3) xref

.PHONY: clean compile dialyzer eunit profile test xref
.PHONY: clean compile dialyzer eunit test xref
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ make xref # cross-reference analysis
make dialyzer # success typing
make eunit # unit + integration tests (expects ScyllaDB at 172.18.0.2:9042)
make test # xref + eunit + dialyzer
make bench # ring-lookup micro-benchmark
```

The bundled `Dockerfile` produces the CI image (`lpgauth/erlang-scylla:28.3.1-6.2.3-amd64`) by layering OTP 28.3.1 (from the official `erlang` image) on top of `scylladb/scylla:6.2.3`. For local integration tests, run that image or a plain ScyllaDB container on `172.18.0.2:9042`.
Expand Down
13 changes: 3 additions & 10 deletions rebar.config
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{cover_export_enabled, true}.
{cover_excl_mods, [
marina_profile,
marina_tests
]}.

{deps, [
{foil, "0.1.4"},
{foil, "0.1.6"},
{lz4_nif, "0.1.1"},
{murmur_nif, "0.1.0"},
{shackle, "0.7.1"},
{murmur_nif, "0.1.1"},
{shackle, "0.7.3"},
{telemetry, "1.4.2"}
]}.

Expand Down Expand Up @@ -43,12 +42,6 @@
warn_unused_import,
warn_unused_vars
]}
]},
{test, [
{deps, [
{fprofx,
{git, "https://github.com/lpgauth/fprofx.git", {branch, "otp_19"}}}
]}
]}
]}.

Expand Down
24 changes: 12 additions & 12 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
{"1.2.0",
[{<<"foil">>,{pkg,<<"foil">>,<<"0.1.4">>},0},
{<<"knot">>,{pkg,<<"knot">>,<<"0.1.0">>},1},
[{<<"foil">>,{pkg,<<"foil">>,<<"0.1.6">>},0},
{<<"knot">>,{pkg,<<"knot">>,<<"0.1.2">>},1},
{<<"lz4_nif">>,{pkg,<<"lz4_nif">>,<<"0.1.1">>},0},
{<<"metal">>,{pkg,<<"metal">>,<<"0.1.2">>},1},
{<<"murmur_nif">>,{pkg,<<"murmur_nif">>,<<"0.1.0">>},0},
{<<"shackle">>,{pkg,<<"shackle">>,<<"0.7.1">>},0},
{<<"murmur_nif">>,{pkg,<<"murmur_nif">>,<<"0.1.1">>},0},
{<<"shackle">>,{pkg,<<"shackle">>,<<"0.7.3">>},0},
{<<"telemetry">>,{pkg,<<"telemetry">>,<<"1.4.2">>},0}]}.
[
{pkg_hash,[
{<<"foil">>, <<"1B786A2CC3E81496F98F799DF23AA24065253A94032AB79E5D60AED5423850AE">>},
{<<"knot">>, <<"62CACC2CD9E2D50373EAFAC7C26A4286EF22C4590CBBF42FC81B4B0F497CC87D">>},
{<<"foil">>, <<"31A9048E8EC6E8AC951ED3C4E4EB8F549465920C70F19E92CD9FC8A6867E7253">>},
{<<"knot">>, <<"3B6C07CD24831D62752D879F031BCEDCFADB343738679EB1774A029D0A8B7D48">>},
{<<"lz4_nif">>, <<"4C851F96C14A63388BCE34B5803A195D75485CA905E29D733B3023C6B872EC44">>},
{<<"metal">>, <<"7501F14B075380F829498C4CE605643D6C7F0C55F60EBFCFBF694C33A558DF98">>},
{<<"murmur_nif">>, <<"A371CC40D7DBA50FBEFF1E053869D5CFD27136A881A10F29DD45C4D46F1F9400">>},
{<<"shackle">>, <<"0516B5890BFAC7153D10FABD8D73AB735685E84B6C22D0A8306567142741E63A">>},
{<<"murmur_nif">>, <<"DA094D91F3A9E65B2D8F661E05739494AEC5209C8E405659E5E81CEF4113CF34">>},
{<<"shackle">>, <<"DEDE0777BC297B212DE3DBE4377B391DA991FC011B4D5201960A5C4F11E83B2C">>},
{<<"telemetry">>, <<"A0CB522801DFFB1C49FE6E30561BADFFC7B6D0E180DB1300DF759FAA22062855">>}]},
{pkg_hash_ext,[
{<<"foil">>, <<"4B0C51432A13740E5D74289C19A584A02B1BA02558AA9002665900EC61260E1B">>},
{<<"knot">>, <<"5659015314767F69BD95D88B0AEDF6A65DCBEF3E9AFE49172D0429B18DB89584">>},
{<<"foil">>, <<"8D34B12D712FFB30AD9E192F57885ABB1A61510CD3D9F6AA44470510A50B979E">>},
{<<"knot">>, <<"42CB91A8024A8857D70A61B33E83D31370D5EB48681B366AE1203CB7C7CCFB38">>},
{<<"lz4_nif">>, <<"F63198268F31DA8EB9C54510B6C690178ABCD69F14271997D49644CAD8748F4A">>},
{<<"metal">>, <<"CAC84E5CF2875B56E68874F3F0B3D598AF3EC30397EC2151D5C81C408961E6E4">>},
{<<"murmur_nif">>, <<"C652591291A935307FF26AB06D2E172542D9551C001FB18433049F318A669CCA">>},
{<<"shackle">>, <<"A9E14E3E253369F133226163C22854A20A5BC22DDCE5C61C87A51E587E5E67C8">>},
{<<"murmur_nif">>, <<"2971C5E72FCFC7C293281462927B5E32AF3245E6FD6315AC429BBD1D280D0A02">>},
{<<"shackle">>, <<"056944FEEB85ED0F3E1B7505FBC7174CDE0788993A19E9ADA85137A23CA56349">>},
{<<"telemetry">>, <<"928F6495066506077862C0D1646609EED891A4326BEE3126BA54B60AF61FEBB1">>}]}
].
87 changes: 0 additions & 87 deletions test/marina_profile.erl

This file was deleted.

Loading