Update support for Erlang 25-27, removed for 21-24. (#113)

* Removed rebar3 binary
* Removed linter, format is enough
* Ran formatter again
* Fixed typo
* Some types are not valid anymore (e.g. tuple(node())), some types not
  exported (init:internal_status). Fixed and added TODOs
* Ignored a function for dialyzer, reason unknown why dialyzer complains
* Fixed typo
* Removed elvis config

Co-authored-by: as <git@schimpf.link>

Author: albsch

.github/workflows/erlang.yml

@@ -11,7 +11,7 @@ jobs:
     strategy: 
       fail-fast: false
       matrix:
-        erlang: [ 21,22,23,24 ]
+        erlang: [ 25,26,27 ]
 
     container:
       image: erlang:${{ matrix.erlang }}
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy: 
       matrix:
-        erlang: [ 21,22,23,24 ]
+        erlang: [ 25,26,27 ]
 
     container:
       image: erlang:${{ matrix.erlang }}
@@ -38,13 +38,13 @@ jobs:
     - name: Send Coverage
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: ./rebar3 as test coveralls send
+      run: rebar3 as test coveralls send
 
   verify:
     runs-on: ubuntu-latest
     strategy: 
       matrix:
-        erlang: [ 21,22,23,24 ]
+        erlang: [ 25,26,27 ]
 
     container:
       image: erlang:${{ matrix.erlang }}
@@ -53,31 +53,5 @@ jobs:
     - uses: actions/checkout@v2
     - run: make format
     - run: make xref
-    - run: make lint
     - run: make dialyzer
 
-  system-tests:
-    runs-on: ubuntu-latest
-    strategy: 
-      matrix:
-        erlang: [ 21,22,23,24 ]
-
-    container:
-      image: erlang:${{ matrix.erlang }}
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        repository: riak-core-lite/rclref
-        path: ./rclref
-
-    - uses: actions/checkout@v2
-      with:
-        path: ./riak_core/
-
-    - run: |
-        mkdir rclref/_checkouts;\
-        ln -s ../../riak_core/ rclref/_checkouts/riak_core;\
-        cd rclref;\
-        make ct
-

Makefile

@@ -1,6 +1,6 @@
 PULSE_TESTS = worker_pool_pulse
 COVERPATH = ./_build/test/cover
-REBAR ?= ./rebar3
+REBAR ?= rebar3
 
 .PHONY: deps test docs xref dialyzer format
 
@@ -57,5 +57,3 @@ xref: compile
 dialyzer:
 	${REBAR} dialyzer
 
-lint:
-	${REBAR} lint

README.md

@@ -7,7 +7,7 @@ Build upon the essence of Riak KV's core with an up-to-date, modular and extensi
 # riak_core_lite
 
 ![Language](https://img.shields.io/badge/language-erlang-blue.svg)
-![Release](https://img.shields.io/badge/release-R21+-9cf.svg)
+![Release](https://img.shields.io/badge/release-R25+-9cf.svg)
 ![Release](https://img.shields.io/badge/formatter-erlang_otp-33d.svg)
 ![Build](https://img.shields.io/badge/build-rebar3%203.15.1-brightgreen.svg)
 

elvis.config

@@ -50,10 +50,9 @@
          type :: ho_type() | undefined,
          req_origin :: node(),
          filter_mod_fun :: {module(), atom()} | undefined,
-         size = {0, objects}::
+         size = {0, objects} ::
              {function(), dynamic} |
-             {non_neg_integer(), bytes | objects}
-        }).
+             {non_neg_integer(), bytes | objects}}).
 
 -type handoff_status() :: #handoff_status{}.
 

include/riak_core_handoff.hrl

@@ -1,6 +1,8 @@
--type sender_type() :: fsm | server .
+-type sender_type() :: fsm | server.
 
--type sender() :: {sender_type(), reference() | tuple() | ignore_ref , pid()} | ignore.
+-type sender() :: {sender_type(),
+                   reference() | tuple() | ignore_ref, pid()} |
+                  ignore.
 
 -type partition() :: chash:index_as_int().
 

include/riak_core_vnode.hrl

@@ -18,8 +18,7 @@
 .
 
 %% Code formatter
-{project_plugins,
- [rebar3_format, rebar3_lint, rebar3_proper]}
+{project_plugins, [rebar3_format, rebar3_proper]}
 
 .
 

rebar.config

@@ -103,15 +103,19 @@ fresh(NumPartitions, SeedNode) ->
     Inc = ring_increment(NumPartitions),
     {NumPartitions,
      [{IndexAsInt, SeedNode}
-      || IndexAsInt <- lists:seq(0, (?RINGTOP) -1 -(?RINGTOP rem NumPartitions), Inc)]}.
+      || IndexAsInt
+             <- lists:seq(0,
+                          (?RINGTOP) - 1 - (?RINGTOP) rem NumPartitions,
+                          Inc)]}.
 
 %% @doc Find the Node that owns the partition identified by IndexAsInt.
 -spec lookup(IndexAsInt :: index_as_int(),
              CHash :: chash()) -> chash_node().
 
 lookup(IndexAsInt, CHash) ->
     {_NumPartitions, NodeEntries} = CHash,
