You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by rl...@apache.org on 2015/11/05 03:54:55 UTC
[09/17] incubator-hawq git commit: HAWQ-100. Code Cleanup:
gpmapreduce.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/join.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/join.err b/src/bin/gpmapreduce/test/expected/join.err
deleted file mode 100644
index 64791b7..0000000
--- a/src/bin/gpmapreduce/test/expected/join.err
+++ /dev/null
@@ -1,9 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs
-mapreduce_71846_run_1
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/join.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/join.out b/src/bin/gpmapreduce/test/expected/join.out
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/kmeans.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/kmeans.err b/src/bin/gpmapreduce/test/expected/kmeans.err
deleted file mode 100644
index 12d46b1..0000000
--- a/src/bin/gpmapreduce/test/expected/kmeans.err
+++ /dev/null
@@ -1,8 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- end_matchsubs
-mapreduce_5461_run_1
-DONE
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/kmeans.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/kmeans.out b/src/bin/gpmapreduce/test/expected/kmeans.out
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/kmeans_done.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/kmeans_done.out b/src/bin/gpmapreduce/test/expected/kmeans_done.out
deleted file mode 100644
index 5539bd7..0000000
--- a/src/bin/gpmapreduce/test/expected/kmeans_done.out
+++ /dev/null
@@ -1,711 +0,0 @@
- key | min | max
----------------+-----+-----
- able | 0 | 7
- above | 0 | 6
- access | 0 | 6
- according | 0 | 5
- across | 0 | 4
- act | 0 | 5
- action | 0 | 4
- actually | 0 | 9
- ad | 0 | 9
- add | 0 | 9
- added | 0 | 4
- addition | 0 | 5
- address | 0 | 6
- ads | 0 | 4
- advertising | 0 | 9
- again | 0 | 9
- against | 0 | 9
- ago | 0 | 6
- air | 0 | 4
- al | 0 | 4
- allen | 0 | 6
- allow | 0 | 8
- almost | 0 | 6
- along | 0 | 5
- already | 0 | 7
- although | 0 | 7
- always | 0 | 9
- am | 0 | 8
- america | 0 | 6
- american | 0 | 9
- americans | 0 | 8
- amp | 0 | 9
- announced | 0 | 9
- another | 0 | 9
- anyone | 0 | 6
- anything | 0 | 5
- anyway | 0 | 4
- aol | 0 | 9
- apparently | 0 | 6
- apple | 0 | 6
- application | 0 | 8
- applications | 0 | 9
- area | 0 | 6
- around | 0 | 9
- art | 0 | 5
- article | 0 | 93
- ask | 0 | 7
- asked | 0 | 5
- attention | 0 | 5
- audience | 0 | 5
- audio | 0 | 7
- available | 0 | 8
- away | 0 | 7
- b | 0 | 9
- bad | 0 | 8
- bar | 0 | 7
- based | 0 | 9
- because | 0 | 9
- become | 0 | 5
- before | 0 | 8
- behind | 0 | 5
- being | 0 | 9
- believe | 0 | 6
- below | 0 | 9
- best | 0 | 9
- better | 0 | 7
- between | 0 | 7
- big | 0 | 9
- bill | 0 | 7
- bit | 0 | 9
- black | 0 | 9
- blog | 0 | 8
- blogger | 0 | 9
- bloggers | 0 | 9
- blogging | 0 | 9
- blogs | 0 | 9
- board | 0 | 9
- body | 0 | 6
- book | 0 | 9
- books | 0 | 8
- both | 0 | 6
- box | 0 | 7
- bring | 0 | 5
- build | 0 | 6
- building | 0 | 6
- built | 0 | 5
- bush | 0 | 9
- business | 0 | 8
- buy | 0 | 6
- c | 0 | 8
- call | 0 | 8
- called | 0 | 8
- calls | 0 | 4
- came | 0 | 8
- camera | 0 | 8
- car | 0 | 8
- card | 0 | 6
- care | 0 | 6
- case | 0 | 7
- cause | 0 | 9
- cell | 0 | 5
- center | 0 | 6
- chance | 0 | 5
- change | 0 | 6
- check | 0 | 9
- china | 0 | 7
- choose | 0 | 7
- chris | 0 | 9
- city | 0 | 8
- clear | 0 | 4
- click | 0 | 9
- clinton | 0 | 7
- close | 0 | 4
- co | 0 | 7
- code | 0 | 8
- college | 0 | 9
- come | 0 | 8
- comes | 0 | 8
- coming | 0 | 7
- comment | 0 | 46
- comments | 0 | 7
- community | 0 | 9
- companies | 0 | 7
- company | 0 | 9
- complete | 0 | 5
- completely | 0 | 7
- computer | 0 | 9
- conference | 0 | 8
- content | 0 | 9
- continue | 0 | 9
- control | 0 | 6
- cool | 0 | 9
- copy | 0 | 3
- core | 0 | 5
- cost | 0 | 8
- could | 0 | 8
- country | 0 | 8
- couple | 0 | 6
- course | 0 | 9
- cover | 0 | 5
- create | 0 | 7
- created | 0 | 5
- creating | 0 | 6
- critical | 0 | 4
- culture | 0 | 8
- current | 0 | 4
- currently | 0 | 7
- cut | 0 | 8
- d | 0 | 9
- daily | 0 | 9
- data | 0 | 7
- david | 0 | 8
- days | 0 | 7
- dead | 0 | 7
- deal | 0 | 3
- decided | 0 | 5
- demo | 0 | 4
- design | 0 | 9
- details | 0 | 7
- development | 0 | 7
- device | 0 | 9
- did | 0 | 9
- didn | 0 | 6
- different | 0 | 8
- digg | 0 | 4
- digital | 0 | 9
- director | 0 | 3
- display | 0 | 6
- does | 0 | 9
- doesn | 0 | 8
- doing | 0 | 8
- done | 0 | 7
- door | 0 | 9
- down | 0 | 8
- download | 0 | 6
- drive | 0 | 9
- drop | 0 | 8
- during | 0 | 6
- dvd | 0 | 9
- e | 0 | 9
- each | 0 | 9
- earlier | 0 | 4
- early | 0 | 5
- easily | 0 | 4
- easy | 0 | 6
- either | 0 | 6
- else | 0 | 6
- email | 0 | 7
- end | 0 | 6
- engine | 0 | 7
- enjoy | 0 | 3
- enough | 0 | 9
- entire | 0 | 7
- especially | 0 | 6
- etc | 0 | 4
- event | 0 | 8
- events | 0 | 4
- ever | 0 | 7
- every | 0 | 9
- everyone | 0 | 9
- everything | 0 | 5
- exactly | 0 | 8
- example | 0 | 9
- expect | 0 | 4
- experience | 0 | 9
- f | 0 | 9
- face | 0 | 7
- fact | 0 | 9
- fair | 0 | 4
- family | 0 | 9
- far | 0 | 7
- favorite | 0 | 5
- feature | 0 | 6
- features | 0 | 9
- feed | 0 | 6
- feeds | 0 | 5
- feel | 0 | 7
- filed | 0 | 40
- film | 0 | 5
- finally | 0 | 6
- find | 0 | 9
- five | 0 | 7
- flash | 0 | 7
- flickr | 0 | 7
- following | 0 | 5
- form | 0 | 6
- former | 0 | 5
- forward | 0 | 3
- found | 0 | 8
- four | 0 | 9
- fox | 0 | 8
- free | 0 | 9
- friday | 0 | 4
- friends | 0 | 6
- front | 0 | 7
- full | 0 | 6
- fun | 0 | 8
- future | 0 | 8
- g | 0 | 8
- game | 0 | 5
- games | 0 | 9
- gave | 0 | 5
- general | 0 | 5
- generation | 0 | 4
- gets | 0 | 8
- getting | 0 | 8
- give | 0 | 8
- given | 0 | 7
- gives | 0 | 4
- giving | 0 | 6
- global | 0 | 6
- go | 0 | 9
- goes | 0 | 7
- going | 0 | 7
- google | 0 | 9
- got | 0 | 9
- government | 0 | 9
- great | 0 | 9
- group | 0 | 7
- guy | 0 | 9
- guys | 0 | 6
- had | 0 | 9
- half | 0 | 5
- hand | 0 | 5
- hands | 0 | 8
- happen | 0 | 7
- happens | 0 | 6
- happy | 0 | 5
- hard | 0 | 7
- haven | 0 | 4
- having | 0 | 7
- head | 0 | 6
- hear | 0 | 7
- heard | 0 | 9
- help | 0 | 9
- her | 0 | 9
- high | 0 | 9
- him | 0 | 9
- history | 0 | 6
- hit | 0 | 7
- home | 0 | 7
- hope | 0 | 7
- host | 0 | 5
- hot | 0 | 7
- hour | 0 | 5
- hours | 0 | 8
- house | 0 | 8
- however | 0 | 9
- human | 0 | 6
- idea | 0 | 8
- image | 0 | 6
- images | 0 | 5
- important | 0 | 8
- include | 0 | 5
- included | 0 | 3
- includes | 0 | 3
- including | 0 | 8
- industry | 0 | 7
- information | 0 | 9
- inside | 0 | 4
- instead | 0 | 6
- intelligence | 0 | 9
- interesting | 0 | 9
- international | 0 | 3
- internet | 0 | 8
- interview | 0 | 7
- ipod | 0 | 5
- iraq | 0 | 9
- isn | 0 | 5
- issue | 0 | 8
- issues | 0 | 4
- itself | 0 | 4
- job | 0 | 7
- john | 0 | 8
- keep | 0 | 7
- key | 0 | 5
- kids | 0 | 6
- kind | 0 | 6
- knew | 0 | 8
- known | 0 | 4
- language | 0 | 7
- large | 0 | 6
- late | 0 | 5
- later | 0 | 5
- latest | 0 | 5
- launch | 0 | 7
- launched | 0 | 5
- law | 0 | 6
- learn | 0 | 9
- least | 0 | 9
- leave | 0 | 3
- left | 0 | 6
- less | 0 | 8
- let | 0 | 8
- level | 0 | 4
- life | 0 | 9
- light | 0 | 5
- likely | 0 | 7
- line | 0 | 9
- link | 0 | 8
- links | 0 | 9
- list | 0 | 8
- little | 0 | 8
- live | 0 | 6
- ll | 0 | 9
- local | 0 | 7
- location | 0 | 6
- long | 0 | 9
- longer | 0 | 4
- look | 0 | 8
- looking | 0 | 7
- looks | 0 | 6
- lot | 0 | 7
- lots | 0 | 8
- love | 0 | 8
- mac | 0 | 6
- made | 0 | 9
- magazine | 0 | 6
- mail | 0 | 8
- major | 0 | 8
- makes | 0 | 7
- making | 0 | 9
- man | 0 | 8
- mark | 0 | 9
- market | 0 | 9
- marketing | 0 | 6
- matter | 0 | 6
- may | 0 | 9
- maybe | 0 | 7
- mean | 0 | 6
- means | 0 | 5
- media | 0 | 9
- members | 0 | 6
- message | 0 | 6
- microsoft | 0 | 9
- might | 0 | 8
- million | 0 | 8
- mind | 0 | 8
- minutes | 0 | 6
- mobile | 0 | 9
- model | 0 | 8
- moment | 0 | 7
- monday | 0 | 7
- money | 0 | 7
- month | 0 | 6
- months | 0 | 5
- morning | 0 | 9
- move | 0 | 9
- movie | 0 | 8
- moving | 0 | 4
- music | 0 | 7
- must | 0 | 7
- myspace | 0 | 8
- n | 0 | 9
- name | 0 | 8
- national | 0 | 9
- nbsp | 0 | 6
- need | 0 | 9
- needs | 0 | 7
- network | 0 | 8
- never | 0 | 9
- news | 0 | 9
- next | 0 | 8
- nice | 0 | 5
- night | 0 | 5
- non | 0 | 4
- note | 0 | 6
- notes | 0 | 5
- nothing | 0 | 8
- november | 0 | 5
- number | 0 | 6
- o | 0 | 6
- offering | 0 | 3
- office | 0 | 8
- official | 0 | 6
- often | 0 | 9
- oh | 0 | 7
- old | 0 | 9
- once | 0 | 8
- ones | 0 | 5
- online | 0 | 8
- open | 0 | 7
- options | 0 | 6
- order | 0 | 7
- original | 0 | 3
- others | 0 | 8
- own | 0 | 8
- p | 0 | 6
- page | 0 | 9
- pages | 0 | 5
- paper | 0 | 8
- part | 0 | 9
- party | 0 | 8
- past | 0 | 9
- pay | 0 | 9
- pc | 0 | 9
- per | 0 | 8
- person | 0 | 8
- personal | 0 | 8
- phone | 0 | 7
- phones | 0 | 7
- photo | 0 | 9
- photos | 0 | 9
- pictures | 0 | 7
- piece | 0 | 6
- place | 0 | 7
- plan | 0 | 6
- planet | 0 | 7
- plans | 0 | 5
- play | 0 | 8
- player | 0 | 9
- players | 0 | 8
- playing | 0 | 8
- please | 0 | 9
- plus | 0 | 9
- pm | 0 | 9
- podcast | 0 | 7
- point | 0 | 9
- political | 0 | 9
- popular | 0 | 5
- possible | 0 | 7
- post | 0 | 9
- posted | 0 | 5
- posts | 0 | 5
- power | 0 | 9
- president | 0 | 9
- press | 0 | 9
- pretty | 0 | 9
- price | 0 | 5
- print | 0 | 6
- pro | 0 | 6
- probably | 0 | 9
- problem | 0 | 7
- problems | 0 | 6
- process | 0 | 7
- product | 0 | 9
- products | 0 | 7
- program | 0 | 5
- project | 0 | 8
- provide | 0 | 6
- public | 0 | 8
- put | 0 | 8
- question | 0 | 4
- questions | 0 | 4
- quite | 0 | 9
- r | 0 | 7
- radio | 0 | 6
- rather | 0 | 9
- read | 0 | 9
- reader | 0 | 8
- readers | 0 | 8
- reading | 0 | 7
- ready | 0 | 8
- real | 0 | 9
- reason | 0 | 5
- received | 0 | 3
- recent | 0 | 5
- recently | 0 | 6
- record | 0 | 6
- red | 0 | 6
- related | 0 | 8
- release | 0 | 9
- released | 0 | 7
- remember | 0 | 3
- report | 0 | 6
- reports | 0 | 7
- research | 0 | 5
- rest | 0 | 7
- result | 0 | 6
- results | 0 | 7
- right | 0 | 9
- room | 0 | 5
- rss | 0 | 8
- rules | 0 | 6
- run | 0 | 7
- running | 0 | 4
- said | 0 | 9
- same | 0 | 8
- san | 0 | 6
- save | 0 | 7
- saw | 0 | 7
- say | 0 | 9
- saying | 0 | 6
- says | 0 | 9
- school | 0 | 7
- screen | 0 | 9
- search | 0 | 9
- second | 0 | 9
- security | 0 | 9
- seem | 0 | 6
- seems | 0 | 7
- seen | 0 | 8
- self | 0 | 4
- sell | 0 | 4
- send | 0 | 4
- sense | 0 | 6
- sent | 0 | 7
- september | 0 | 8
- series | 0 | 6
- service | 0 | 9
- services | 0 | 9
- set | 0 | 7
- several | 0 | 8
- share | 0 | 8
- she | 0 | 9
- short | 0 | 8
- should | 0 | 9
- show | 0 | 9
- showing | 0 | 5
- shows | 0 | 8
- side | 0 | 8
- simple | 0 | 6
- simply | 0 | 4
- since | 0 | 8
- single | 0 | 6
- site | 0 | 8
- sites | 0 | 9
- six | 0 | 5
- size | 0 | 8
- small | 0 | 8
- smart | 0 | 5
- social | 0 | 8
- software | 0 | 6
- someone | 0 | 8
- something | 0 | 9
- sometimes | 0 | 8
- soon | 0 | 5
- sort | 0 | 6
- sound | 0 | 5
- source | 0 | 7
- space | 0 | 8
- speak | 0 | 4
- special | 0 | 9
- standard | 0 | 5
- star | 0 | 5
- start | 0 | 7
- started | 0 | 3
- starting | 0 | 5
- state | 0 | 9
- still | 0 | 9
- stop | 0 | 9
- store | 0 | 9
- stories | 0 | 8
- story | 0 | 9
- street | 0 | 8
- strong | 0 | 6
- stuff | 0 | 6
- style | 0 | 7
- subject | 0 | 4
- such | 0 | 9
- super | 0 | 4
- support | 0 | 8
- sure | 0 | 9
- system | 0 | 8
- systems | 0 | 5
- take | 0 | 7
- taken | 0 | 4
- takes | 0 | 5
- taking | 0 | 6
- talk | 0 | 9
- talking | 0 | 7
- team | 0 | 9
- tech | 0 | 7
- technology | 0 | 7
- tell | 0 | 9
- test | 0 | 6
- text | 0 | 9
- th | 0 | 5
- thanks | 0 | 8
- thing | 0 | 9
- things | 0 | 9
- thinking | 0 | 5
- those | 0 | 9
- though | 0 | 9
- thought | 0 | 6
- three | 0 | 6
- through | 0 | 7
- times | 0 | 8
- title | 0 | 8
- together | 0 | 6
- told | 0 | 7
- tom | 0 | 6
- too | 0 | 9
- took | 0 | 7
- tool | 0 | 5
- tools | 0 | 6
- top | 0 | 8
- touch | 0 | 6
- traffic | 0 | 7
- tried | 0 | 3
- true | 0 | 7
- try | 0 | 9
- trying | 0 | 7
- turn | 0 | 8
- tv | 0 | 6
- type | 0 | 9
- u | 0 | 8
- under | 0 | 5
- understand | 0 | 8
- university | 0 | 8
- until | 0 | 7
- update | 0 | 9
- usb | 0 | 9
- use | 0 | 9
- used | 0 | 8
- user | 0 | 7
- users | 0 | 7
- using | 0 | 9
- value | 0 | 5
- various | 0 | 4
- version | 0 | 8
- via | 0 | 9
- video | 0 | 9
- videos | 0 | 7
- view | 0 | 7
- visit | 0 | 7
- want | 0 | 9
- wanted | 0 | 8
- wants | 0 | 8
- war | 0 | 9
- washington | 0 | 5
- wasn | 0 | 4
- watch | 0 | 6
- ways | 0 | 5
- web | 0 | 8
- website | 0 | 8
- week | 0 | 8
- weekend | 0 | 5
- weeks | 0 | 7
- well | 0 | 9
- went | 0 | 7
- were | 0 | 8
- where | 0 | 9
- whether | 0 | 6
- white | 0 | 9
- whole | 0 | 7
- why | 0 | 9
- win | 0 | 5
- windows | 0 | 9
- within | 0 | 3
- without | 0 | 8
- women | 0 | 6
- won | 0 | 6
- word | 0 | 8
- words | 0 | 9
- work | 0 | 9
- working | 0 | 6
- works | 0 | 6
- worse | 0 | 5
- worth | 0 | 6
- wouldn | 0 | 4
- write | 0 | 5
- writing | 0 | 4
- written | 0 | 8
- wrong | 0 | 5
- wrote | 0 | 8
- x | 0 | 7
- yahoo | 0 | 8
- year | 0 | 8
- years | 0 | 7
- yes | 0 | 8
- yesterday | 0 | 8
- yet | 0 | 8
- york | 0 | 9
- young | 0 | 4
- youtube | 0 | 7
-(706 rows)
-
-DROP TABLE
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/member_kw.done.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/member_kw.done.out b/src/bin/gpmapreduce/test/expected/member_kw.done.out
deleted file mode 100644
index 514fa1a..0000000
--- a/src/bin/gpmapreduce/test/expected/member_kw.done.out
+++ /dev/null
@@ -1,15 +0,0 @@
- member_id | text | keyword_id | keyword | count
------------+-----------------------------------------------------------+------------+----------------------+-------
- 1 | Interested in software development and software profiling | 101 | software development | 1
-(1 row)
-
- member_id | text | keyword_id | keyword | count
------------+-----------------------------------------------------------+------------+----------------------+-------
- 1 | Interested in software development and software profiling | 101 | software development | 1
- 1 | Interested in software development and software profiling | 101 | software development | 1
-(2 rows)
-
-DROP TABLE
-DROP TABLE
-DROP TABLE
-DROP TABLE
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/member_kw.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/member_kw.err b/src/bin/gpmapreduce/test/expected/member_kw.err
deleted file mode 100644
index a37d15b..0000000
--- a/src/bin/gpmapreduce/test/expected/member_kw.err
+++ /dev/null
@@ -1,16 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs
-mapreduce_71934_run_1
-DONE
-mapreduce_71934_run_2
-DONE
-mapreduce_71934_run_3
-DONE
-mapreduce_71934_run_4
-DONE
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/member_kw.init.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/member_kw.init.out b/src/bin/gpmapreduce/test/expected/member_kw.init.out
deleted file mode 100644
index 228cb44..0000000
--- a/src/bin/gpmapreduce/test/expected/member_kw.init.out
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TABLE
-CREATE TABLE
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/member_kw.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/member_kw.out b/src/bin/gpmapreduce/test/expected/member_kw.out
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/mode.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/mode.err b/src/bin/gpmapreduce/test/expected/mode.err
deleted file mode 100644
index 4a946fc..0000000
--- a/src/bin/gpmapreduce/test/expected/mode.err
+++ /dev/null
@@ -1,12 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs
-mapreduce_72015_run_1
-mapreduce_72015_run_2
-mapreduce_72015_run_3
-mapreduce_72015_run_4
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/mode.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/mode.out b/src/bin/gpmapreduce/test/expected/mode.out
deleted file mode 100644
index 0f689ce..0000000
--- a/src/bin/gpmapreduce/test/expected/mode.out
+++ /dev/null
@@ -1,62 +0,0 @@
-key|value
----+-----
-k1 |v1
-k2 |v2
-(2 rows)
-
-key|value
----+-----
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-(22 rows)
-
-key|value
----+-----
-k1 |v1
-k2 |v2
-(2 rows)
-
-key|value
----+-----
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k1 |v1
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-k2 |v2
-(20 rows)
-
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/network.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/network.1 b/src/bin/gpmapreduce/test/expected/network.1
deleted file mode 100644
index 8a74710..0000000
--- a/src/bin/gpmapreduce/test/expected/network.1
+++ /dev/null
@@ -1,14 +0,0 @@
-georgeanne.hodges@enron.com|energy.dl-ga-all_ubsw@enron.com|1
-hotwebcash@lists.adversend.com|m..presto@enron.com|2
-sarah.zarkowsky@enron.com|c..aucoin@enron.com|1
-sarah.zarkowsky@enron.com|corry.bentley@enron.com|1
-sarah.zarkowsky@enron.com|david.forster@enron.com|1
-sarah.zarkowsky@enron.com|doug.gilbert-smith@enron.com|1
-sarah.zarkowsky@enron.com|edith.cross@enron.com|1
-sarah.zarkowsky@enron.com|heather.kroll@enron.com|1
-sarah.zarkowsky@enron.com|j..sturm@enron.com|1
-sarah.zarkowsky@enron.com|jeff.king@enron.com|1
-sarah.zarkowsky@enron.com|jim.meyn@enron.com|1
-sarah.zarkowsky@enron.com|rika.imai@enron.com|1
-sarah.zarkowsky@enron.com|rogers.herndon@enron.com|1
-sarah.zarkowsky@enron.com|w..white@enron.com|1
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/network.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/network.err b/src/bin/gpmapreduce/test/expected/network.err
deleted file mode 100644
index fb4ff13..0000000
--- a/src/bin/gpmapreduce/test/expected/network.err
+++ /dev/null
@@ -1,9 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs
-mapreduce_72082_run_1
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/network.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/network.out b/src/bin/gpmapreduce/test/expected/network.out
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/ordering.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/ordering.1 b/src/bin/gpmapreduce/test/expected/ordering.1
deleted file mode 100644
index 7cd3f6b..0000000
--- a/src/bin/gpmapreduce/test/expected/ordering.1
+++ /dev/null
@@ -1,75 +0,0 @@
-190.41.11.250|/admin/access_log/modules/vwar/convert/mvcw_conver.php, /admin/admin/editeur/spaw_control.class.php, /admin/editeur/spaw_control.class.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php
-195.142.106.114|/admin/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php
-200.171.143.11|//myfunctions/mygallerybrowser.php, /admin//myfunctions/mygallerybrowser.php
-200.54.148.78|/admin/admin/editeur/spaw_control.class.php, /admin/editeur/spaw_control.class.php, /admin/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php
-202.171.48.7|/admin/access_log/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php
-202.181.134.70|/admin/admin/editeur/spaw_control.class.php, /admin/editeur/spaw_control.class.php
-202.75.39.66|/admin/config.inc.php, /config.inc.php
-203.88.116.233|/admin/access_log/modules/vwar/convert/mvcw_conver.php, /admin/admin/editeur/spaw_control.class.php, /admin/editeur/spaw_control.class.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php
-206.167.170.73|/admin/index.php, /admin/index2.php, /index.php, /index2.php
-206.221.184.180|//login.php, /admin//login.php
-207.44.240.103|//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php
-208.1.62.200|/admin/convert/mvcw.php, /convert/mvcw.php
-208.113.221.15|//myfunctions/mygallerybrowser.php, /admin//myfunctions/mygallerybrowser.php
-208.186.169.183|////, /admin////
-209.129.16.106|///, /admin///
-209.160.72.103|//akocomments.php, //akocomments.php, //bemarket/postscript/postscript.php, //wwwstat.html/admin_events.php, /admin//akocomments.php, /admin//akocomments.php, /admin//bemarket/postscript/postscript.php, /admin//wwwstat.html/admin_events.php, /admin/admin.php, /admin/admin/admin.php, /admin/convert/mvcw.php
-209.195.7.19|/admin/index.php, /index.php
-209.62.106.34|/admin/access_log/convert/mvcw.php, /admin/convert/mvcw.php, /convert/mvcw.php
-209.97.199.252|//admin/editor2/spaw_control.class.php, //admin/editor2/spaw_control.class.php, /admin//admin/editor2/spaw_control.class.php, /admin//admin/editor2/spaw_control.class.php
-211.234.106.5|/admin/access_log/index.php, /admin/access_log/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /index.php, /index.php, /index.php, /index.php
-213.80.123.56|//myfunctions/mygallerybrowser.php, /admin//myfunctions/mygallerybrowser.php
-216.40.231.114|//, ///, /admin//, /admin///
-216.75.35.118|//myfunctions/mygallerybrowser.php, //myfunctions/mygallerybrowser.php, //myfunctions/mygallerybrowser.php, /admin//myfunctions/mygallerybrowser.php, /admin//myfunctions/mygallerybrowser.php, /admin//myfunctions/mygallerybrowser.php
-217.113.226.82|/admin/access_log/index.php, /admin/index.php, /admin/index.php, /index.php, /index.php
-217.195.115.146|/admin/access_log/convert/mvcw.php, /admin/convert/mvcw.php, /convert/mvcw.php
-217.195.192.40|/admin/access_log/index.php, /admin/index.php, /admin/index.php, /index.php, /index.php
-217.195.204.234|/admin/admin/editor2/spaw_control.class.php, /admin/editor2/spaw_control.class.php
-62.193.236.107|///, /admin///
-62.212.114.250|/admin/access_log/index.php, /admin/index.php, /admin/index.php, /index.php, /index.php
-62.75.202.173|//admin/index.php, //amember/plugins/payment/secpay/secpay.inc.php, /admin//admin/index.php, /admin//amember/plugins/payment/secpay/secpay.inc.php
-62.75.218.27|/admin/access_log/modules/vwar/convert/mvcw_conver.php, /admin/admin/editeur/spaw_control.class.php, /admin/editeur/spaw_control.class.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php
-64.185.237.125|//myfunctions/mygallerybrowser.php, /admin//myfunctions/mygallerybrowser.php
-64.22.85.186|/admin/errors.php, /errors.php
-64.37.66.135|/admin/components/com_rsgallery/rsgallery.html.php, /admin/components/com_rsgallery/rsgallery.html.php, /components/com_rsgallery/rsgallery.html.php, /components/com_rsgallery/rsgallery.html.php
-65.18.211.206|/%22index.php, /%22index.php, /admin/%22index.php, /admin/%22index.php, /admin/access_log/%22index.php
-66.225.219.10|/admin/access_log/index.php, /admin/index.php, /index.php
-66.80.93.168|/admin/errors.php, /errors.php
-67.15.12.20|/admin/access_log/components/com_hashcash/server.php, /admin/components/com_hashcash/server.php, /components/com_hashcash/server.php
-67.15.194.246|/admin/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php
-67.19.15.138|/admin/affichearticles.php3, /affichearticles.php3
-68.149.224.227|//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php
-69.46.229.11|/admin/access_log/index.php, /admin/index.php, /index.php
-69.80.225.14|//components/com_rsgallery/rsgallery.html.php, //nuseo/admin/nuseo_admin_d.php, /admin//components/com_rsgallery/rsgallery.html.php, /admin//nuseo/admin/nuseo_admin_d.php
-70.84.186.226|/admin/access_log/convert/mvcw.php, /admin/convert/mvcw.php, /convert/mvcw.php
-70.85.98.2|/admin/access_log/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php
-70.86.43.42|/admin/components/com_rsgallery/rsgallery.html.php, /components/com_rsgallery/rsgallery.html.php
-70.87.139.98|//mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php
-72.232.14.178|/admin/access_log/convert/mvcw.php, /admin/convert/mvcw.php, /convert/mvcw.php
-72.232.212.210|/
-72.55.143.196|/admin/errors.php, /errors.php
-74.200.89.66|//mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php
-74.52.88.90|/admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php
-74.53.40.2|//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php
-74.6.28.170|/
-74.6.28.231|/robots.txt
-75.125.161.218|/modules/vwar/convert/mvcw_conver.php
-77.221.130.17|/admin/access_log/index.php, /admin/index.php, /index.php
-80.38.160.131|//rsgallery.html.php, /admin//rsgallery.html.php, /admin/access_log//rsgallery.html.php
-80.38.62.39|/admin/mambots/content/multithumb/multithumb.php
-81.189.57.6|//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php
-82.105.241.113|//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php
-83.13.248.66|//administrator/components/com_remository/admin.remository.php, //include/monitoring/engine/MakeXML.php, /admin//administrator/components/com_remository/admin.remository.php, /admin//include/monitoring/engine/MakeXML.php
-83.142.25.74|//skin/zero_vote/ask_password.php, /admin//skin/zero_vote/ask_password.php
-83.148.126.98|//admin/index.php, /admin//admin/index.php
-83.16.96.219|//admin/index.php, /admin//admin/index.php
-83.226.209.72|/admin/access_log/index.php, /admin/index.php, /admin/index.php, /index.php, /index.php
-85.25.10.30|/FormTools1_5_0/global/templates/admin_page_open.php, /FormTools1_5_0/global/templates/admin_page_open.php, /admin/FormTools1_5_0/global/templates/admin_page_open.php, /admin/FormTools1_5_0/global/templates/admin_page_open.php, /admin/modules/mod_stats.php, /admin/modules/mod_stats.php, /modules/mod_stats.php, /modules/mod_stats.php
-85.31.196.28|/admin/errors.php, /errors.php
-86.109.103.76|//, //, //rsgallery.html.php, //rsgallery.html.php, //rsgallery.html.php, //rsgallery.html.php, /admin//, /admin//, /admin//rsgallery.html.php, /admin//rsgallery.html.php, /admin//rsgallery.html.php, /admin//rsgallery.html.php, /admin/access_log//rsgallery.html.php, /admin/access_log//rsgallery.html.php
-87.233.129.198|/admin/spaw_control.class.php, /spaw_control.class.php
-88.208.78.80|//, /admin//
-88.218.97.19|///////, /admin///////
-89.111.176.90|//myfunctions/mygallerybrowser.php, /admin//myfunctions/mygallerybrowser.php
-89.202.198.218|/admin/access_log/components/com_hashcash/server.php, /admin/components/com_hashcash/server.php, /components/com_hashcash/server.php
-91.142.213.11|//claroline//exercice//testheaderpage.php, //claroline/phpbb/page_tail.php, //modules/vwar/convert/mvcw_conver.php, //modules/vwar/convert/mvcw_conver.php, /admin//claroline//exercice//testheaderpage.php, /admin//claroline/phpbb/page_tail.php, /admin//modules/vwar/convert/mvcw_conver.php, /admin//modules/vwar/convert/mvcw_conver.php
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/ordering.2
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/ordering.2 b/src/bin/gpmapreduce/test/expected/ordering.2
deleted file mode 100644
index 38261e8..0000000
--- a/src/bin/gpmapreduce/test/expected/ordering.2
+++ /dev/null
@@ -1,75 +0,0 @@
-190.41.11.250|/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/editeur/spaw_control.class.php, /admin/admin/editeur/spaw_control.class.php, /admin/access_log/modules/vwar/convert/mvcw_conver.php
-195.142.106.114|/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php
-200.171.143.11|/admin//myfunctions/mygallerybrowser.php, //myfunctions/mygallerybrowser.php
-200.54.148.78|/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/editeur/spaw_control.class.php, /admin/admin/editeur/spaw_control.class.php
-202.171.48.7|/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/access_log/modules/vwar/convert/mvcw_conver.php
-202.181.134.70|/admin/editeur/spaw_control.class.php, /admin/admin/editeur/spaw_control.class.php
-202.75.39.66|/config.inc.php, /admin/config.inc.php
-203.88.116.233|/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/editeur/spaw_control.class.php, /admin/admin/editeur/spaw_control.class.php, /admin/access_log/modules/vwar/convert/mvcw_conver.php
-206.167.170.73|/index2.php, /index.php, /admin/index2.php, /admin/index.php
-206.221.184.180|/admin//login.php, //login.php
-207.44.240.103|/admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin//modules/cjaycontent/admin/editor2/spaw_control.class.php, //modules/cjaycontent/admin/editor2/spaw_control.class.php
-208.1.62.200|/convert/mvcw.php, /admin/convert/mvcw.php
-208.113.221.15|/admin//myfunctions/mygallerybrowser.php, //myfunctions/mygallerybrowser.php
-208.186.169.183|/admin////, ////
-209.129.16.106|/admin///, ///
-209.160.72.103|/admin/convert/mvcw.php, /admin/admin/admin.php, /admin/admin.php, /admin//wwwstat.html/admin_events.php, /admin//bemarket/postscript/postscript.php, /admin//akocomments.php, /admin//akocomments.php, //wwwstat.html/admin_events.php, //bemarket/postscript/postscript.php, //akocomments.php, //akocomments.php
-209.195.7.19|/index.php, /admin/index.php
-209.62.106.34|/convert/mvcw.php, /admin/convert/mvcw.php, /admin/access_log/convert/mvcw.php
-209.97.199.252|/admin//admin/editor2/spaw_control.class.php, /admin//admin/editor2/spaw_control.class.php, //admin/editor2/spaw_control.class.php, //admin/editor2/spaw_control.class.php
-211.234.106.5|/index.php, /index.php, /index.php, /index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/access_log/index.php, /admin/access_log/index.php
-213.80.123.56|/admin//myfunctions/mygallerybrowser.php, //myfunctions/mygallerybrowser.php
-216.40.231.114|/admin///, /admin//, ///, //
-216.75.35.118|/admin//myfunctions/mygallerybrowser.php, /admin//myfunctions/mygallerybrowser.php, /admin//myfunctions/mygallerybrowser.php, //myfunctions/mygallerybrowser.php, //myfunctions/mygallerybrowser.php, //myfunctions/mygallerybrowser.php
-217.113.226.82|/index.php, /index.php, /admin/index.php, /admin/index.php, /admin/access_log/index.php
-217.195.115.146|/convert/mvcw.php, /admin/convert/mvcw.php, /admin/access_log/convert/mvcw.php
-217.195.192.40|/index.php, /index.php, /admin/index.php, /admin/index.php, /admin/access_log/index.php
-217.195.204.234|/admin/editor2/spaw_control.class.php, /admin/admin/editor2/spaw_control.class.php
-62.193.236.107|/admin///, ///
-62.212.114.250|/index.php, /index.php, /admin/index.php, /admin/index.php, /admin/access_log/index.php
-62.75.202.173|/admin//amember/plugins/payment/secpay/secpay.inc.php, /admin//admin/index.php, //amember/plugins/payment/secpay/secpay.inc.php, //admin/index.php
-62.75.218.27|/modules/vwar/convert/mvcw_conver.php, /modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/editeur/spaw_control.class.php, /admin/admin/editeur/spaw_control.class.php, /admin/access_log/modules/vwar/convert/mvcw_conver.php
-64.185.237.125|/admin//myfunctions/mygallerybrowser.php, //myfunctions/mygallerybrowser.php
-64.22.85.186|/errors.php, /admin/errors.php
-64.37.66.135|/components/com_rsgallery/rsgallery.html.php, /components/com_rsgallery/rsgallery.html.php, /admin/components/com_rsgallery/rsgallery.html.php, /admin/components/com_rsgallery/rsgallery.html.php
-65.18.211.206|/admin/access_log/%22index.php, /admin/%22index.php, /admin/%22index.php, /%22index.php, /%22index.php
-66.225.219.10|/index.php, /admin/index.php, /admin/access_log/index.php
-66.80.93.168|/errors.php, /admin/errors.php
-67.15.12.20|/components/com_hashcash/server.php, /admin/components/com_hashcash/server.php, /admin/access_log/components/com_hashcash/server.php
-67.15.194.246|/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php
-67.19.15.138|/affichearticles.php3, /admin/affichearticles.php3
-68.149.224.227|/admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin//modules/cjaycontent/admin/editor2/spaw_control.class.php, //modules/cjaycontent/admin/editor2/spaw_control.class.php
-69.46.229.11|/index.php, /admin/index.php, /admin/access_log/index.php
-69.80.225.14|/admin//nuseo/admin/nuseo_admin_d.php, /admin//components/com_rsgallery/rsgallery.html.php, //nuseo/admin/nuseo_admin_d.php, //components/com_rsgallery/rsgallery.html.php
-70.84.186.226|/convert/mvcw.php, /admin/convert/mvcw.php, /admin/access_log/convert/mvcw.php
-70.85.98.2|/modules/vwar/convert/mvcw_conver.php, /admin/modules/vwar/convert/mvcw_conver.php, /admin/access_log/modules/vwar/convert/mvcw_conver.php
-70.86.43.42|/components/com_rsgallery/rsgallery.html.php, /admin/components/com_rsgallery/rsgallery.html.php
-70.87.139.98|/admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php
-72.232.14.178|/convert/mvcw.php, /admin/convert/mvcw.php, /admin/access_log/convert/mvcw.php
-72.232.212.210|/
-72.55.143.196|/errors.php, /admin/errors.php
-74.200.89.66|/admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, /admin//mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php, //mambots/content/multithumb/multithumb.php
-74.52.88.90|/index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php, /admin/access_log/index.php
-74.53.40.2|/admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin//modules/cjaycontent/admin/editor2/spaw_control.class.php, //modules/cjaycontent/admin/editor2/spaw_control.class.php
-74.6.28.170|/
-74.6.28.231|/robots.txt
-75.125.161.218|/modules/vwar/convert/mvcw_conver.php
-77.221.130.17|/index.php, /admin/index.php, /admin/access_log/index.php
-80.38.160.131|/admin/access_log//rsgallery.html.php, /admin//rsgallery.html.php, //rsgallery.html.php
-80.38.62.39|/admin/mambots/content/multithumb/multithumb.php
-81.189.57.6|/admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin//modules/cjaycontent/admin/editor2/spaw_control.class.php, //modules/cjaycontent/admin/editor2/spaw_control.class.php
-82.105.241.113|/admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php, /admin//modules/cjaycontent/admin/editor2/spaw_control.class.php, //modules/cjaycontent/admin/editor2/spaw_control.class.php
-83.13.248.66|/admin//include/monitoring/engine/MakeXML.php, /admin//administrator/components/com_remository/admin.remository.php, //include/monitoring/engine/MakeXML.php, //administrator/components/com_remository/admin.remository.php
-83.142.25.74|/admin//skin/zero_vote/ask_password.php, //skin/zero_vote/ask_password.php
-83.148.126.98|/admin//admin/index.php, //admin/index.php
-83.16.96.219|/admin//admin/index.php, //admin/index.php
-83.226.209.72|/index.php, /index.php, /admin/index.php, /admin/index.php, /admin/access_log/index.php
-85.25.10.30|/modules/mod_stats.php, /modules/mod_stats.php, /admin/modules/mod_stats.php, /admin/modules/mod_stats.php, /admin/FormTools1_5_0/global/templates/admin_page_open.php, /admin/FormTools1_5_0/global/templates/admin_page_open.php, /FormTools1_5_0/global/templates/admin_page_open.php, /FormTools1_5_0/global/templates/admin_page_open.php
-85.31.196.28|/errors.php, /admin/errors.php
-86.109.103.76|/admin/access_log//rsgallery.html.php, /admin/access_log//rsgallery.html.php, /admin//rsgallery.html.php, /admin//rsgallery.html.php, /admin//rsgallery.html.php, /admin//rsgallery.html.php, /admin//, /admin//, //rsgallery.html.php, //rsgallery.html.php, //rsgallery.html.php, //rsgallery.html.php, //, //
-87.233.129.198|/spaw_control.class.php, /admin/spaw_control.class.php
-88.208.78.80|/admin//, //
-88.218.97.19|/admin///////, ///////
-89.111.176.90|/admin//myfunctions/mygallerybrowser.php, //myfunctions/mygallerybrowser.php
-89.202.198.218|/components/com_hashcash/server.php, /admin/components/com_hashcash/server.php, /admin/access_log/components/com_hashcash/server.php
-91.142.213.11|/admin//modules/vwar/convert/mvcw_conver.php, /admin//modules/vwar/convert/mvcw_conver.php, /admin//claroline/phpbb/page_tail.php, /admin//claroline//exercice//testheaderpage.php, //modules/vwar/convert/mvcw_conver.php, //modules/vwar/convert/mvcw_conver.php, //claroline/phpbb/page_tail.php, //claroline//exercice//testheaderpage.php
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/ordering.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/ordering.err b/src/bin/gpmapreduce/test/expected/ordering.err
deleted file mode 100644
index c8451c7..0000000
--- a/src/bin/gpmapreduce/test/expected/ordering.err
+++ /dev/null
@@ -1,10 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs
-mapreduce_20459_run_1
-mapreduce_20459_run_2
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/ordering.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/ordering.out b/src/bin/gpmapreduce/test/expected/ordering.out
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/oreilly.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/oreilly.1 b/src/bin/gpmapreduce/test/expected/oreilly.1
deleted file mode 100644
index 9bd0b92..0000000
--- a/src/bin/gpmapreduce/test/expected/oreilly.1
+++ /dev/null
@@ -1,9 +0,0 @@
-4578.trine100577|1013|2005-07-18|1124348400|2005-06-29 21:51:27|2005-07-10 21:51:40|dcac733746cd21547bf7be20144a064c|0
-4578.tsgincctWBC9592|1000|2005-06-28|1122534000|2005-06-28 21:51:31|2005-07-10 21:51:40|48d0b49cbd37b22c74eb120a35d21d31|0
-4578.tsrnj629055CN|1010|2005-06-29|1122620400|2005-06-29 21:51:26|2005-07-10 21:51:40|736231c53d47f66a9b3a753ea8ee40c6|0
-4579.26189_2894274|4|2005-07-01|1122879600|2005-07-01 21:51:43|2005-07-07 21:50:41|a50cf4b1ace6f88def4610c635a1600e|0
-4579.26189_2894275|3|2005-07-01|1122879600|2005-07-01 21:51:43|2005-07-07 21:50:41|502eb4047338ea9d0279cb46e55abb61|0
-4579.26189_2894276|2|2005-07-01|1122879600|2005-07-01 21:51:43|2005-07-07 21:50:41|784869b29ebff3e93e0d8f8f6de5705f|0
-4579.26189_2894277|1|2005-08-01|1122879600|2006-08-01 21:51:43|2006-08-07 21:50:41|9de1cdf82722bf175e002c4f55b86d5d|0
-4579.26189_2894277|1|2005-12-01|1122879600|2005-12-01 21:51:43|2005-12-07 21:50:41|9de1cdf82722bf175e002c4f55b86d5d|1
-9b1f76f72b9a24287842bcb115a52c356437972|567767|2005-05-26||2005-05-21 16:38:26|2005-05-27 02:00:09|a53524b724de3ce1ca242d23d239309d|0
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/oreilly.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/oreilly.err b/src/bin/gpmapreduce/test/expected/oreilly.err
deleted file mode 100644
index 5ab54a5..0000000
--- a/src/bin/gpmapreduce/test/expected/oreilly.err
+++ /dev/null
@@ -1,11 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs
-WARNING: unset parameter - Uniquify(gap => NULL)
-mapreduce_72224_run_1
-NOTICE: Found 1 data formatting errors (1 or more input rows). Rejected related input data.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/oreilly.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/oreilly.out b/src/bin/gpmapreduce/test/expected/oreilly.out
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.1 b/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.1
deleted file mode 100644
index 688e2d4..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.1
+++ /dev/null
@@ -1,6 +0,0 @@
-1|10|20|30
-2|84|168|252
-3|30|60|90
-4|40|80|120
-5|100|200|300
-10|100|200|300
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.done.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.done.out b/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.done.out
deleted file mode 100644
index ee9e169..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.done.out
+++ /dev/null
@@ -1,3 +0,0 @@
-DROP TABLE
-DROP FUNCTION
-DROP FUNCTION
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.err b/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.err
deleted file mode 100644
index 0fab22e..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.err
+++ /dev/null
@@ -1,9 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs
-mapreduce_29877_run_1
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.init.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.init.out b/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.init.out
deleted file mode 100644
index 98b757b..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.init.out
+++ /dev/null
@@ -1,13 +0,0 @@
-CREATE TABLE
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-CREATE FUNCTION
-CREATE FUNCTION
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.out b/src/bin/gpmapreduce/test/expected/overwrite_retval_multiple.out
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_single.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_single.1 b/src/bin/gpmapreduce/test/expected/overwrite_retval_single.1
deleted file mode 100644
index ebdcf70..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_single.1
+++ /dev/null
@@ -1,6 +0,0 @@
-1|10
-2|84
-3|30
-4|40
-5|100
-10|100
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_single.done.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_single.done.out b/src/bin/gpmapreduce/test/expected/overwrite_retval_single.done.out
deleted file mode 100644
index ee9e169..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_single.done.out
+++ /dev/null
@@ -1,3 +0,0 @@
-DROP TABLE
-DROP FUNCTION
-DROP FUNCTION
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_single.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_single.err b/src/bin/gpmapreduce/test/expected/overwrite_retval_single.err
deleted file mode 100644
index 9d58324..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_single.err
+++ /dev/null
@@ -1,9 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs
-mapreduce_30013_run_1
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_single.init.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_single.init.out b/src/bin/gpmapreduce/test/expected/overwrite_retval_single.init.out
deleted file mode 100644
index 98b757b..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_single.init.out
+++ /dev/null
@@ -1,13 +0,0 @@
-CREATE TABLE
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-CREATE FUNCTION
-CREATE FUNCTION
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_single.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_single.out b/src/bin/gpmapreduce/test/expected/overwrite_retval_single.out
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_table.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_table.1 b/src/bin/gpmapreduce/test/expected/overwrite_retval_table.1
deleted file mode 100644
index 688e2d4..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_table.1
+++ /dev/null
@@ -1,6 +0,0 @@
-1|10|20|30
-2|84|168|252
-3|30|60|90
-4|40|80|120
-5|100|200|300
-10|100|200|300
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_table.done.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_table.done.out b/src/bin/gpmapreduce/test/expected/overwrite_retval_table.done.out
deleted file mode 100644
index ee9e169..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_table.done.out
+++ /dev/null
@@ -1,3 +0,0 @@
-DROP TABLE
-DROP FUNCTION
-DROP FUNCTION
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_table.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_table.err b/src/bin/gpmapreduce/test/expected/overwrite_retval_table.err
deleted file mode 100644
index ffe6c4b..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_table.err
+++ /dev/null
@@ -1,9 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs
-mapreduce_31513_run_1
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_table.init.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_table.init.out b/src/bin/gpmapreduce/test/expected/overwrite_retval_table.init.out
deleted file mode 100644
index 98b757b..0000000
--- a/src/bin/gpmapreduce/test/expected/overwrite_retval_table.init.out
+++ /dev/null
@@ -1,13 +0,0 @@
-CREATE TABLE
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-INSERT 0 1
-CREATE FUNCTION
-CREATE FUNCTION
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/overwrite_retval_table.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/overwrite_retval_table.out b/src/bin/gpmapreduce/test/expected/overwrite_retval_table.out
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/pagerank.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/pagerank.1 b/src/bin/gpmapreduce/test/expected/pagerank.1
deleted file mode 100644
index bd7cff9..0000000
--- a/src/bin/gpmapreduce/test/expected/pagerank.1
+++ /dev/null
@@ -1,20 +0,0 @@
-0|0.85
-1|0.85
-10|0.85
-11|0.85
-12|0.85
-13|0.85
-14|0.85
-15|0.85
-16|0.85
-17|0.85
-18|0.85
-19|0.85
-20|0.85
-3|0.85
-4|0.85
-5|0.85
-6|0.85
-7|0.85
-8|0.85
-9|0.85
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/pagerank.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/pagerank.err b/src/bin/gpmapreduce/test/expected/pagerank.err
deleted file mode 100644
index b88a1c0..0000000
--- a/src/bin/gpmapreduce/test/expected/pagerank.err
+++ /dev/null
@@ -1,9 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs
-mapreduce_72300_run_1
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/pagerank.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/pagerank.out b/src/bin/gpmapreduce/test/expected/pagerank.out
deleted file mode 100644
index e69de29..0000000