This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hashmap_get_pre(S) -> | |
S#state.hashmap /= undefined. | |
hashmap_get_args(S = #state{map=Map}) when length(Map) > 0 -> | |
[S#state.hashmap, | |
eqc_gen:oneof([eqc_gen:elements(element(1, lists:unzip(S#state.map))), | |
?SUCHTHAT(X1, eqc_gen:list(eqc_gen:char()), length(X1) > 0)])]; | |
hashmap_get_args(S) -> | |
[S#state.hashmap, ?SUCHTHAT(X1, eqc_gen:list(eqc_gen:char()), length(X1) > 0)]. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hashmap_put_pre(S) -> | |
S#state.hashmap /= undefined. | |
hashmap_put_args(S) -> | |
{Keys, _} = lists:unzip(S#state.map), | |
[S#state.hashmap, | |
?SUCHTHAT(X1, eqc_gen:list(eqc_gen:char()), length(X1) > 0 andalso not lists:member(X1, Keys)), | |
?SUCHTHAT(X2, eqc_gen:list(eqc_gen:char()), length(X2) > 0)]. | |
hashmap_put(Hashmap, Key, Value) -> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-module(hashmap_eqc). | |
%% include some quickcheck headers | |
-include_lib("eqc/include/eqc.hrl"). | |
-include_lib("eqc/include/eqc_statem.hrl"). | |
%% include the eqc-c generated header | |
-include("hashmap.hrl"). | |
%% function to initialize the model state |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-record(state, {hashmap=undefined, | |
size, | |
map=[]}). | |
hashmap_create_pre(S) -> | |
S#state.hashmap == undefined. | |
hashmap_create_args(_S) -> | |
[eqc_gen:choose(4,10)]. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
package main | |
import ( | |
"fmt" | |
"github.com/tpjg/goriakpbc" | |
) | |
func main() { | |
err := riak.ConnectClient("127.0.0.1:8087") | |
if err != nil { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/ssl/src/tls_connection.erl b/lib/ssl/src/tls_connection.erl | |
index 5618837..42fc099 100644 | |
--- a/lib/ssl/src/tls_connection.erl | |
+++ b/lib/ssl/src/tls_connection.erl | |
@@ -415,11 +415,16 @@ hello(Hello = #client_hello{client_version = ClientVersion, | |
ConnectionStates0, Cert}, Renegotiation) of | |
{Version, {Type, #session{cipher_suite = CipherSuite} = Session}, | |
ConnectionStates, | |
- #hello_extensions{ec_point_formats = EcPointFormats, | |
- elliptic_curves = EllipticCurves} = ServerHelloExt} -> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-module(test). | |
-export([ | |
test/0 | |
]). | |
-define(RIAK_HOST, "127.0.0.1"). | |
-define(RIAK_PORT, 8087). | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/poolboy.erl b/src/poolboy.erl | |
index 9b71104..386df02 100644 | |
--- a/src/poolboy.erl | |
+++ b/src/poolboy.erl | |
@@ -47,16 +47,16 @@ ready({checkin, Pid}, State) -> | |
ready(_Event, State) -> | |
{next_state, ready, State}. | |
-ready(checkout, {From, _}, #state{workers=Workers, worker_sup=Sup, | |
+ready(checkout, {FromPid, _} = From, #state{workers=Workers, worker_sup=Sup, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/c_src/Makefile b/c_src/Makefile | |
index b9c045c..1e78b33 100644 | |
--- a/c_src/Makefile | |
+++ b/c_src/Makefile | |
@@ -24,7 +24,7 @@ $(LIB_DIR)/libjs.a: $(LIB_DIR)/libnspr4.a | |
done | |
@$(MAKE) -C $(JS_DIR)/src BUILD_OPT=1 JS_DIST=$(SYSTEM_DIR) \ | |
JS_THREADSAFE=1 \ | |
- XCFLAGS="-DHAVE_VA_COPY -DVA_COPY=va_copy $(CFLAGS)" \ | |
+ XCFLAGS="-DJS_C_STRINGS_ARE_UTF8 -DHAVE_VA_COPY -DVA_COPY=va_copy $(CFLAGS)" \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/riak_kv_pb_socket.erl b/src/riak_kv_pb_socket.erl | |
index c9b7ace..dfb6eb2 100644 | |
--- a/src/riak_kv_pb_socket.erl | |
+++ b/src/riak_kv_pb_socket.erl | |
@@ -367,6 +367,8 @@ default_timeout() -> | |
%% Convert a vector clock to erlang | |
erlify_rpbvc(undefined) -> | |
vclock:fresh(); | |
+erlify_rpbvc(<<>>) -> | |
+ vclock:fresh(); |