-    {IndexAsInt, Node} = proplists:lookup(IndexAsInt, NodeEntries),
+    {IndexAsInt, Node} = proplists:lookup(IndexAsInt,
+                                          NodeEntries),
     Node.
 
 sha(Bin) -> crypto:hash(sha, Bin).
@@ -141,7 +145,8 @@ merge_rings(CHashA, CHashB) ->
     {NumPartitions, NodeEntriesB} = CHashB,
     {NumPartitions,
      [{I, random_node(NodeA, NodeB)}
-      || {{I, NodeA}, {I, NodeB}} <- lists:zip(NodeEntriesA, NodeEntriesB)]}.
+      || {{I, NodeA}, {I, NodeB}}
+             <- lists:zip(NodeEntriesA, NodeEntriesB)]}.
 
 %% @doc Given the integer representation of a chash key,
 %%      return the next ring index integer value.
@@ -166,7 +171,10 @@ nodes(CHash) ->
 ordered_from(Index, {NumPartitions, NodeEntries}) ->
     <<IndexAsInt:160/integer>> = Index,
     Inc = ring_increment(NumPartitions),
-    {NodeEntriesA, NodeEntriesB} = lists:split(IndexAsInt div Inc + 1, NodeEntries),
+    {NodeEntriesA, NodeEntriesB} = lists:split(IndexAsInt
+                                                   div Inc
+                                                   + 1,
+                                               NodeEntries),
     NodeEntriesB ++ NodeEntriesA.
 
 %% @doc Given an object key, return all NodeEntries in reverse order
@@ -236,9 +244,9 @@ successors(Index, CHash, N) ->
 update(IndexAsInt, Name, CHash) ->
     {NumPartitions, NodeEntries} = CHash,
     NewNodeEntries = lists:keyreplace(IndexAsInt,
-                                1,
-                                NodeEntries,
-                                {IndexAsInt, Name}),
+                                      1,
+                                      NodeEntries,
+                                      {IndexAsInt, Name}),
     {NumPartitions, NewNodeEntries}.
 
 %% ====================================================================
@@ -268,9 +276,12 @@ random_node(NodeA, NodeB) ->
 -ifdef(TEST).
 
 fresh_sizes_test() ->
-    lists:foreach(fun(I) ->
-        ?assertEqual(I, (length(chash:nodes(chash:fresh(I, the_node)))))
-    end, [1, 10000]).
+    lists:foreach(fun (I) ->
+                          ?assertEqual(I,
+                                       (length(chash:nodes(chash:fresh(I,
+                                                                       the_node)))))
+                  end,
+                  [1, 10000]).
 
 update_test() ->
     Node = old@host,
@@ -281,14 +292,13 @@ update_test() ->
                           {Index, _} = lists:nth(N, NodeEntries),
                           Index
                   end,
-
     {5,
      [{_, Node},
       {_, Node},
       {_, Node},
       {_, Node},
-      {_, Node}]} = CHash,
-
+      {_, Node}]} =
+        CHash,
     % Test update...
     FirstIndex = GetNthIndex(1, CHash),
     ThirdIndex = GetNthIndex(3, CHash),

rebar3

@@ -61,14 +61,16 @@
 -record(chashbin,
         {size :: pos_integer(),
          owners :: owners_bin(),
-         nodes :: erlang:tuple(node())}).
+         nodes ::
+             tuple()}). % tuples as arrays, was tuple(node()) before
+
+- else .
 
--else.
 
 -record(chashbin,
         {size :: pos_integer(),
          owners :: owners_bin(),
-         nodes :: erlang:tuple(node())}).
+         nodes :: tuple()}).
 
 -endif.