valitydev/riak_test
14
0
Fork 0
mirror of https://github.com/valitydev/riak_test.git synced 2024-11-06 16:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rejig of DDL to use double/sint64 and conform to key order

Browse Source
This commit is contained in:
Gordon Guthrie 2015-10-30 18:38:38 +00:00
parent c15a51572d
commit 5233eb54c8
4 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tests/timeseries_util.erl
View File

@ -197,9 +197,9 @@ get_ddl(docs) ->
"myseries varchar not null, " ++
"time timestamp not null, " ++
"weather varchar not null, " ++
"temperature float, " ++
"PRIMARY KEY ((quantum(time, 15, 'm'), myfamily, myseries), " ++
"time, myfamily, myseries))";
"temperature double, " ++
"PRIMARY KEY ((myfamily, myseries, quantum(time, 15, 'm')), " ++
"myfamily, myseries, time))";
%% another valid DDL - one with all the good stuff like
%% different types and optional blah-blah
get_ddl(variety) ->
@ -207,14 +207,14 @@ get_ddl(variety) ->
"myfamily varchar not null, " ++
"myseries varchar not null, " ++
"time timestamp not null, " ++
"myint integer not null, " ++
"myfloat float not null, " ++
"myint sint64 not null, " ++
"myfloat double not null, " ++
"mybool boolean not null, " ++
"mytimestamp timestamp not null, " ++
"myany any not null, " ++
"myoptional integer, " ++
"PRIMARY KEY ((quantum(time, 15, 'm'), myfamily, myseries), " ++
"time, myfamily, myseries))";
"myoptional sint64, " ++
"PRIMARY KEY ((myfamily, myseries, quantum(time, 15, 'm')), " ++
"myfamily, myseries, time))";
%% an invalid TS DDL becuz family and series not both in key
get_ddl(shortkey_fail) ->
_SQL = "CREATE TABLE GeoCheckin (" ++
@ -222,7 +222,7 @@ get_ddl(shortkey_fail) ->
"myseries varchar not null, " ++
"time timestamp not null, " ++
"weather varchar not null, " ++
"temperature float, " ++
"temperature double, " ++
"PRIMARY KEY ((quantum(time, 15, 'm'), myfamily), " ++
"time, myfamily))";
%% an invalid TS DDL becuz partition and local keys dont cover the same space
@ -232,20 +232,9 @@ get_ddl(splitkey_fail) ->
"myseries varchar not null, " ++
"time timestamp not null, " ++
"weather varchar not null, " ++
"temperature float, " ++
"PRIMARY KEY ((quantum(time, 15, 'm'), myfamily, myseries), " ++
"time, myfamily, myseries, temperature))";
%% another invalid TS DDL because family/series must be varchar
%% or is this total bollox???
get_ddl(keytype_fail_mebbies_or_not_eh_check_it_properly_muppet_boy) ->
_SQL = "CREATE TABLE GeoCheckin (" ++
"myfamily integer not null, " ++
"myseries varchar not null, " ++
"time timestamp not null, " ++
"weather varchar not null, " ++
"temperature float, " ++
"PRIMARY KEY ((quantum(time, 15, 'm'), myfamily, myseries), " ++
"time, myfamily, myseries))".
"temperature double, " ++
"PRIMARY KEY ((myfamily, myseries, quantum(time, 15, 'm')), " ++
"time, myfamily, myseries, temperature))".
get_valid_obj() ->
[get_varchar(),

4
tests/ts_A_put_pass_2.erl
View File

@ -17,8 +17,8 @@ confirm() ->
"myfamily varchar not null, " ++
"myseries varchar not null, " ++
"time timestamp not null, " ++
"myint integer not null, " ++
"myfloat float not null, " ++
"myint sint64 not null, " ++
"myfloat double not null, " ++
"mybool boolean not null, " ++
"mytimestamp timestamp not null, " ++
"myany any not null, " ++

6
tests/ts_B_random_query_pass_eqc.erl
View File

@ -100,9 +100,9 @@ get_ddl(Bucket, {No, Q}) ->
"time timestamp not null, " ++
"weather varchar not null, " ++
"temperature float, " ++
"PRIMARY KEY ((quantum(time, " ++ integer_to_list(No) ++ ", '" ++
atom_to_list(Q) ++ "'), myfamily, myseries), " ++
"time, myfamily, myseries))".
"PRIMARY KEY ((myfamily, myseries, quantum(time, " ++ integer_to_list(No) ++ ", '" ++
atom_to_list(Q) ++ "')), " ++
"myfamily, myseries, time))".
make_data(NPuts, Q, NSpans) ->
Multi = get_multi(Q) * NSpans,

4
tests/ts_api_util.erl
View File

@ -90,8 +90,8 @@ get_ddl(api) ->
"mybin varchar not null, " ++
"myfloat float not null, " ++
"mybool boolean not null, " ++
"PRIMARY KEY ((quantum(time, 15, 'm'), myfamily, myseries), " ++
"time, myfamily, myseries))".
"PRIMARY KEY ((myfamily, myseries, quantum(time, 15, 'm')), " ++
"myfamily, myseries, temperature, time))".
get_map(api) ->
[{<<"myfamily">>, 1},