Skip to content

Commit

Permalink
Import v2.7.0 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@gregrahn
gregrahn committed Jan 25, 2018
1 parent f1cefe7 commit 980f481
Show file tree
Hide file tree
Showing 15 changed files with 273 additions and 224 deletions.
160 changes: 79 additions & 81 deletions EULA.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
View file
Expand Up @@ -2,7 +2,7 @@

The official TPC-DS tools can be found at [tpc.org](http://www.tpc.org/tpc_documents_current_versions/current_specifications.asp).

This version is based on v2.6.0 and has been modified to:
This version is based on v2.7.0 and has been modified to:

* Allow compilation under macOS (commit [2ec45c5](https://github.com/gregrahn/tpcds-kit/commit/2ec45c5ed97cc860819ee630770231eac738097c))
* Address obvious query template bugs like
Expand Down
205 changes: 102 additions & 103 deletions answer_sets/56_NULLS_FIRST.ans
View file
@@ -1,103 +1,102 @@
i_item_id total_sales
---------------- ----------------------------------------
AAAAAAAANEFAAAAA NULL
AAAAAAAAOHICAAAA NULL
AAAAAAAAIGBEAAAA .00
AAAAAAAAEPDEAAAA .00
AAAAAAAACENDAAAA .00
AAAAAAAAFBGBAAAA 3.52
AAAAAAAAINHBAAAA 7.28
AAAAAAAAMBGAAAAA 8.52
AAAAAAAAEOIDAAAA 14.02
AAAAAAAAALIBAAAA 48.62
AAAAAAAAEDDAAAAA 48.80
AAAAAAAAHOBDAAAA 49.50
AAAAAAAAMGCCAAAA 51.84
AAAAAAAAGBEAAAAA 54.53
AAAAAAAACKAEAAAA 66.30
AAAAAAAAKHOAAAAA 72.72
AAAAAAAANFPBAAAA 74.48
AAAAAAAAOFMBAAAA 83.22
AAAAAAAAKHMCAAAA 105.44
AAAAAAAAFOCEAAAA 105.98
AAAAAAAAENCBAAAA 109.20
AAAAAAAANGIBAAAA 111.00
AAAAAAAADGDEAAAA 121.74
AAAAAAAAEPADAAAA 126.08
AAAAAAAAINHAAAAA 127.92
AAAAAAAAHKJCAAAA 129.84
AAAAAAAAOLFBAAAA 132.16
AAAAAAAAPLEBAAAA 135.34
AAAAAAAAOHKDAAAA 136.36
AAAAAAAAEHOAAAAA 153.54
AAAAAAAAGJABAAAA 172.50
AAAAAAAAOCCBAAAA 200.93
AAAAAAAAGGFAAAAA 235.20
AAAAAAAAKIKBAAAA 236.95
AAAAAAAAMIOBAAAA 238.92
AAAAAAAAIPODAAAA 240.96
AAAAAAAACPDCAAAA 265.33
AAAAAAAAMKCEAAAA 268.37
AAAAAAAAKMPAAAAA 283.53
AAAAAAAACIBAAAAA 297.76
AAAAAAAAEIACAAAA 332.80
AAAAAAAAOGEEAAAA 339.65
AAAAAAAAMFMDAAAA 351.12
AAAAAAAAGHBCAAAA 359.90
AAAAAAAAIGDCAAAA 371.79
AAAAAAAACHLCAAAA 410.56
AAAAAAAAGMBDAAAA 418.46
AAAAAAAAIJMCAAAA 422.10
AAAAAAAAEJLBAAAA 442.50
AAAAAAAANDHCAAAA 460.07
AAAAAAAAAFNBAAAA 460.32
AAAAAAAAKDGDAAAA 479.88
AAAAAAAAKKNCAAAA 494.48
AAAAAAAAJAJBAAAA 518.30
AAAAAAAACCOBAAAA 522.92
AAAAAAAAAEKAAAAA 525.52
AAAAAAAAKJBDAAAA 527.15
AAAAAAAAGHEDAAAA 538.85
AAAAAAAAACGCAAAA 562.68
AAAAAAAAEKLBAAAA 572.32
AAAAAAAAAEGAAAAA 572.32
AAAAAAAAAHCBAAAA 604.38
AAAAAAAALFADAAAA 606.67
AAAAAAAAKFNDAAAA 617.96
AAAAAAAAOEKAAAAA 619.39
AAAAAAAAEEBEAAAA 626.40
AAAAAAAAKMBCAAAA 628.95
AAAAAAAAJHGDAAAA 631.81
AAAAAAAAOMLDAAAA 631.89
AAAAAAAAGNDDAAAA 645.99
AAAAAAAAEADAAAAA 648.20
AAAAAAAAKPKCAAAA 651.42
AAAAAAAAAKHCAAAA 657.04
AAAAAAAAOEIDAAAA 660.24
AAAAAAAAMKAEAAAA 691.02
AAAAAAAABLKAAAAA 691.26
AAAAAAAADEIBAAAA 726.72
AAAAAAAAKBHCAAAA 730.20
AAAAAAAADNJAAAAA 731.92
AAAAAAAAOFPBAAAA 737.28
AAAAAAAACPIBAAAA 737.64
AAAAAAAAEPPBAAAA 759.36
AAAAAAAALNHDAAAA 761.60
AAAAAAAAGKPDAAAA 773.56
AAAAAAAAKBCAAAAA 775.30
AAAAAAAAIBOCAAAA 777.48
AAAAAAAAOJBEAAAA 777.84
AAAAAAAAKFKBAAAA 780.41
AAAAAAAAPJCCAAAA 783.00
AAAAAAAACAKBAAAA 800.27
AAAAAAAAOFNDAAAA 806.19
AAAAAAAAGLIDAAAA 843.75
AAAAAAAAGDBAAAAA 868.77
AAAAAAAAOGFDAAAA 887.30
AAAAAAAACOLBAAAA 918.96
AAAAAAAAFFNCAAAA 923.35
AAAAAAAACCJDAAAA 955.08
AAAAAAAAMMCAAAAA 959.76
AAAAAAAACCPDAAAA 971.77
AAAAAAAAKNCEAAAA 998.60
Warning: Null value is eliminated by an aggregate or other SET operation.
I_ITEM_ID TOTAL_SALES
---------------- -----------
AAAAAAAANEFAAAAA
AAAAAAAAOHICAAAA
AAAAAAAACENDAAAA 0
AAAAAAAAEPDEAAAA 0
AAAAAAAAIGBEAAAA 0
AAAAAAAAFBGBAAAA 3.52
AAAAAAAAINHBAAAA 7.28
AAAAAAAAMBGAAAAA 8.52
AAAAAAAAEOIDAAAA 14.02
AAAAAAAAALIBAAAA 48.62
AAAAAAAAEDDAAAAA 48.8
AAAAAAAAHOBDAAAA 49.5
AAAAAAAAMGCCAAAA 51.84
AAAAAAAAGBEAAAAA 54.53
AAAAAAAACKAEAAAA 66.3
AAAAAAAAKHOAAAAA 72.72
AAAAAAAANFPBAAAA 74.48
AAAAAAAAOFMBAAAA 83.22
AAAAAAAAKHMCAAAA 105.44
AAAAAAAAFOCEAAAA 105.98
AAAAAAAAENCBAAAA 109.2
AAAAAAAANGIBAAAA 111
AAAAAAAADGDEAAAA 121.74
AAAAAAAAEPADAAAA 126.08
AAAAAAAAINHAAAAA 127.92
AAAAAAAAHKJCAAAA 129.84
AAAAAAAAOLFBAAAA 132.16
AAAAAAAAPLEBAAAA 135.34
AAAAAAAAOHKDAAAA 136.36
AAAAAAAAEHOAAAAA 153.54
AAAAAAAAGJABAAAA 172.5
AAAAAAAAOCCBAAAA 200.93
AAAAAAAAGGFAAAAA 235.2
AAAAAAAAKIKBAAAA 236.95
AAAAAAAAMIOBAAAA 238.92
AAAAAAAAIPODAAAA 240.96
AAAAAAAACPDCAAAA 265.33
AAAAAAAAMKCEAAAA 268.37
AAAAAAAAKMPAAAAA 283.53
AAAAAAAACIBAAAAA 297.76
AAAAAAAAEIACAAAA 332.8
AAAAAAAAOGEEAAAA 339.65
AAAAAAAAMFMDAAAA 351.12
AAAAAAAAGHBCAAAA 359.9
AAAAAAAAIGDCAAAA 371.79
AAAAAAAACHLCAAAA 410.56
AAAAAAAAGMBDAAAA 418.46
AAAAAAAAIJMCAAAA 422.1
AAAAAAAAEJLBAAAA 442.5
AAAAAAAANDHCAAAA 460.07
AAAAAAAAAFNBAAAA 460.32
AAAAAAAAKDGDAAAA 479.88
AAAAAAAAKKNCAAAA 494.48
AAAAAAAAJAJBAAAA 518.3
AAAAAAAACCOBAAAA 522.92
AAAAAAAAAEKAAAAA 525.52
AAAAAAAAKJBDAAAA 527.15
AAAAAAAAGHEDAAAA 538.85
AAAAAAAAACGCAAAA 562.68
AAAAAAAAAEGAAAAA 572.32
AAAAAAAAEKLBAAAA 572.32
AAAAAAAAAHCBAAAA 604.38
AAAAAAAALFADAAAA 606.67
AAAAAAAAKFNDAAAA 617.96
AAAAAAAAOEKAAAAA 619.39
AAAAAAAAEEBEAAAA 626.4
AAAAAAAAKMBCAAAA 628.95
AAAAAAAAJHGDAAAA 631.81
AAAAAAAAOMLDAAAA 631.89
AAAAAAAAGNDDAAAA 645.99
AAAAAAAAEADAAAAA 648.2
AAAAAAAAKPKCAAAA 651.42
AAAAAAAAAKHCAAAA 657.04
AAAAAAAAOEIDAAAA 660.24
AAAAAAAAMKAEAAAA 691.02
AAAAAAAABLKAAAAA 691.26
AAAAAAAADEIBAAAA 726.72
AAAAAAAAKBHCAAAA 730.2
AAAAAAAADNJAAAAA 731.92
AAAAAAAAOFPBAAAA 737.28
AAAAAAAACPIBAAAA 737.64
AAAAAAAAEPPBAAAA 759.36
AAAAAAAALNHDAAAA 761.6
AAAAAAAAGKPDAAAA 773.56
AAAAAAAAKBCAAAAA 775.3
AAAAAAAAIBOCAAAA 777.48
AAAAAAAAOJBEAAAA 777.84
AAAAAAAAKFKBAAAA 780.41
AAAAAAAAPJCCAAAA 783
AAAAAAAACAKBAAAA 800.27
AAAAAAAAOFNDAAAA 806.19
AAAAAAAAGLIDAAAA 843.75
AAAAAAAAGDBAAAAA 868.77
AAAAAAAAOGFDAAAA 887.3
AAAAAAAACOLBAAAA 918.96
AAAAAAAAFFNCAAAA 923.35
AAAAAAAACCJDAAAA 955.08
AAAAAAAAMMCAAAAA 959.76
AAAAAAAACCPDAAAA 971.77
AAAAAAAAKNCEAAAA 998.6
7 changes: 1 addition & 6 deletions answer_sets/56_NULLS_LAST.ans
View file
@@ -1,7 +1,7 @@
I_ITEM_ID TOTAL_SALES
---------------- -----------
AAAAAAAAEPDEAAAA 0
AAAAAAAACENDAAAA 0
AAAAAAAAEPDEAAAA 0
AAAAAAAAIGBEAAAA 0
AAAAAAAAFBGBAAAA 3.52
AAAAAAAAINHBAAAA 7.28
Expand Down Expand Up @@ -100,8 +100,3 @@ AAAAAAAACCPDAAAA 971.77
AAAAAAAAKNCEAAAA 998.6
AAAAAAAACNACAAAA 1010.7
AAAAAAAAKDEAAAAA 1019.52

100 rows selected.



44 changes: 32 additions & 12 deletions answer_sets/64.ans
View file
@@ -1,13 +1,33 @@
PRODUCT_NAME STORE_NAME STORE_ZIP B_STREET_N B_STREEN_NAME B_CITY B_ZIP C_STREET_N C_STREET_NAME C_CITY C_ZIP SYEAR CNT S1 S2 S3 S1 S2 S3 SYEAR CNT
-------------------------------------------------- -------------------------------------------------- ---------- ---------- ------------------------------------------------------------- ------------------------------------------------------------ ---------- ---------- ------------------------------------------------------------- ------------------------------------------------------------ ---------- ---------- ---------- ---------- ---------- ---------- ---------- ---------- ---------- ---------- ----------
n stableableantiought able 31904 987 Hillcrest Fairbanks 46653 216 3rd Reno 40344 1999 1 55.42 80.91 954.53 59.08 76.8 0 2000 1
n stableableantiought ation 31904 173 Park Maple Sulphur Springs 68354 232 Franklin Fairfield66192 1999 1 60.78 85.09 0 44.27 58.43 0 2000 1
n stableableantiought ation 31904 316 Valley Tenth Pine Grove 74593 806 Wilson Main Jackson 59583 1999 1 49.63 78.41 14.22 44.27 58.43 0 2000 1
n stableableantiought ation 31904 425 Green Enterprise 11757 772 Valley 1999 1 16.24 25.17 0 7.92 11.8 0 2000 1
n stableableantiought ation 31904 173 Park Maple Sulphur Springs 68354 232 Franklin Fairfield66192 1999 1 60.78 85.09 0 7.92 11.8 0 2000 1
n stableableantiought ation 31904 316 Valley Tenth Pine Grove 74593 806 Wilson Main Jackson 59583 1999 1 49.63 78.41 14.22 7.92 11.8 0 2000 1
n stableableantiought ation 31904 425 Green Enterprise 11757 772 Valley 1999 1 16.24 25.17 0 44.27 58.43 0 2000 1
n stableableantiought eing 35709 928 First Oak Summit 40499 178 Johnson Hillcrest Oakdale 59584 1999 1 63.82 121.25 0 58.19 85.53 0 2000 1
n stableableantiought eing 35709 928 First Oak Summit 40499 178 Johnson Hillcrest Oakdale 59584 1999 1 63.82 121.25 0 10.25 12.09 0 2000 1
n stableableantiought eing 35709 928 First Oak Summit 40499 178 Johnson Hillcrest Oakdale 59584 1999 1 63.82 121.25 0 30.28 49.65 0 2000 1
PRODUCT_NAME STORE_NAME STORE_ZIP B_STREET_N B_STREET_NAME B_CITY B_ZIP C_STREET_N C_STREET_NAME C_CITY C_ZIP
-------------------------------------------------- -------------------------------------------------- ---------- ---------- ------------------------------------------------------------ ------------------------------------------------------------ ---------- ---------- ------------------------------------------------------------ ------------------------------------------------------------ ----------
SYEAR CNT S11 S21 S31 S12 S22 S32 SYEAR CNT
---------- ---------- ---------- ---------- ---------- ---------- ---------- ---------- ---------- ----------
n stableableantiought able 31904 987 Hillcrest Fairbanks 46653 216 3rd Reno 40344
1999 1 55.42 80.91 954.53 59.08 76.8 0 2000 1

n stableableantiought ation 31904 425 Green Enterprise 11757 772 Valley
1999 1 16.24 25.17 0 7.92 11.8 0 2000 1

n stableableantiought ation 31904 425 Green Enterprise 11757 772 Valley
1999 1 16.24 25.17 0 44.27 58.43 0 2000 1

n stableableantiought ation 31904 316 Valley Tenth Pine Grove 74593 806 Wilson Main Jackson 59583
1999 1 49.63 78.41 14.22 7.92 11.8 0 2000 1

n stableableantiought ation 31904 316 Valley Tenth Pine Grove 74593 806 Wilson Main Jackson 59583
1999 1 49.63 78.41 14.22 44.27 58.43 0 2000 1

n stableableantiought ation 31904 173 Park Maple Sulphur Springs 68354 232 Franklin Fairfield 66192
1999 1 60.78 85.09 0 7.92 11.8 0 2000 1

n stableableantiought ation 31904 173 Park Maple Sulphur Springs 68354 232 Franklin Fairfield 66192
1999 1 60.78 85.09 0 44.27 58.43 0 2000 1

n stableableantiought eing 35709 928 First Oak Summit 40499 178 Johnson Hillcrest Oakdale 59584
1999 1 63.82 121.25 0 10.25 12.09 0 2000 1

n stableableantiought eing 35709 928 First Oak Summit 40499 178 Johnson Hillcrest Oakdale 59584
1999 1 63.82 121.25 0 30.28 49.65 0 2000 1

n stableableantiought eing 35709 928 First Oak Summit 40499 178 Johnson Hillcrest Oakdale 59584
1999 1 63.82 121.25 0 58.19 85.53 0 2000 1
9 changes: 2 additions & 7 deletions answer_sets/6.ans → answer_sets/6_NULLS_FIRST.ans
View file
Expand Up @@ -12,8 +12,8 @@ OR 27
ND 28
UT 31
SD 35
NM 36
ID 36
NM 36
WV 45
WA 46
SC 47
Expand All @@ -28,7 +28,7 @@ PA 56
OK 57
CA 60
MS 69
% 73
73
AR 73
TN 74
IN 76
Expand All @@ -45,8 +45,3 @@ NC 107
VA 137
GA 153
TX 228

45 rows selected.



47 changes: 47 additions & 0 deletions answer_sets/6_NULLS_LAST.ans
View file
@@ -0,0 +1,47 @@
ST CNT
-- ----------
VT 14
ME 16
NJ 18
MD 19
AK 21
NH 21
MA 24
NV 26
OR 27
ND 28
UT 31
SD 35
ID 36
NM 36
WV 45
WA 46
SC 47
CO 48
AL 49
FL 49
LA 49
NY 52
WI 53
MT 55
PA 56
OK 57
CA 60
MS 69
AR 73
73
TN 74
IN 76
KS 80
MN 81
MI 83
MO 83
NE 87
IA 96
OH 102
KY 103
IL 106
NC 107
VA 137
GA 153
TX 228

0 comments on commit 980f481

Please sign in to comment.