diff --git a/c/reg_test/input/Makefile.am b/c/reg_test/input/Makefile.am index 3a8bba77d..f304d54ec 100644 --- a/c/reg_test/input/Makefile.am +++ b/c/reg_test/input/Makefile.am @@ -29,6 +29,35 @@ EXTRA_DIST= \ having-fields-regex.dkvp \ het.csv \ het.dkvp \ + reg_test/input/het-join-left \ + reg_test/input/het-join-right-r0 \ + reg_test/input/het-join-right-r1 \ + reg_test/input/het-join-right-r2 \ + reg_test/input/het-join-right-r3 \ + reg_test/input/het-join-right-r4 \ + reg_test/input/het-join-right-r5 \ + reg_test/input/het-join-right-r6 \ + reg_test/input/het-join-right-r11 \ + reg_test/input/het-join-right-r12 \ + reg_test/input/het-join-right-r13 \ + reg_test/input/het-join-right-r14 \ + reg_test/input/het-join-right-r15 \ + reg_test/input/het-join-right-r16 \ + reg_test/input/het-join-right-r22 \ + reg_test/input/het-join-right-r23 \ + reg_test/input/het-join-right-r24 \ + reg_test/input/het-join-right-r25 \ + reg_test/input/het-join-right-r26 \ + reg_test/input/het-join-right-r33 \ + reg_test/input/het-join-right-r34 \ + reg_test/input/het-join-right-r35 \ + reg_test/input/het-join-right-r36 \ + reg_test/input/het-join-right-r44 \ + reg_test/input/het-join-right-r45 \ + reg_test/input/het-join-right-r46 \ + reg_test/input/het-join-right-r55 \ + reg_test/input/het-join-right-r56 \ + reg_test/input/het-join-right-r66 \ int64io.dkvp \ int64arith.dkvp \ int-float.dkvp \ diff --git a/c/reg_test/input/het-join-left b/c/reg_test/input/het-join-left new file mode 100644 index 000000000..2d709f9e2 --- /dev/null +++ b/c/reg_test/input/het-join-left @@ -0,0 +1,10 @@ +x=100,b=10 +l=1,b=11 +l=1,b=12 +x=200,b=13 +l=3,b=14 +l=3,b=15 +x=300,b=16 +l=5,b=17 +l=5,b=18 +x=400,b=19 diff --git a/c/reg_test/input/het-join-right-r0 b/c/reg_test/input/het-join-right-r0 new file mode 100644 index 000000000..b8606f1b2 --- /dev/null +++ b/c/reg_test/input/het-join-right-r0 @@ -0,0 +1 @@ +r=0 diff --git a/c/reg_test/input/het-join-right-r1 b/c/reg_test/input/het-join-right-r1 new file mode 100644 index 000000000..efe74750c --- /dev/null +++ b/c/reg_test/input/het-join-right-r1 @@ -0,0 +1 @@ +r=1 diff --git a/c/reg_test/input/het-join-right-r11 b/c/reg_test/input/het-join-right-r11 new file mode 100644 index 000000000..f15d856da --- /dev/null +++ b/c/reg_test/input/het-join-right-r11 @@ -0,0 +1,2 @@ +r=1 +r=1 diff --git a/c/reg_test/input/het-join-right-r12 b/c/reg_test/input/het-join-right-r12 new file mode 100644 index 000000000..fa8038c59 --- /dev/null +++ b/c/reg_test/input/het-join-right-r12 @@ -0,0 +1,2 @@ +r=1 +r=2 diff --git a/c/reg_test/input/het-join-right-r13 b/c/reg_test/input/het-join-right-r13 new file mode 100644 index 000000000..2f9bd0fc4 --- /dev/null +++ b/c/reg_test/input/het-join-right-r13 @@ -0,0 +1,2 @@ +r=1 +r=3 diff --git a/c/reg_test/input/het-join-right-r14 b/c/reg_test/input/het-join-right-r14 new file mode 100644 index 000000000..a4e32a5e5 --- /dev/null +++ b/c/reg_test/input/het-join-right-r14 @@ -0,0 +1,2 @@ +r=1 +r=4 diff --git a/c/reg_test/input/het-join-right-r15 b/c/reg_test/input/het-join-right-r15 new file mode 100644 index 000000000..fda1e9dad --- /dev/null +++ b/c/reg_test/input/het-join-right-r15 @@ -0,0 +1,2 @@ +r=1 +r=5 diff --git a/c/reg_test/input/het-join-right-r16 b/c/reg_test/input/het-join-right-r16 new file mode 100644 index 000000000..f809798ef --- /dev/null +++ b/c/reg_test/input/het-join-right-r16 @@ -0,0 +1,2 @@ +r=1 +r=6 diff --git a/c/reg_test/input/het-join-right-r2 b/c/reg_test/input/het-join-right-r2 new file mode 100644 index 000000000..4a91cbb9a --- /dev/null +++ b/c/reg_test/input/het-join-right-r2 @@ -0,0 +1 @@ +r=2 diff --git a/c/reg_test/input/het-join-right-r22 b/c/reg_test/input/het-join-right-r22 new file mode 100644 index 000000000..7fa2e6067 --- /dev/null +++ b/c/reg_test/input/het-join-right-r22 @@ -0,0 +1,2 @@ +r=2 +r=2 diff --git a/c/reg_test/input/het-join-right-r23 b/c/reg_test/input/het-join-right-r23 new file mode 100644 index 000000000..dec1586b7 --- /dev/null +++ b/c/reg_test/input/het-join-right-r23 @@ -0,0 +1,2 @@ +r=2 +r=3 diff --git a/c/reg_test/input/het-join-right-r24 b/c/reg_test/input/het-join-right-r24 new file mode 100644 index 000000000..fb449d94f --- /dev/null +++ b/c/reg_test/input/het-join-right-r24 @@ -0,0 +1,2 @@ +r=2 +r=4 diff --git a/c/reg_test/input/het-join-right-r25 b/c/reg_test/input/het-join-right-r25 new file mode 100644 index 000000000..c8edbb571 --- /dev/null +++ b/c/reg_test/input/het-join-right-r25 @@ -0,0 +1,2 @@ +r=2 +r=5 diff --git a/c/reg_test/input/het-join-right-r26 b/c/reg_test/input/het-join-right-r26 new file mode 100644 index 000000000..ef308ab22 --- /dev/null +++ b/c/reg_test/input/het-join-right-r26 @@ -0,0 +1,2 @@ +r=2 +r=6 diff --git a/c/reg_test/input/het-join-right-r3 b/c/reg_test/input/het-join-right-r3 new file mode 100644 index 000000000..6c8e45017 --- /dev/null +++ b/c/reg_test/input/het-join-right-r3 @@ -0,0 +1 @@ +r=3 diff --git a/c/reg_test/input/het-join-right-r33 b/c/reg_test/input/het-join-right-r33 new file mode 100644 index 000000000..a60e67a8d --- /dev/null +++ b/c/reg_test/input/het-join-right-r33 @@ -0,0 +1,2 @@ +r=3 +r=3 diff --git a/c/reg_test/input/het-join-right-r34 b/c/reg_test/input/het-join-right-r34 new file mode 100644 index 000000000..4ef3e15c3 --- /dev/null +++ b/c/reg_test/input/het-join-right-r34 @@ -0,0 +1,2 @@ +r=3 +r=4 diff --git a/c/reg_test/input/het-join-right-r35 b/c/reg_test/input/het-join-right-r35 new file mode 100644 index 000000000..8c8f6f96d --- /dev/null +++ b/c/reg_test/input/het-join-right-r35 @@ -0,0 +1,2 @@ +r=3 +r=5 diff --git a/c/reg_test/input/het-join-right-r36 b/c/reg_test/input/het-join-right-r36 new file mode 100644 index 000000000..7c3028b73 --- /dev/null +++ b/c/reg_test/input/het-join-right-r36 @@ -0,0 +1,2 @@ +r=3 +r=6 diff --git a/c/reg_test/input/het-join-right-r4 b/c/reg_test/input/het-join-right-r4 new file mode 100644 index 000000000..12b8846ea --- /dev/null +++ b/c/reg_test/input/het-join-right-r4 @@ -0,0 +1 @@ +r=4 diff --git a/c/reg_test/input/het-join-right-r44 b/c/reg_test/input/het-join-right-r44 new file mode 100644 index 000000000..45c990eaf --- /dev/null +++ b/c/reg_test/input/het-join-right-r44 @@ -0,0 +1,2 @@ +r=4 +r=4 diff --git a/c/reg_test/input/het-join-right-r45 b/c/reg_test/input/het-join-right-r45 new file mode 100644 index 000000000..e35b0e291 --- /dev/null +++ b/c/reg_test/input/het-join-right-r45 @@ -0,0 +1,2 @@ +r=4 +r=5 diff --git a/c/reg_test/input/het-join-right-r46 b/c/reg_test/input/het-join-right-r46 new file mode 100644 index 000000000..63f69181c --- /dev/null +++ b/c/reg_test/input/het-join-right-r46 @@ -0,0 +1,2 @@ +r=4 +r=6 diff --git a/c/reg_test/input/het-join-right-r5 b/c/reg_test/input/het-join-right-r5 new file mode 100644 index 000000000..266ab1c1b --- /dev/null +++ b/c/reg_test/input/het-join-right-r5 @@ -0,0 +1 @@ +r=5 diff --git a/c/reg_test/input/het-join-right-r55 b/c/reg_test/input/het-join-right-r55 new file mode 100644 index 000000000..25dbf6b87 --- /dev/null +++ b/c/reg_test/input/het-join-right-r55 @@ -0,0 +1,2 @@ +r=5 +r=5 diff --git a/c/reg_test/input/het-join-right-r56 b/c/reg_test/input/het-join-right-r56 new file mode 100644 index 000000000..eb9f71d60 --- /dev/null +++ b/c/reg_test/input/het-join-right-r56 @@ -0,0 +1,2 @@ +r=5 +r=6 diff --git a/c/reg_test/input/het-join-right-r6 b/c/reg_test/input/het-join-right-r6 new file mode 100644 index 000000000..51720d8ee --- /dev/null +++ b/c/reg_test/input/het-join-right-r6 @@ -0,0 +1 @@ +r=6 diff --git a/c/reg_test/input/het-join-right-r66 b/c/reg_test/input/het-join-right-r66 new file mode 100644 index 000000000..2102ad223 --- /dev/null +++ b/c/reg_test/input/het-join-right-r66 @@ -0,0 +1,2 @@ +r=6 +r=6 diff --git a/c/reg_test/run b/c/reg_test/run index 04181c4b1..ee7e34bdf 100755 --- a/c/reg_test/run +++ b/c/reg_test/run @@ -278,6 +278,20 @@ run_mlr --odkvp join -u -j a -f $indir/abixy-het $indir/join-het.dkvp run_mlr --odkvp join -u --np --ul --ur -j a -f $indir/join-het.dkvp $indir/abixy-het run_mlr --odkvp join -u --np --ul --ur -j a -f $indir/abixy-het $indir/join-het.dkvp +# pending +#for sorted_flag in "" "-u"; do +# for pairing_flags in "" "--np --ul" "--np --ur"; do +# for i in 1 2 3 4 5 6; do +# run_mlr join $sorted_flag $pairing_flags -l l -r r -j j -f $indir/het-join-left $indir/het-join-right-r$i +# for j in 1 2 3 4 5 6; do +# if [ "$i" -le "$j" ]; then +# run_mlr join $sorted_flag $pairing_flags -l l -r r -j j -f $indir/het-join-left $indir/het-join-right-r$i$j +# fi +# done +# done +# done +#done + # ---------------------------------------------------------------- announce STATS diff --git a/c/todo.txt b/c/todo.txt index 1f30f34c5..22add1215 100644 --- a/c/todo.txt +++ b/c/todo.txt @@ -7,11 +7,8 @@ BUGFIXES TOP OF LIST ! before releasing miller 3: - - ! fix join on partial value-field matches - - TMP_DBG rmv - - stdize --dev - - more RT cases + - ci RT cases for sorted het-join + - fix RT cases for unsorted het-join ---------------------------------------------------------------- * miller 3 release info: