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

Create Keyspace if missing option #49

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Create Keyspace if missing option #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ The cluster options can be set inside your `app.config` file under the `cluster_
{erlcass, [
{log_level, 3},
{keyspace, <<"keyspace">>},
{keyspace_cql, <<"your CQL query to create keyspace if missing">>},
{cluster_options,[
{contact_points, <<"172.17.3.129,172.17.3.130,172.17.3.131">>},
{latency_aware_routing, true},
Expand Down
1 change: 1 addition & 0 deletions benchmarks/benchmark.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

{erlcass, [
{keyspace, <<"load_test_erlcass">>},
{keyspace_cql, <<"CREATE KEYSPACE load_test_erlcass WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};">>},
{cluster_options,[
{contact_points, <<"172.17.3.129">>},
{latency_aware_routing, true},
Expand Down
71 changes: 56 additions & 15 deletions src/erlcass.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,13 +368,11 @@ receive_response(Tag) ->
{error, timeout}
end.

do_connect(Session, Pid, Keyspace) ->
erlcass_nif:cass_session_connect(Session, Pid, Keyspace).

do_connect(Session, Pid) ->
case erlcass_utils:get_env(keyspace) of
{ok, Keyspace} ->
erlcass_nif:cass_session_connect(Session, Pid, Keyspace);
_ ->
erlcass_nif:cass_session_connect(Session, Pid)
end.
erlcass_nif:cass_session_connect(Session, Pid).

do_close(undefined, _Pid, _Timeout) ->
ok;
Expand All @@ -393,16 +391,44 @@ session_create() ->
case erlcass_nif:cass_session_new() of
{ok, Session} ->
Self = self(),
case do_connect(Session, Self) of
Keyspace = case erlcass_utils:get_env(keyspace) of
{ok, Space} -> Space;
_ -> ""
end,
KeyspaceCQL = case erlcass_utils:get_env(keyspace_cql) of
{ok, CQL} -> CQL;
_ -> ""
end,
Connect = case Keyspace of
"" -> do_connect(Session, Self);
Keyspace -> do_connect(Session, Self, Keyspace)
end,
case Connect of
ok ->
receive
{session_connected, Self, Result} ->
?INFO_MSG("session ~p connection complete result: ~p", [Self, Result]),
{ok, Session}

after ?CONNECT_TIMEOUT ->
?ERROR_MSG("session ~p connection timeout", [Self]),
{error, connect_session_timeout}
case receive_session_connect(Keyspace, Self) of
ok -> {ok, Session};
{error, missing_keyspace} when KeyspaceCQL =/= "", Keyspace =/= "" ->
?INFO_MSG("Keyspace '~s' is missing, will create using: '~s'", [Keyspace, KeyspaceCQL]),
ok = do_connect(Session, Self),
case receive_session_connect("", Self) of
ok ->
{ok, StmRef} = query_new_statement(KeyspaceCQL),
erlcass_nif:cass_session_execute(nil, Session, StmRef, Self, init_keyspace),
?INFO_MSG("Creating Keyspace '~s'", [Keyspace]),
ok = receive_response(init_keyspace),
?INFO_MSG("Keyspace '~s' Created", [Keyspace]),
ok = do_close(Session, Self, 5000),
?INFO_MSG("Session Closed", []);
Error -> Error
end,
?INFO_MSG("Reconnecting with Keyspace", []),
ok = do_connect(Session, Self, Keyspace),
?INFO_MSG("Waiting for coonection", []),
case receive_session_connect(Keyspace, Self) of
ok -> {ok, Session};
Err -> Err
end;
Error -> Error
end;
Error ->
Error
Expand All @@ -411,6 +437,21 @@ session_create() ->
Error
end.

receive_session_connect(Keyspace, Self) ->
MissingKeyspaceError = list_to_binary(lists:flatten(io_lib:format("Keyspace '~s' does not exist", [Keyspace]))),
receive
{session_connected, Self, {error, MissingKeyspaceError}} ->
{error, missing_keyspace};

{session_connected, Self, Result} ->
?INFO_MSG("session ~p connection complete result: ~p", [Self, Result]),
ok

after ?CONNECT_TIMEOUT ->
?ERROR_MSG("session ~p connection timeout", [Self]),
{error, connect_session_timeout}
end.

session_prepare_cached_statements(SessionRef) ->

FunPrepareStm = fun({Identifier, Query}) ->
Expand Down