Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-01-23 02:14:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix natsort of empty strings; support mlr sort -rt same as -tr (#1068)

Browse source 
* mlr sort -rt == mlrt sort -tr

* fix natsort of empty strings
This commit is contained in:
John Kerl 2022-08-06 23:10:09 -04:00 • committed by GitHub
parent b9c1e74214
commit a64133250c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 82 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/src/manpage.md
View file

@ -1751,7 +1751,7 @@ VERBS
-nf {comma-separated field names} Same as -n
-nr {comma-separated field names} Numerical descending; nulls sort first
-t {comma-separated field names} Natural ascending
-tr {comma-separated field names} Natural descending
-tr|-rt {comma-separated field names} Natural descending
-h|--help Show this message.
Example:
@ -3272,5 +3272,5 @@ SEE ALSO
2022-08-01 MILLER(1)
2022-08-07 MILLER(1)
</pre>

4
docs/src/manpage.txt
View file

@ -1730,7 +1730,7 @@ VERBS
-nf {comma-separated field names} Same as -n
-nr {comma-separated field names} Numerical descending; nulls sort first
-t {comma-separated field names} Natural ascending
-tr {comma-separated field names} Natural descending
-tr|-rt {comma-separated field names} Natural descending
-h|--help Show this message.
Example:
@ -3251,4 +3251,4 @@ SEE ALSO
2022-08-01 MILLER(1)
2022-08-07 MILLER(1)

2
docs/src/online-help.md
View file

@ -213,7 +213,7 @@ Options:
-nf {comma-separated field names} Same as -n
-nr {comma-separated field names} Numerical descending; nulls sort first
-t {comma-separated field names} Natural ascending
-tr {comma-separated field names} Natural descending
-tr|-rt {comma-separated field names} Natural descending
-h|--help Show this message.
Example:

2
docs/src/reference-verbs.md
View file

@ -2846,7 +2846,7 @@ Options:
-nf {comma-separated field names} Same as -n
-nr {comma-separated field names} Numerical descending; nulls sort first
-t {comma-separated field names} Natural ascending
-tr {comma-separated field names} Natural descending
-tr|-rt {comma-separated field names} Natural descending
-h|--help Show this message.
Example:

12
internal/pkg/mlrval/mlrval_sort.go
View file

@ -80,7 +80,17 @@ func NaturalAscendingComparator(input1, input2 *Mlrval) int {
sb := input2.String()
if sa == sb {
return 0
} else if natsort.Compare(input1.String(), input2.String()) {
}
// natsort.Compare puts empty strings in random places
if sa == "" {
return 1
}
if sb == "" {
return -1
}
if natsort.Compare(input1.String(), input2.String()) {
return 1
} else {
return -1

24
internal/pkg/transformers/sort.go
View file

@ -83,7 +83,7 @@ func transformerSortUsage(
fmt.Fprintf(o, "-nf {comma-separated field names} Same as -n\n")
fmt.Fprintf(o, "-nr {comma-separated field names} Numerical descending; nulls sort first\n")
fmt.Fprintf(o, "-t {comma-separated field names} Natural ascending\n")
fmt.Fprintf(o, "-tr {comma-separated field names} Natural descending\n")
fmt.Fprintf(o, "-tr|-rt {comma-separated field names} Natural descending\n")
fmt.Fprintf(o, "-h|--help Show this message.\n")
fmt.Fprintf(o, "\n")
fmt.Fprintf(o, "Example:\n")
@ -162,7 +162,6 @@ func transformerSortParseCLI(
comparatorFuncs = append(comparatorFuncs, mlrval.NaturalAscendingComparator)
}
} else {
subList := cli.VerbGetStringArrayArgOrDie(verb, opt, args, &argi, argc)
for _, item := range subList {
groupByFieldNames = append(groupByFieldNames, item)
@ -171,10 +170,23 @@ func transformerSortParseCLI(
}
} else if opt == "-r" {
subList := cli.VerbGetStringArrayArgOrDie(verb, opt, args, &argi, argc)
for _, item := range subList {
groupByFieldNames = append(groupByFieldNames, item)
comparatorFuncs = append(comparatorFuncs, mlrval.LexicalDescendingComparator)
// See comments over "-n" -- similar hack.
cli.VerbCheckArgCount(verb, opt, args, argi, argc, 1)
if args[argi] == "-t" {
// Treat like "-rt" which is same as "-tr"
cli.VerbCheckArgCount(verb, args[argi], args, argi, argc, 1)
argi++
subList := cli.VerbGetStringArrayArgOrDie(verb, "-tr", args, &argi, argc)
for _, item := range subList {
groupByFieldNames = append(groupByFieldNames, item)
comparatorFuncs = append(comparatorFuncs, mlrval.NaturalAscendingComparator)
}
} else {
subList := cli.VerbGetStringArrayArgOrDie(verb, opt, args, &argi, argc)
for _, item := range subList {
groupByFieldNames = append(groupByFieldNames, item)
comparatorFuncs = append(comparatorFuncs, mlrval.LexicalDescendingComparator)
}
}
} else if opt == "-n" {

4
man/manpage.txt
View file

@ -1730,7 +1730,7 @@ VERBS
-nf {comma-separated field names} Same as -n
-nr {comma-separated field names} Numerical descending; nulls sort first
-t {comma-separated field names} Natural ascending
-tr {comma-separated field names} Natural descending
-tr|-rt {comma-separated field names} Natural descending
-h|--help Show this message.
Example:
@ -3251,4 +3251,4 @@ SEE ALSO
2022-08-01 MILLER(1)
2022-08-07 MILLER(1)

6
man/mlr.1
View file

@ -2,12 +2,12 @@
.\" Title: mlr
.\" Author: [see the "AUTHOR" section]
.\" Generator: ./mkman.rb
.\" Date: 2022-08-01
.\" Date: 2022-08-07
.\" Manual: \ \&
.\" Source: \ \&
.\" Language: English
.\"
.TH "MILLER" "1" "2022-08-01" "\ \&" "\ \&"
.TH "MILLER" "1" "2022-08-07" "\ \&" "\ \&"
.\" -----------------------------------------------------------------
.\" * Portability definitions
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -2181,7 +2181,7 @@ Options:
-nf {comma-separated field names} Same as -n
-nr {comma-separated field names} Numerical descending; nulls sort first
-t {comma-separated field names} Natural ascending
-tr {comma-separated field names} Natural descending
-tr|-rt {comma-separated field names} Natural descending
-h|--help Show this message.
Example:

2
test/cases/cli-help/0001/expout
View file

@ -932,7 +932,7 @@ Options:
-nf {comma-separated field names} Same as -n
-nr {comma-separated field names} Numerical descending; nulls sort first
-t {comma-separated field names} Natural ascending
-tr {comma-separated field names} Natural descending
-tr|-rt {comma-separated field names} Natural descending
-h|--help Show this message.
Example:

1
test/cases/verb-sort/0024/expout
View file

@ -1,4 +1,5 @@
n,name
36,
2,10X Radonius
4,20X Radonius
5,20X Radonius Prime

1
test/cases/verb-sort/0025/expout
View file

@ -34,3 +34,4 @@ n,name
5,20X Radonius Prime
4,20X Radonius
2,10X Radonius
36,

1
test/cases/verb-sort/0026/cmd Normal file
View file

@ -0,0 +1 @@
mlr --csv sort -rt name test/input/natural-sort.csv

0
test/cases/verb-sort/0026/experr Normal file
View file

37
test/cases/verb-sort/0026/expout Normal file
View file

@ -0,0 +1,37 @@
n,name
27,Xiph Xlater 10000
34,Xiph Xlater 5000
28,Xiph Xlater 2000
33,Xiph Xlater 500
29,Xiph Xlater 300
35,Xiph Xlater 58
32,Xiph Xlater 50
30,Xiph Xlater 40
31,Xiph Xlater 5
26,Callisto Morphamax 7000
24,Callisto Morphamax 6000 SE2
23,Callisto Morphamax 6000 SE
21,Callisto Morphamax 5000
25,Callisto Morphamax 700
22,Callisto Morphamax 600
20,Callisto Morphamax 500
19,Callisto Morphamax
15,Alpha 200
13,Alpha 100
17,Alpha 2A-8000
18,Alpha 2A-900
16,Alpha 2A
14,Alpha 2
9,Allegia 500 Clasteron
11,Allegia 51 Clasteron
10,Allegia 50B Clasteron
8,Allegia 50 Clasteron
12,Allegia 6R Clasteron
1,1000X Radonius Maximus
3,200X Radonius
7,40X Radonius
6,30X Radonius
5,20X Radonius Prime
4,20X Radonius
2,10X Radonius
36,

1
test/input/natural-sort.csv
View file

@ -34,3 +34,4 @@ n,name
33,Xiph Xlater 500
34,Xiph Xlater 5000
35,Xiph Xlater 58
36,

1 n name
34 33 Xiph Xlater 500
35 34 Xiph Xlater 5000
36 35 Xiph Xlater 58
37 36