basho / innostore / changeset / 06aae28d491e

Up to file-list c_src/innostore_drv.c:


    {
        if (key_type == IB_CFG_TEXT)
        {
            error = ib_cfg_set(key, value);
            // HACK: Semantics of setting a text configuration value for innodb changed
            // to be pointer assignment (from copy) for vsn 1.0.6.6750. So, we strdup the
            // value to ensure everything works as expected.
            // TODO: Setup some sort of list of strdup'd values to ensure they all get
            // cleaned up properly. In typical usage, this isn't going to be a problem
            // as you only initialize once per run, but it bothers me just the same.
            error = ib_cfg_set(key, strdup(value));
        }
        else
        {

Up to file-list src/innostore.erl:

@@ -236,7 +236,7 @@ set_config([{Key, Value} | Rest], Port)
     case lists:keysearch(Key, 1, config_types()) of
         {value, {Key, Type}} ->
             KBin = atom_to_binary(Key, utf8),
-            VBin = config_encode(Type, Value),
+            VBin = config_encode(Type, Key, Value),
             erlang:port_control(Port, ?CMD_SET_CFG, <<KBin/binary, 0:8, VBin/binary>>),
             receive
                 innostore_ok ->
@@ -379,16 +379,20 @@ config_types() ->
 %%
 %% Encode configuration setting, based on type for passing through to inno api
 %%
-config_encode(integer, Value) ->
+config_encode(integer, _Key, Value) ->
     case erlang:system_info(wordsize) of
 -> <<Value:32/unsigned-native>>;
 -> <<Value:64/unsigned-native>>
     end;
 config_encode(bool, true) ->
     config_encode(integer, 1);
 config_encode(bool, false) ->
     config_encode(integer, 0);
-config_encode(string, Value) ->
+config_encode(bool, Key, true) ->
     config_encode(integer, Key, 1);
 config_encode(bool, Key, false) ->
     config_encode(integer, Key, 0);
 config_encode(string, data_home_dir, Value) ->
     %% Make sure that the last character is a path separator
     CleanedUp = filename:absname(Value) ++ "/",
     <<(list_to_binary(CleanedUp))/binary, 0:8>>;
 config_encode(string, _Key, Value) ->
     <<(list_to_binary(Value))/binary, 0:8>>.

commit 45:	06aae28d491e
parent 44:	4f02b0547f75
branch:	default

…	…	@@ -395,7 +395,13 @@ static void do_set_cfg(void* arg)
395	395	{
396	396	if (key_type == IB_CFG_TEXT)
397	397	{
398		~~error = ib_cfg_set(key, value);~~
	398	// HACK: Semantics of setting a text configuration value for innodb changed
	399	// to be pointer assignment (from copy) for vsn 1.0.6.6750. So, we strdup the
	400	// value to ensure everything works as expected.
	401	// TODO: Setup some sort of list of strdup'd values to ensure they all get
	402	// cleaned up properly. In typical usage, this isn't going to be a problem
	403	// as you only initialize once per run, but it bothers me just the same.
	404	error = ib_cfg_set(key, strdup(value));
399	405	}
400	406	else
401	407	{