From b2c19b6176cfe44caf58d02a7f0ce0df6019872a Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 29 Aug 2019 10:19:54 -0400 Subject: [PATCH] temporarily mask out sort-within-records (still stubbed) for 5.4.0 --- c/cli/mlrcli.c | 3 ++- c/mapping/mappers.h | 3 ++- doc/manpage.html | 19 ++----------------- doc/manpage.txt | 19 ++----------------- doc/mlr.1 | 25 ++----------------------- doc/reference.html | 4 ++-- 6 files changed, 12 insertions(+), 61 deletions(-) diff --git a/c/cli/mlrcli.c b/c/cli/mlrcli.c index 7dc38dfcf..686066153 100644 --- a/c/cli/mlrcli.c +++ b/c/cli/mlrcli.c @@ -78,7 +78,8 @@ static mapper_setup_t* mapper_lookup_table[] = { &mapper_shuffle_setup, &mapper_skip_trivial_records_setup, &mapper_sort_setup, - &mapper_sort_within_records_setup, + // xxx temp for 5.4.0 -- will continue work after + // &mapper_sort_within_records_setup, &mapper_stats1_setup, &mapper_stats2_setup, &mapper_step_setup, diff --git a/c/mapping/mappers.h b/c/mapping/mappers.h index b41bfd6e2..2fe78cf23 100644 --- a/c/mapping/mappers.h +++ b/c/mapping/mappers.h @@ -44,7 +44,8 @@ extern mapper_setup_t mapper_seqgen_setup; extern mapper_setup_t mapper_shuffle_setup; extern mapper_setup_t mapper_skip_trivial_records_setup; extern mapper_setup_t mapper_sort_setup; -extern mapper_setup_t mapper_sort_within_records_setup; +// xxx temp for 5.4.0 -- will continue work after +// extern mapper_setup_t mapper_sort_within_records_setup; extern mapper_setup_t mapper_stats1_setup; extern mapper_setup_t mapper_stats2_setup; extern mapper_setup_t mapper_step_setup; diff --git a/doc/manpage.html b/doc/manpage.html index 446757976..932abf8c1 100644 --- a/doc/manpage.html +++ b/doc/manpage.html @@ -323,8 +323,8 @@ OPTIONS cut decimate fill-down filter fraction grep group-by group-like having-fields head histogram join label least-frequent merge-fields most-frequent nest nothing put regularize remove-empty-columns rename reorder repeat reshape - sample sec2gmt sec2gmtdate seqgen shuffle skip-trivial-records sort - sort-within-records stats1 stats2 step tac tail tee top uniq unsparsify + sample sec2gmt sec2gmtdate seqgen shuffle skip-trivial-records sort stats1 + stats2 step tac tail tee top uniq unsparsify FUNCTION LIST + + - - * / // .+ .+ .- .- .* ./ .// % ** | ^ & ~ << >> bitcount == != =~ !=~ @@ -1323,21 +1323,6 @@ VERBS which is the same as: mlr sort -f a -f b -nr x -nr y -nr z - sort-within-records - Usage: mlr sort-within-records {flags} - Flags: - -k Sort by keys - -v Sort by values - -n Sort numerically - -f Sort lexically (default) - -r Reverse sort - -nk Shorthand for -n -k - -nv Shorthand for -n -v - -rk Shorthand for -r -k - -rv Shorthand for -r -v - -nrk Shorthand for -n -r -k - -nrv Shorthand for -n -r -v - stats1 Usage: mlr stats1 [options] Computes univariate statistics for one or more given fields, accumulated across diff --git a/doc/manpage.txt b/doc/manpage.txt index eeadf842f..7c6cfcd85 100644 --- a/doc/manpage.txt +++ b/doc/manpage.txt @@ -129,8 +129,8 @@ OPTIONS cut decimate fill-down filter fraction grep group-by group-like having-fields head histogram join label least-frequent merge-fields most-frequent nest nothing put regularize remove-empty-columns rename reorder repeat reshape - sample sec2gmt sec2gmtdate seqgen shuffle skip-trivial-records sort - sort-within-records stats1 stats2 step tac tail tee top uniq unsparsify + sample sec2gmt sec2gmtdate seqgen shuffle skip-trivial-records sort stats1 + stats2 step tac tail tee top uniq unsparsify FUNCTION LIST + + - - * / // .+ .+ .- .- .* ./ .// % ** | ^ & ~ << >> bitcount == != =~ !=~ @@ -1129,21 +1129,6 @@ VERBS which is the same as: mlr sort -f a -f b -nr x -nr y -nr z - sort-within-records - Usage: mlr sort-within-records {flags} - Flags: - -k Sort by keys - -v Sort by values - -n Sort numerically - -f Sort lexically (default) - -r Reverse sort - -nk Shorthand for -n -k - -nv Shorthand for -n -v - -rk Shorthand for -r -k - -rv Shorthand for -r -v - -nrk Shorthand for -n -r -k - -nrv Shorthand for -n -r -v - stats1 Usage: mlr stats1 [options] Computes univariate statistics for one or more given fields, accumulated across diff --git a/doc/mlr.1 b/doc/mlr.1 index 7a2d25f45..90845c792 100644 --- a/doc/mlr.1 +++ b/doc/mlr.1 @@ -172,8 +172,8 @@ output separator to the given value. cut decimate fill-down filter fraction grep group-by group-like having-fields head histogram join label least-frequent merge-fields most-frequent nest nothing put regularize remove-empty-columns rename reorder repeat reshape - sample sec2gmt sec2gmtdate seqgen shuffle skip-trivial-records sort - sort-within-records stats1 stats2 step tac tail tee top uniq unsparsify + sample sec2gmt sec2gmtdate seqgen shuffle skip-trivial-records sort stats1 + stats2 step tac tail tee top uniq unsparsify .fi .if n \{\ .RE @@ -1488,27 +1488,6 @@ which is the same as: .fi .if n \{\ .RE -.SS "sort-within-records" -.if n \{\ -.RS 0 -.\} -.nf -Usage: mlr sort-within-records {flags} -Flags: - -k Sort by keys - -v Sort by values - -n Sort numerically - -f Sort lexically (default) - -r Reverse sort - -nk Shorthand for -n -k - -nv Shorthand for -n -v - -rk Shorthand for -r -k - -rv Shorthand for -r -v - -nrk Shorthand for -n -r -k - -nrv Shorthand for -n -r -v -.fi -.if n \{\ -.RE .SS "stats1" .if n \{\ .RS 0 diff --git a/doc/reference.html b/doc/reference.html index 30e546163..531ef2f80 100644 --- a/doc/reference.html +++ b/doc/reference.html @@ -1454,8 +1454,8 @@ Verbs: having-fields head histogram join label least-frequent merge-fields most-frequent nest nothing put regularize remove-empty-columns rename reorder repeat reshape sample sec2gmt sec2gmtdate seqgen shuffle - skip-trivial-records sort sort-within-records stats1 stats2 step tac tail - tee top uniq unsparsify + skip-trivial-records sort stats1 stats2 step tac tail tee top uniq + unsparsify Functions for the filter and put verbs: + + - - * / // .+ .+ .- .- .* ./ .// % ** | ^ & ~ << >> bitcount == != =~