Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-22 07:30:43 +00:00
Code Issues Projects Releases Wiki Activity

unset iterate: not yet feature-complete

Browse source
This commit is contained in:
John Kerl 2016-03-02 22:05:58 -05:00
parent 4266c1e504
commit e479df0090
6 changed files with 69 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
c/containers/mlhmmv.c
View file

@ -30,6 +30,8 @@ static void mlhmmv_level_put_no_enlarge(mlhmmv_level_t* plevel, sllmve_t* prest_
static void mlhmmv_level_enlarge(mlhmmv_level_t* plevel);
static void mlhmmv_level_move(mlhmmv_level_t* plevel, mv_t* plevel_key, mlhmmv_level_value_t* plevel_value);
static mlhmmv_level_entry_t* mlhmmv_get_next_level_entry(mlhmmv_level_t* pmap, mv_t* plevel_key, int* pindex);
static void mlhmmv_to_lrecs_aux(mlhmmv_level_t* plevel, mv_t* pfirstname, sllmve_t* prestnames,
lrec_t* ptemplate, sllv_t* poutrecs);
static void mlhmmv_to_lrecs_aux_flatten(mlhmmv_level_t* plevel, char* prefix, lrec_t* ptemplate, sllv_t* poutrecs);
@ -314,7 +316,7 @@ mv_t* mlhmmv_get(mlhmmv_t* pmap, sllmv_t* pmvkeys, int* perror) {
return &plevel_entry->level_value.u.mlrval;
}
mlhmmv_level_entry_t* mlhmmv_get_next_level_entry(mlhmmv_level_t* plevel, mv_t* plevel_key, int* pindex) {
static mlhmmv_level_entry_t* mlhmmv_get_next_level_entry(mlhmmv_level_t* plevel, mv_t* plevel_key, int* pindex) {
int ideal_index = 0;
int index = mlhmmv_level_find_index_for_key(plevel, plevel_key, &ideal_index);
mlhmmv_level_entry_t* pentry = &plevel->entries[index];
@ -374,8 +376,13 @@ static void mlhmmv_remove_aux(mlhmmv_level_t* plevel, sllmve_t* prestkeys, int*
return;
int descendant_emptied = FALSE;
mlhmmv_remove_aux(pentry->level_value.u.pnext_level, prestkeys->pnext, &descendant_emptied, depth+1);
if (descendant_emptied) {
// If the recursive call emptied the next-level slot, remove it from our level as well. This may continue all
// the way back up. Example: the map is '{"a":{"b":{"c":4}}}' and we're asked to remove keylist ["a", "b", "c"].
// The recursive call to the terminal will leave '{"a":{"b":{}}}' -- note the '{}'. Then we remove
// that to leave '{"a":{}}'. Since this leaves another '{}', passing emptied==TRUE back to our caller
// leaves empty top-level map '{}'.
if (descendant_emptied) {
plevel->num_occupied--;
plevel->num_freed++;
plevel->states[index] = DELETED;
@ -409,6 +416,10 @@ static void mlhmmv_remove_aux(mlhmmv_level_t* plevel, sllmve_t* prestkeys, int*
exit(1);
}
// xxx
// echo 'a=1,b=2,x=9' | mlr put -q @s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @u[1][2]; dump}
// still not right.
pentry->ideal_index = -1;
plevel->states[index] = DELETED;

33
c/containers/mlhmmv.h
View file

@ -78,12 +78,37 @@ void mlhmmv_put(mlhmmv_t* pmap, sllmv_t* pmvkeys, mv_t* pterminal_value);
// The caller shouldn't free it, or modify it.
mv_t* mlhmmv_get(mlhmmv_t* pmap, sllmv_t* pmvkeys, int* perror);
// Unset value/submap from a specified level onward. pmvkeys must have length at least 1, i.e.
// the oosvar name. Example:
// {
// "a" : {
// "x" : 1,
// "y" : 2
// },
// "b" : {
// "x" : 3,
// "y" : 4
// },
// }
// with pmvkeys = ["a"] leaves
// {
// "b" : {
// "x" : 3,
// "y" : 4
// },
// }
// but with pmvkeys = ["a", "y"] leaves
// {
// "a" : {
// "x" : 1
// },
// "b" : {
// "x" : 3,
// "y" : 4
// },
// }
void mlhmmv_remove(mlhmmv_t* pmap, sllmv_t* pmvkeys);
// Made public for the oosvar-emitter.
// xxx make private again after reorg
mlhmmv_level_entry_t* mlhmmv_get_next_level_entry(mlhmmv_level_t* pmap, mv_t* plevel_key, int* pindex);
// xxx comment:
// * names
// * these allocate unbacked lrecs

2
c/reg_test/input/Makefile.am
View file

@ -130,6 +130,8 @@ EXTRA_DIST= \
truncated.pprint \
truncated.xtab \
truncated.xtab-crlf \
unset1.dkvp \
unset4.dkvp \
utf8-1.csv \
utf8-2.csv \
utf8-align.dkvp \

1
c/reg_test/input/unset1.dkvp Normal file
View file

@ -0,0 +1 @@
a=1,b=2=,x=9

4
c/reg_test/input/unset4.dkvp Normal file
View file

@ -0,0 +1,4 @@
a=1,b=2=,x=9
a=1,b=3=,x=9
a=4,b=5=,x=9
a=4,b=6=,x=9

20
c/reg_test/run
View file

@ -1239,6 +1239,26 @@ run_mlr put '@y[$a]=$y; end{dump}' $indir/abixy
run_mlr stats1 -a sum -f y -g a $indir/abixy
run_mlr put '@y_sum[$a] = $y; end{dump}' $indir/abixy
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @s ; dump}' $indir/unset1.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @t ; dump}' $indir/unset1.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @t[1] ; dump}' $indir/unset1.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @u ; dump}' $indir/unset1.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @u[1] ; dump}' $indir/unset1.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @u[1][2]; dump}' $indir/unset1.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @s ; dump}' $indir/unset4.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @t ; dump}' $indir/unset4.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @t[1] ; dump}' $indir/unset4.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @u ; dump}' $indir/unset4.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @u[1] ; dump}' $indir/unset4.dkvp
run_mlr put -q '@s=$x; @t[$a]=$x; @u[$a][$b]=$x; end{dump; unset @u[1][2]; dump}' $indir/unset4.dkvp
# ----------------------------------------------------------------
announce DSL PATTERN-ACTION BLOCKS