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:47 UTC

[01/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Repository: incubator-hawq
Updated Branches:
  refs/heads/master 04c0f28b9 -> 4e392375e


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/test/regress/output/mapred.source
----------------------------------------------------------------------
diff --git a/src/test/regress/output/mapred.source b/src/test/regress/output/mapred.source
deleted file mode 100644
index 1b6a2ba..0000000
--- a/src/test/regress/output/mapred.source
+++ /dev/null
@@ -1,507 +0,0 @@
---
--- map/reduce tests
---
--- Some notes: the PATH variable doesn't necessarily work correctly in
--- the regression context, so use the "gpwhich" token to get the full
--- path from your environment (see gpstringsubs for more details).  And
--- to make this work correctly with gpsourcify, you need to add your
--- gpwhich token to gptokencheck.
--- start_matchsubs
--- m|mapreduce_\d+_run|
--- s|mapreduce_\d+_run|mapreduce_PID_run|
--- end_matchsubs
---
--- This test makes use of plperlu
---
--- start_ignore
-create language plperlu;
-create language plpythonu;
--- Take a look at the installed languages, plperl and plpython should be in the list.
---  + pg_pltemplate contains the list of languages that can be simply installed
---  + pl_language contains the list of languages that are actually installed
-select * from pg_pltemplate;
- tmplname  | tmpltrusted |      tmplhandler      |   tmplvalidator   |   tmpllibrary    | tmplacl 
------------+-------------+-----------------------+-------------------+------------------+---------
- plpgsql   | t           | plpgsql_call_handler  | plpgsql_validator | $libdir/plpgsql  | 
- pltcl     | t           | pltcl_call_handler    |                   | $libdir/pltcl    | 
- pltclu    | f           | pltclu_call_handler   |                   | $libdir/pltcl    | 
- plperl    | t           | plperl_call_handler   | plperl_validator  | $libdir/plperl   | 
- plperlu   | f           | plperl_call_handler   | plperl_validator  | $libdir/plperl   | 
- plpythonu | f           | plpython_call_handler |                   | $libdir/plpython | 
- plr       | f           | plr_call_handler      |                   | $libdir/plr      | 
-(7 rows)
-
-select lanname, lanispl, lanpltrusted from pg_language;
-  lanname  | lanispl | lanpltrusted 
------------+---------+--------------
- internal  | f       | f
- c         | f       | f
- sql       | f       | t
- plpgsql   | t       | t
- plperlu   | t       | f
- plpythonu | t       | f
-(6 rows)
-
--- Check enviornment variables that should have been set by greenplum_path.sh
---
--- 1) We need to check these on all segments and on the master.
--- 2) We do this via external table rather than perl/python in case it is part
---    of the cause of a mis-installed plperl/plpython.
--- 3) It is normal for the master to have a slightly different enviornment from
---    the segments (but perhaps not desirable?)
---
-CREATE EXTERNAL WEB TABLE env_segment(var text, value text) 
-EXECUTE 'env | grep "^[^=]*=[^=]*$"' format 'text' (delimiter '=');
-CREATE EXTERNAL WEB TABLE env_master(var text, value text) 
-EXECUTE 'env | grep "^[^=]*=[^=]*$"' on master format 'text' (delimiter '=');
-CREATE VIEW env AS
-  SELECT gp_execution_segment(), * FROM env_segment
-  UNION ALL
-  SELECT gp_execution_segment(), * FROM env_master;
-SELECT * FROM env WHERE var in (
-	   'GPHOME', 
-	   'DYLD_LIBRARY_PATH', 
-	   'LD_LIBRARY_PATH', 
-	   'PATH'
-) ORDER BY var, gp_execution_segment;
- gp_execution_segment |        var        |                                                                      value                                                                                         
-----------------------+-------------------+----------------------------------------------------------------------------------------------------------------------------------------
-                   -1 | DYLD_LIBRARY_PATH | @gphome@/lib:@gphome@/ext/python/lib:$DYLD_LIBRARY_PATH
-                    0 | DYLD_LIBRARY_PATH | @gphome@/lib:@gphome@/ext/python/lib:
-                    1 | DYLD_LIBRARY_PATH | @gphome@/lib:@gphome@/ext/python/lib:
-                   -1 | GPHOME            | @gphome@
-                    0 | GPHOME            | @gphome@
-                    1 | GPHOME            | @gphome@
-                   -1 | LD_LIBRARY_PATH   | @gphome@/lib:@gphome@/ext/python/lib:
-                   -1 | PATH              | @gphome@/bin:/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:/usr/sbin:/sbin:/usr/texbin:/usr/X11/bin:/sw/bin:/opt/local/bin:/opt/local/sbin
-                    0 | PATH              | @gphome@/ext/python/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
-                    1 | PATH              | @gphome@/ext/python/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
-(10 rows)
-
--- end_ignore
---
--- Some checks to verify what versions of perl/python we have.
--- If everything has been configured correctly this should be constant
--- across all our installations.
---
--- All of these checks should return a single row because it should produce
--- a constant across all segments and the master.
---
--- The current expected version is 2.6.2
---
-CREATE OR REPLACE FUNCTION python_version() returns text as $$
-import sys
-return sys.version_info
-$$ language plpythonu;
-SELECT python_version() FROM env GROUP BY python_version;
-    python_version     
------------------------
- (2, 6, 2, 'final', 0)
-(1 row)
-
---
--- Same check for perl version
---
--- Expected version is perl 5.008xxx
---
-CREATE OR REPLACE FUNCTION perl_version() returns text as $$
-return "Perl $]"
-$$ language plperlu;
--- ignore
-SELECT perl_version() FROM env GROUP BY perl_version;
- perl_version  
----------------
- Perl 5.008005
-(1 row)
-
---
--- The following two checks need to be put into big ignore blocks
--- because paths can be of differing lengths
---
--- start_ignore
-CREATE OR REPLACE FUNCTION python_path() returns text as $$
-import sys
-return sys.path[0]
-$$ language plpythonu;
-SELECT python_path() FROM env GROUP BY python_path;
-                 python_path                 
----------------------------------------------
- @gphome@/lib/python
-(1 row)
-
-CREATE OR REPLACE FUNCTION perl_path() returns text as $$
-return join(':', @INC)
-$$ language plperlu;
-SELECT perl_path() FROM env GROUP BY perl_path;
-                                                                                                                                                                                                      perl_path                                                                                                                                                                                                      
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- /System/Library/Perl/5.8.8/darwin-thread-multi-2level:/System/Library/Perl/5.8.8:/Library/Perl/5.8.8/darwin-thread-multi-2level:/Library/Perl/5.8.8:/Library/Perl:/Network/Library/Perl/5.8.8/darwin-thread-multi-2level:/Network/Library/Perl/5.8.8:/Network/Library/Perl:/System/Library/Perl/Extras/5.8.8/darwin-thread-multi-2level:/System/Library/Perl/Extras/5.8.8:/Library/Perl/5.8.6:/Library/Perl/5.8.1:.
-(1 row)
-
--- end_ignore
---
--- Create a harness to run shell commands and output stderr and stdout
---
-CREATE OR REPLACE FUNCTION execute(cmd text) returns text as $$
-import subprocess
-p = subprocess.Popen(cmd, shell=True, 
-                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-r = p.communicate()
-header = "---------------------\n"
-return header + r[0]
-$$ LANGUAGE plpythonu;
---
--- Create a harness to run mapreduce jobs on the correct host/port
---
-CREATE OR REPLACE FUNCTION mapreduce(file text) returns setof text as $$
-import subprocess
-
-rv = plpy.execute("select hostname, port, user as user, " +
-   " current_database() as db from gp_segment_configuration where content=-1")
-
-cmd = ['@gpwhich_gpmapreduce@',
-       '--host=%s' % rv[0]['hostname'],
-       '--port=%s' % rv[0]['port'],
-       '--file=%s' % file,
-       rv[0]['db'], rv[0]['user'] ]
-p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-r = p.communicate()
-header = "---------------------"
-err = '\nSTDERR> '.join(('STDERR> ' + r[1]).split('\n')).replace('\t', '   ')
-out = 'STDOUT>\n' + r[0].replace('\t', ', ')
-return [header, err, out]
-$$ LANGUAGE plpythonu;
-CREATE OR REPLACE FUNCTION mapreduce(file text, keys text) returns setof text as $$
-import subprocess
-
-rv = plpy.execute("select hostname, port, user as user, " +
-   " current_database() as db from gp_segment_configuration where content=-1")
-
-cmd = ['@gpwhich_gpmapreduce@',
-       '--host=%s' % rv[0]['hostname'],
-       '--port=%s' % rv[0]['port'],
-       '--file=%s' % file,
-       rv[0]['db'], rv[0]['user'] ]
-for key in keys.split(';'):
-  cmd.append('--key=%s' % key)
-p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-r = p.communicate()
-header = "---------------------"
-err = '\nSTDERR> '.join(('STDERR> ' + r[1]).split('\n')).replace('\t', '   ')
-out = 'STDOUT>\n' + r[0].replace('\t', ', ')
-return [header, err, out]
-$$ LANGUAGE plpythonu;
---
--- CHECK 1) make sure plperlu is really installed:
---
--- Note: if not, you might need to 'export PG_LANG=true' and reconfigure/rebuild
---
-SELECT lanname, lanispl, lanpltrusted FROM pg_language WHERE lanname = 'plperlu';
- lanname | lanispl | lanpltrusted 
----------+---------+--------------
- plperlu | t       | f
-(1 row)
-
---
--- Since many of these tests will end up having variable length output depending
--- on local paths we want to disable the "----" lines from psql so that our diffs
--- look reasonable.
---
--- The default is "aligned" if that ever changes then we need to change how we restore
--- it at the end of the test
-\pset format
-\pset format unaligned
---
--- Check 2) Find gpmapreduce and print the help file
---
--- ignore
-select execute( '@gpwhich_gpmapreduce@ --help' );
-execute
----------------------
-@gpwhich_gpmapreduce@ - Greenplum Map/Reduce Driver 1.00b2
-
-Usage:
-  @gpwhich_gpmapreduce@ [options] -f file.yml [dbname [username]]
-
-General options:
-  -? | --help                   show this help, then exit
-  -V | --version                show version information, then exit
-  -v | --verbose                verbose output
-  -x | --explain                do not run jobs, but produce explain plans
-  -X | --explain-analyze        run jobs and produce explain-analyze plans
-  -k | --key <name>=<value>     sets a yaml variable
-
-Connection options:
-  -h | --host <hostname>        database server host or socket directory
-  -p | --port <port>            database server port
-  -U | --username <username>    database user name
-  -W | --password               prompt for password
-
-(1 row)
---
--- TEST 1) complain about missing file
---
-SELECT mapreduce('nosuchfile') ORDER BY 1;
-mapreduce
----------------------
-STDERR> Error: Could not open file 'nosuchfile'
-STDERR> 
-STDOUT>
-
-(3 rows)
---
--- TEST 2) Tests reading and sorting an input file;
---
-SELECT mapreduce('@abs_srcdir@/yml/sort.yml') ORDER BY 1;
-mapreduce
----------------------
-STDERR> mapreduce_73685_run_1
-STDERR> 
-STDOUT>
-value                    
--------------------------
-alex, 30, (1.352,8.2)      
-belinda, 38, (8.9,1.7)     
-bertha, 88, (2.75,9.4)     
-carina, 58, (4.27,8.8)     
-carmen, 78, (3.8,8.2)      
-chris, 78, (9.78,2)        
-denise, 24, (3.78,87.90)   
-diane, 18, (5.912,5.3)     
-edna, 18, (1.53,3.5)       
-esther, 98, (5.36,7.6)     
-fanny, 08, (1.2,0.9)       
-gina, 18, (9.82,7.5)       
-jane, 58, (1.34,0.44)      
-jean, 28, (8.561,7.3)      
-jenifer, 38, (6.6,23.3)    
-joan, 18, (9.4,47.04)      
-joe, 20, (5.5,2.5)         
-juanita, 58, (4.57,35.8)   
-julie, 68, (3.6,7.2)       
-karen, 48, (8.73,0.0)      
-koko, 88, (1.7,5.5)        
-leah, 68, (0.6,3.37)       
-lita, 25, (1.3,8.7)        
-liza, 38, (9.76,6.90)      
-louise, 98, (5.0,8.7)      
-martie, 88, (8.358,.93)    
-mary, 08, (3.7,39.20)      
-melissa, 28, (3.089,087.23)
-mike, 40, (3.1,6.2)        
-nan, 28, (6.35,0.43)       
-pamela, 48, (8.21,9.3)     
-pat, 18, (1.19,0.6)        
-paula, 68, (0.5,0.5)       
-rean, 48, (8.5,5.0)        
-sally, 34, (3.8,45.8)      
-sandra, 19, (9.345,09.6)   
-sandy, 38, (3.8,0.2)       
-sarah, 88, (8.4,2.3)       
-sharon, 78, (9.237,8.8)    
-sue, 50, (8.34,7.375)      
-sumi, 38, (1.15,0.6)       
-susan, 78, (6.579,3)       
-teresa, 38, (7.7,1.8)      
-trisha, 88, (1.29,2.2)     
-trudy, 88, (6.01,0.5)      
-velma, 68, (8.8,8.9)       
-vera, 78, (9.73,6.4)       
-wendy, 78, (2.62,03.3)     
-zena, 98, (0.35,0)         
-zola, 58, (2.56,4.3)       
-(50 rows)
-
-
-(3 rows)
---
--- TEST 3) Tests a basic map function and parameter passing
---
-SELECT mapreduce('@abs_srcdir@/yml/grep.yml', 'key=an') ORDER BY 1;
-mapreduce
----------------------
-STDERR> mapreduce_73691_run_1
-STDERR> 
-STDOUT>
-key|value                 
----+----------------------
-an |diane, 18, (5.912,5.3)  
-an |fanny, 08, (1.2,0.9)    
-an |jane, 58, (1.34,0.44)   
-an |jean, 28, (8.561,7.3)   
-an |joan, 18, (9.4,47.04)   
-an |juanita, 58, (4.57,35.8)
-an |nan, 28, (6.35,0.43)    
-an |rean, 48, (8.5,5.0)     
-an |sandra, 19, (9.345,09.6)
-an |sandy, 38, (3.8,0.2)    
-an |susan, 78, (6.579,3)    
-(11 rows)
-
-
-(3 rows)
---
--- Test 4) Tests producing multiple columns
---
-SELECT mapreduce('@abs_srcdir@/yml/grep2.yml', 'key=an') ORDER BY 1;
-mapreduce
----------------------
-STDERR> mapreduce_73697_run_1
-STDERR> 
-STDOUT>
-name   |age|location    
--------+---+------------
-diane  | 18|(5.912,5.3) 
-fanny  |  8|(1.2,0.9)   
-jane   | 58|(1.34,0.44) 
-jean   | 28|(8.561,7.3) 
-joan   | 18|(9.4,47.04) 
-juanita| 58|(4.57,35.8) 
-nan    | 28|(6.35,0.43) 
-rean   | 48|(8.5,5.0)   
-sandra | 19|(9.345,09.6)
-sandy  | 38|(3.8,0.2)   
-susan  | 78|(6.579,3)   
-(11 rows)
-
-
-(3 rows)
---
--- Test 5) Tests a basic reduce function
---
-SELECT mapreduce('@abs_srcdir@/yml/agebracket.yml') ORDER BY 1;
-mapreduce
----------------------
-STDERR> mapreduce_73703_run_1
-STDERR> 
-STDOUT>
-key            |value
----------------+-----
-0 => age < 10  |    2
-10 => age < 20 |    6
-20 => age < 30 |    6
-30 => age < 40 |    8
-40 => age < 50 |    4
-50 => age < 60 |    5
-60 => age < 70 |    4
-70 => age < 80 |    6
-80 => age < 90 |    6
-90 => age < 100|    3
-(10 rows)
-
-
-(3 rows)
---
--- Test 6) File Output tests
---
-SELECT execute('rm @abs_builddir@/results/fileout_*.out') ORDER BY 1;
-execute
----------------------
-
-(1 row)
-SELECT mapreduce('@abs_srcdir@/yml/fileout.yml') ORDER BY 1;
-mapreduce
----------------------
-STDERR> mapreduce_73712_run_1
-STDERR> mapreduce_73712_run_2
-STDERR> mapreduce_73712_run_3
-STDERR> 
-STDOUT>
-
-(3 rows)
-SELECT execute('cat @abs_builddir@/results/fileout_none.out') ORDER BY 1;
-execute
----------------------
-row 1:data 1
-row 2:data 2
-row 3:data 3
-
-(1 row)
-SELECT execute('cat @abs_builddir@/results/fileout_replace.out') ORDER BY 1;
-execute
----------------------
-row 1|data 1
-row 2|data 2
-row 3|data 3
-
-(1 row)
-SELECT execute('cat @abs_builddir@/results/fileout_append.out') ORDER BY 1;
-execute
----------------------
-row 1,data 1
-row 2,data 2
-row 3,data 3
-
-(1 row)
-SELECT mapreduce('@abs_srcdir@/yml/fileout.yml') ORDER BY 1;
-mapreduce
----------------------
-STDERR> mapreduce_73721_run_1
-STDERR> mapreduce_73721_run_2
-STDERR> mapreduce_73721_run_3
-STDERR> Error: OUTPUT 'out_3': file '@abs_builddir@/results/fileout_none.out' already exists, at line 27
-STDERR> Error: Object creation Failure
-STDERR> 
-STDOUT>
-
-(3 rows)
-SELECT execute('cat @abs_builddir@/results/fileout_none.out') ORDER BY 1;
-execute
----------------------
-row 1:data 1
-row 2:data 2
-row 3:data 3
-
-(1 row)
-SELECT execute('cat @abs_builddir@/results/fileout_replace.out') ORDER BY 1;
-execute
----------------------
-row 1|data 1
-row 2|data 2
-row 3|data 3
-
-(1 row)
-SELECT execute('cat @abs_builddir@/results/fileout_append.out') ORDER BY 1;
-execute
----------------------
-row 1,data 1
-row 2,data 2
-row 3,data 3
-row 1,data 1
-row 2,data 2
-row 3,data 3
-
-(1 row)
--- 
--- Test 7) Perl syntax error lineno reporting
---
-SELECT mapreduce('@abs_srcdir@/yml/perlerror.yml') ORDER BY 1;
-mapreduce
----------------------
-STDERR> ERROR:  creation of Perl function failed
-STDERR> DETAIL:  syntax error at line 18, near "[]"
-STDERR> syntax error at line 20, near ";
-STDERR>  }"
-STDERR> Error: Object creation Failure
-STDERR> ERROR:  creation of Perl function failed
-STDERR> DETAIL:  syntax error at line 28, near "[]"
-STDERR> syntax error at line 29, near ";
-STDERR>  }"
-STDERR> Error: Object creation Failure
-STDERR> ERROR:  creation of Perl function failed
-STDERR> DETAIL:  syntax error at line 37, near "[]"
-STDERR> Error: Object creation Failure
-STDERR> ERROR:  creation of Perl function failed
-STDERR> DETAIL:  syntax error at line 45, near "[]"
-STDERR> Error: Object creation Failure
-STDERR> ERROR:  creation of Perl function failed
-STDERR> DETAIL:  syntax error at line 53, near "[]"
-STDERR> Error: Object creation Failure
-STDERR>
-STDOUT>
-
-(3 rows)
---
--- Cleanup) Restore normal formatting options
---
-\pset format aligned

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/test/regress/pg_regress.c
----------------------------------------------------------------------
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index bb2c94d..b222a0b 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -526,10 +526,6 @@ convert_sourcefiles(void)
 	ret = stat("output", &st);
 	if (ret == 0 && S_ISDIR(st.st_mode))
 		convert_sourcefiles_in("output", "expected", "out");
-
-	ret = stat("mapred", &st);
-	if (ret == 0 && S_ISDIR(st.st_mode))
-		convert_sourcefiles_in("mapred", "yml", "yml");
 }
 
 /*

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/test/regress/sql/.gitignore
----------------------------------------------------------------------
diff --git a/src/test/regress/sql/.gitignore b/src/test/regress/sql/.gitignore
index debb73d..28218be 100644
--- a/src/test/regress/sql/.gitignore
+++ b/src/test/regress/sql/.gitignore
@@ -34,7 +34,6 @@ create_function_2.sql
 aocs.sql
 appendonly.sql
 bkup_bkupdb.sql
-mapred.sql
 ereport.sql
 orafunk.sql
 tidycat.sql

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/tools/pgindent/typedefs.list
----------------------------------------------------------------------
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index 3fed79b..d31b74e 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -1303,27 +1303,6 @@ LWLockId
 LWLockMode
 LWLockPadded
 macaddr
-mapred_adt_t
-mapred_clist_t
-mapred_document_t
-mapred_format_t
-mapred_function_t
-mapred_input_kind_t
-mapred_input_t
-mapred_kind_t
-mapred_mode_t
-mapred_object_t
-mapred_olist_t
-mapred_output_kind_t
-mapred_output_mode_t
-mapred_output_t
-mapred_parser_context_t
-mapred_parser_state_t
-mapred_parser_t
-mapred_plist_t
-mapred_reducer_t
-mapred_reference_t
-mapred_task_t
 marker_t
 MatchedItemPtr
 Material

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/tools/demo/gpmapreduce/1_grep.yml
----------------------------------------------------------------------
diff --git a/tools/demo/gpmapreduce/1_grep.yml b/tools/demo/gpmapreduce/1_grep.yml
deleted file mode 100644
index 29cf974..0000000
--- a/tools/demo/gpmapreduce/1_grep.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-%YAML 1.1
----
-VERSION:         1.0.0.1
-
-DEFINE:
-  - INPUT:
-      NAME:      access_logs
-      FILE:
-         # change seghostname1, seghostname2 and file_path to reflect
-         # your runtime file locations
-         - seghostname1:/file_path/access_log
-         - seghostname2:/file_path/access_log2
-         
-  - MAP:
-      NAME:      grep_map
-      LANGUAGE:  perl
-      FUNCTION:  |
-        # 0: name the input parameters
-        my ($key, $value) = @_;
-        
-        # 1: extract the URL portion of the access log
-        $value =~ /"GET (.*) HTTP/;
-        my $url = $1;
-        
-        return [{"key" => $key, "value" => $value}] if ($value =~/$key/);
-        return [];
-      
-EXECUTE:
-  - RUN:
-      SOURCE:    access_logs
-      MAP:       grep_map
-      REDUCE:    IDENTITY
-
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/tools/demo/gpmapreduce/2_wordcount.yml
----------------------------------------------------------------------
diff --git a/tools/demo/gpmapreduce/2_wordcount.yml b/tools/demo/gpmapreduce/2_wordcount.yml
deleted file mode 100644
index 2d136ab..0000000
--- a/tools/demo/gpmapreduce/2_wordcount.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-%YAML 1.1
----
-VERSION:         1.0.0.1
-
-DEFINE:
-  - INPUT:
-      NAME:      book
-      FILE:
-        # change seghostname and file_path to reflect your 
-        # runtime file location
-        - seghostname:/file_path/whitepaper.txt
-
-  - MAP:
-      NAME:      wordsplit_python
-      FUNCTION:  |
-        for word in value.split():
-          yield [word, 1]
-      LANGUAGE:   python
-      OPTIMIZE:   STRICT IMMUTABLE
-      PARAMETERS: value text
-      RETURNS:
-        - key text
-        - value integer
-        
-EXECUTE:
-  - RUN:
-      SOURCE:    book
-      MAP:       wordsplit_python
-      REDUCE:    SUM
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/tools/demo/gpmapreduce/README
----------------------------------------------------------------------
diff --git a/tools/demo/gpmapreduce/README b/tools/demo/gpmapreduce/README
deleted file mode 100644
index af41045..0000000
--- a/tools/demo/gpmapreduce/README
+++ /dev/null
@@ -1,131 +0,0 @@
-**************************************************************************
-ABOUT THE GREENPLUM MAPREDUCE DEMOS
-**************************************************************************
-
-This package contains two example programs of Greenplum MapReduce:
-
-1. Grep - This Greenplum MapReduce program searches through web access 
-          log files and extracts the URL portion of the log.
-       
-          Specification File: 1_grep.yml
-          Data Files: access_log, access_log2
-          Outputs To: STDOUT
-
-2. Word Count - This Greenplum MapReduce program goes through a text 
-                document and counts the distinct words found.
-
-                Specification File: 2_wordcount.yml
-                Data Files: whitepaper.txt
-                Outputs To: STDOUT
-
-
- 
-**************************************************************************
-BEFORE YOU BEGIN
-**************************************************************************
-
-1. You must be a Greenplum Database superuser (such as gpadmin) to run 
-   the MapReduce demos.
-
-
-2. Create a database to use for the Greenplum MapReduce demos:
-
-    $ createdb gpmrdemo
-
-3. In this database, create the procedural languages used by the demos:
-
-    $ psql gpmrdemo -c 'CREATE LANGUAGE plpythonu;'
-
-
-NOTE: If the CREATE LANGUAGE command does not succeed because a
-      library (.so file) could not be found, you will need to make
-      sure that all hosts in your Greenplum array have a shared 
-      Perl and Python installation. You must also make sure the
-      Perl and Python libraries are findable by your runtime linker
-      on all hosts in your Greenplum Database array. Greenplum
-      provides installer packages for Perl and Python on 
-      https://emc.subscribenet.com  if you need them.
-
-
-4. On your segment hosts, create a location to put the Greenplum
-   MapReduce demo data files. If you are running multiple segment 
-   instances per segment host, you can create this location on just 
-   one of your segment hosts. For example:
-
-      $ gpssh -h seghost1 -e 'mkdir /home/gpadmin/gpmrdata'
-
-    If you are running with only segment instance per host, 
-    you will need to use two segment hosts:
-
-      $ $ gpssh -h seghost1 -h seghost2 -e 'mkdir /home/gpadmin/gpmrdata'
-
-
-
-
-**************************************************************************
-RUNNING DEMO 1: GREP
-**************************************************************************
-
-1. Copy the data files for this demo to the demo data location on your 
-   segment hosts. For example:
-
-    $ gpscp -h seghost1 -h seghost2 data/accesslog data/accesslog2 =:/home/gpadmin/gpmrdata
-
-
-2. Edit the 1_grep.yml file and change the <seghostname1>, <seghostname2>, 
-   and <file_path> place holders to reflect the actual location of the 
-   data files. For example:
-
-     FILE:
-        - myseghost1:/home/gpadmin/gpmrdata/access_log
-        - myseghost2:/home/gpadmin/gpmrdata/access_log2 
-
-3. Execute the 1_grep.yml Greenplum MapReduce job:
-
-    $ gpmapreduce -f 1_grep.yml gpmrdemo
-
-4. The program should return 47 output rows.
-
-
-**************************************************************************
-RUNNING DEMO 2: WORD COUNT
-**************************************************************************
-
-1. Copy the data file for this demo to the demo data location on a segment 
-   host. For example:
-
-    $ scp data/whitepaper.txt myseghost1:/home/gpadmin/gpmrdata
-
-
-2. Edit the 2_wordcount.yml file and change the <seghostname> and 
-   <file_path> place holders to reflect the actual location of the 
-   data file. For example:
-
-     FILE:
-        - myseghost1:/home/gpadmin/gpmrdata/whitepaper.txt 
-
-3. Execute the 2_wordcount.yml Greenplum MapReduce job:
-
-    $ gpmapreduce -f 2_wordcount.yml gpmrdemo | more
-
-4. The program should return 1488 output rows.
-
-
-**************************************************************************
-DEMO CLEANUP
-**************************************************************************
-
-After you have run the demos, run the following commands to clean up:
-
-1. Remove the demo data on the segment hosts:
-
-    $ gpssh -h seghost1 -h seghost2 -e 'rm /home/gpadmin/gpmrdata'
-
-2. Drop the demo database:
-
-     $ dropdb gpmrdemo
-
-
-
-
-                                   

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/tools/demo/gpmapreduce/data/access_log
----------------------------------------------------------------------
diff --git a/tools/demo/gpmapreduce/data/access_log b/tools/demo/gpmapreduce/data/access_log
deleted file mode 100644
index 6e57876..0000000
--- a/tools/demo/gpmapreduce/data/access_log
+++ /dev/null
@@ -1,27 +0,0 @@
-10.254.0.52 - - [28/Aug/2008:16:52:13 -0700] "GET / HTTP/1.1" 200 1456
-10.254.0.52 - - [28/Aug/2008:16:52:13 -0700] "GET /apache_pb.gif HTTP/1.1" 200 2326
-10.254.0.52 - - [28/Aug/2008:16:52:13 -0700] "GET /favicon.ico HTTP/1.1" 404 209
-10.254.0.52 - - [28/Aug/2008:16:52:16 -0700] "GET /favicon.ico HTTP/1.1" 404 209
-10.254.0.52 - - [28/Aug/2008:16:52:21 -0700] "GET /~mapreduce HTTP/1.1" 301 236
-10.254.0.52 - - [28/Aug/2008:16:52:21 -0700] "GET /~mapreduce/ HTTP/1.1" 200 2657
-10.254.0.52 - - [28/Aug/2008:16:52:21 -0700] "GET /~mapreduce/images/gradient.jpg HTTP/1.1" 200 16624
-10.254.0.52 - - [28/Aug/2008:16:52:27 -0700] "GET /manual/ HTTP/1.1" 200 7559
-10.254.0.52 - - [28/Aug/2008:16:52:27 -0700] "GET /manual/style/css/manual.css HTTP/1.1" 200 18674
-10.254.0.52 - - [28/Aug/2008:16:52:27 -0700] "GET /manual/style/css/manual-print.css HTTP/1.1" 200 13200
-10.254.0.52 - - [28/Aug/2008:16:52:27 -0700] "GET /manual/style/css/manual-loose-100pc.css HTTP/1.1" 200 3065
-10.254.0.52 - - [28/Aug/2008:16:52:28 -0700] "GET /manual/images/favicon.ico HTTP/1.1" 200 1078
-10.254.0.52 - - [28/Aug/2008:16:52:29 -0700] "GET /manual/images/feather.gif HTTP/1.1" 200 6471
-10.254.0.52 - - [28/Aug/2008:16:52:29 -0700] "GET /manual/images/left.gif HTTP/1.1" 200 60
-10.254.0.52 - - [28/Aug/2008:16:52:31 -0700] "GET /manual/caching.html HTTP/1.1" 200 38651
-10.254.0.52 - - [28/Aug/2008:16:52:31 -0700] "GET /manual/images/down.gif HTTP/1.1" 200 56
-10.254.0.52 - - [28/Aug/2008:16:52:31 -0700] "GET /manual/images/up.gif HTTP/1.1" 200 57
-10.254.0.52 - - [28/Aug/2008:16:52:31 -0700] "GET /manual/images/caching_fig1.gif HTTP/1.1" 200 16515
-10.254.0.52 - - [28/Aug/2008:16:52:34 -0700] "GET /manual/platform/netware.html HTTP/1.1" 200 30591
-10.254.0.52 - - [28/Aug/2008:16:52:38 -0700] "GET /manual/mod/quickreference.html HTTP/1.1" 200 105453
-10.254.0.52 - - [28/Aug/2008:16:52:43 -0700] "GET /~mapreduce/demo HTTP/1.1" 403 215
-10.254.0.52 - - [28/Aug/2008:16:53:19 -0700] "GET /~mapreduce/demo/ HTTP/1.1" 200 2072
-10.254.0.52 - - [28/Aug/2008:16:53:19 -0700] "GET /icons/blank.gif HTTP/1.1" 200 148
-10.254.0.52 - - [28/Aug/2008:16:53:19 -0700] "GET /icons/folder.gif HTTP/1.1" 200 225
-10.254.0.52 - - [28/Aug/2008:16:53:19 -0700] "GET /icons/unknown.gif HTTP/1.1" 200 245
-10.254.0.52 - - [28/Aug/2008:16:53:19 -0700] "GET /icons/back.gif HTTP/1.1" 200 216
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/tools/demo/gpmapreduce/data/access_log2
----------------------------------------------------------------------
diff --git a/tools/demo/gpmapreduce/data/access_log2 b/tools/demo/gpmapreduce/data/access_log2
deleted file mode 100644
index 10bbacd..0000000
--- a/tools/demo/gpmapreduce/data/access_log2
+++ /dev/null
@@ -1,20 +0,0 @@
-10.254.0.52 - - [28/Aug/2008:16:53:22 -0700] "GET /~mapreduce/demo/1_grep.yml HTTP/1.1" 200 700
-10.254.0.52 - - [28/Aug/2008:16:53:25 -0700] "GET /~mapreduce/demo/2_wordcount.yml HTTP/1.1" 200 571
-10.254.0.52 - - [28/Aug/2008:16:53:28 -0700] "GET /~mapreduce/demo/3_wordcount_stem.yml HTTP/1.1" 200 1502
-10.254.0.52 - - [28/Aug/2008:16:53:30 -0700] "GET /~mapreduce/demo/4_join.yml HTTP/1.1" 200 2342
-10.254.0.52 - - [28/Aug/2008:16:53:32 -0700] "GET /~mapreduce/demo/5_keyword_match.yml HTTP/1.1" 200 4424
-10.254.0.52 - - [28/Aug/2008:16:53:35 -0700] "GET /~mapreduce/demo/wordcount_stem.out HTTP/1.1" 200 1205
-10.254.0.52 - - [28/Aug/2008:16:53:38 -0700] "GET /~mapreduce/demo/?C=M;O=A HTTP/1.1" 200 2072
-10.254.0.52 - - [28/Aug/2008:16:53:40 -0700] "GET /~mapreduce/demo/?C=D;O=A HTTP/1.1" 200 2072
-10.254.0.52 - - [28/Aug/2008:16:53:40 -0700] "GET /~mapreduce/demo/?C=S;O=A HTTP/1.1" 200 2072
-10.254.0.52 - - [28/Aug/2008:16:53:42 -0700] "GET /~mapreduce/demo/?C=N;O=A HTTP/1.1" 200 2072
-10.254.0.52 - - [28/Aug/2008:16:53:44 -0700] "GET /~mapreduce/demo/data/ HTTP/1.1" 200 1262
-10.254.0.52 - - [28/Aug/2008:16:53:45 -0700] "GET /~mapreduce/demo/data/?C=M;O=A HTTP/1.1" 200 1262
-10.254.0.52 - - [28/Aug/2008:16:53:46 -0700] "GET /~mapreduce/demo/data/?C=D;O=A HTTP/1.1" 200 1262
-10.254.0.52 - - [28/Aug/2008:16:53:48 -0700] "GET /~mapreduce/demo/data/email/ HTTP/1.1" 200 1668
-10.254.0.52 - - [28/Aug/2008:16:53:48 -0700] "GET /icons/text.gif HTTP/1.1" 200 229
-10.254.0.52 - - [28/Aug/2008:16:53:49 -0700] "GET /~mapreduce/demo/data/email/?C=N;O=D HTTP/1.1" 200 1668
-10.254.0.52 - - [28/Aug/2008:16:53:54 -0700] "GET /~mapreduce/demo/data/email/mailfiles HTTP/1.1" 200 330
-10.254.0.52 - - [28/Aug/2008:17:20:30 -0700] "GET /~mapreduce/ HTTP/1.1" 304 -
-10.254.0.52 - - [28/Aug/2008:17:20:33 -0700] "GET /~mapreduce/demo HTTP/1.1" 301 241
-10.254.0.52 - - [28/Aug/2008:17:20:33 -0700] "GET /~mapreduce/demo/ HTTP/1.1" 200 2072

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/tools/demo/gpmapreduce/data/whitepaper.txt
----------------------------------------------------------------------
diff --git a/tools/demo/gpmapreduce/data/whitepaper.txt b/tools/demo/gpmapreduce/data/whitepaper.txt
deleted file mode 100644
index 3deae71..0000000
--- a/tools/demo/gpmapreduce/data/whitepaper.txt
+++ /dev/null
@@ -1,448 +0,0 @@
-Introduction 
-
-In 2004, Google published a research paper on the MapReduce 
-framework they developed for their internal data processing 
-needs.  In simple, approachable terms, the paper describes how 
-Google developers harness massively parallel clusters of computers 
-to analyze some of the largest datasets ever collected. 
-Since that paper was published, there has been ongoing discussion 
-about the role of this technology outside the walls of Google. 
-Excitement about MapReduce has spread quickly in the computing 
-industry, particularly in young and forward-looking firms.  But 
-there is confusion and controversy about how the technology fits 
-into the larger ecosystem of information technology, especially 
-with respect to other "big data" solutions like massively parallel 
-SQL database engines.  
-
-In this whitepaper, we provide a technical context for that discussion.  
-In a nutshell, we present SQL and MapReduce as two different 
-programming paradigms that are implemented via a common 
-engine architecture: parallel dataflow.  Seen in these terms, 
-MapReduce can be viewed as a new programming interface to 
-traditional data-parallel computing. 
-
-After presenting this context, we introduce Greenplum MapReduce: 
-a seamless integration of MapReduce and relational database 
-functionality unified in one massively parallel dataflow engine.   
-We describe how Greenplum allows MapReduce programs and 
-SQL to interoperate, efficiently and flexibly processing data in  
-both standard files and database tables. 
-
-History: Three Revolutions 
-
-To understand Greenplum’s MapReduce implementation, it is 
-helpful to see it in the context of three historical shifts in the 
-technology behind large-scale data management: the Relational 
-Database revolution, the rise of shared-nothing parallelism, and 
-the popularization of the MapReduce parallel programming paradigm. 
-
-Relational Database Systems (RDBMSs) were a radical idea when they 
-were introduced, and they revolutionized the way that enterprises 
-manage their records. The birth of relational technology in research 
-is well documented.  In 1970, IBM researcher Ted Codd published his 
-first paper on the relational model of data [Codd70], which proposed 
-representing data in tables of rows and columns, and querying the 
-data using a high-level declarative language that formed the foundation 
-for what we now know as SQL.  Some 5 years later, Jim Gray and 
-colleagues at IBM research proposed ACID transactions as a model for 
-correctness of concurrent updates in a database [Gray78].  Codd and 
-Gray both received the Turing award (the "Nobel prize of computer 
-science") for this work.  By the mid-1970’s, researchers at IBM and UC 
-Berkeley were hard at work on the two key prototype systems – System 
-R and Ingres –  that gave birth to the modern relational database  
-industry.  Both of these systems developed query optimizer technology 
-that compiles declarative queries and passes the result to a dataflow 
-processing engine, which direct streams of data through operations 
-like filters, index lookups, joins, grouping and aggregation. 
-
-Relational databases remain the workhorses of modern record keeping 
-30 years later, and for good reason.  Modern implementations of ACID 
-transactions ensure dependable, consistent management of data 
-storage.   The declarative nature of SQL enables data analysis via ad 
-hoc queries, and ensures that data-centric applications continue to 
-work correctly even as data layouts and database hardware evolves.  
-Beneath all this, the simple elegance of the relational model helps 
-provide discipline needed for sound, long-term database design. 
-
-"Shared Nothing" Parallelism (1980’s-present) 
-
-As relational database systems were becoming a commercial reality 
-in the 1980’s, efforts were afoot to accelerate database performance 
-via custom hardware known then as "database machines".  However, 
-it quickly became clear that economies of scale favored commodity 
-hardware over custom solutions: the latest version of a commodity 
-computer invariably provides a better price/performance point than 
-last year’s custom-designed machine, negating the performance 
-benefits of customization.  As a result, the main early efforts toward 
-database machines were deemed a failure by the researchers and 
-entrepreneurs who pioneered the area [BoralDeWitt83]. 
-
-Out of the ashes of the work on database machines, a new idea rose: 
-database software could be parallelized to leverage multiple commodity 
-processors in a network to deliver increased scalability and performance.  
-The failed history of custom database machines led to a particular  
-interest in building parallel databases using commodity computers.  
-The term "shared-nothing" parallelism was coined for these computing 
-clusters, to distinguish them from the shared-memory multiprocessors 
-that were being designed at the time for scientific applications. 
-
-In order to harness the power of a cluster, query processing software 
-had to evolve to take advantage of multiple disks, processors, and 
-network links operating in parallel.  To achieve this, the rows of a table 
-were partitioned across multiple machines with separate disks,  
-enabling parallel I/O scans of big tables.  Basic relational query operators 
-like selection, join, grouping and aggregation were reinvented to run 
-in parallel via similar partitioning schemes: the operations undertaken 
-by each node in the cluster are the same, but the data being pumped 
-through the fabric is automatically partitioned to allow each node to 
-work on its piece of the operator independently.  Finally, these  
-architectures allowed multiple relational operators to operate at the  
-same time, allowing pipeline parallelism in which an operator producing 
-a data stream runs in parallel with the operator consuming it.  The 
-resulting shared-nothing parallel RDBMSs were explored in research 
-prototypes like Gamma and Bubba, and commercialized early on by 
-Teradata and Tandem.  
-
-Shared-nothing architectures enabled relational databases to scale 
-to unprecedented levels.  This changed the way that many businesses 
-approached the value of data: in addition to keeping the current books 
-correct, analytic applications could be built over historical records to 
-provide new business efficiencies.  In the 1990’s, WalMart famously 
-utilized parallel databases to gain radical efficiencies in supply chain 
-management via item-level inventory and historical sales information.  
-In recent years, virtually every sizable enterprise has realized the 
-importance of scalable solutions for data warehousing and analytics. 
-
-Parallel Programming with MapReduce (2000-present) 
-
-In the last decade, the importance of shared-nothing clusters was 
-rediscovered in the design of web services like search engine 
-infrastructure and messaging [Brewer01].  However, the implementation 
-of those early web services was done by small teams of expert  
-developers, much as the early parallel database systems were built. 
-In this context, Google was differentiating itself as a company by 
-developing a data-driven culture, in which employees are explicitly 
-encouraged to (a) develop innovative solutions by analyzing the 
-company’s data assets, and (b) gain project approval from colleagues 
-by using data analysis to overcome "conventional wisdom" and other 
-institutional arguments against innovation [Kaushik06]. The growth 
-of Google’s data-driven culture was facilitated by getting the right  
-analytic tools into the hands of employees: tools that could allow  
-software developers to conveniently explore and analyze some of  
-the largest data sets ever assembled. 
-
-The key tools that Google built for their developers were the MapReduce 
-programming paradigm, and a proprietary runtime engine for internal 
-use at Google [DeanGhemawat08]. At heart, MapReduce is a very 
-simple dataflow programming model that passes data items through 
-simple user-written code fragments.  Google’s MapReduce programs 
-start with a large datafile that is broken into contiguous pieces called 
-"splits".  Each split is converted via user-defined parsing code into 
-(key, value) pairs that are sent to a Map module, which invokes a user- 
-supplied Map function on each pair, producing a new key and list of 
-output values.  Each (key, output_list) pair is passed to a Reduce  
-module (possibly on another machine) that gathers them together,  
-assembles them into groups by key, and then calls a user-supplied  
-Reduce function to produce one reduced output list per group of 
-mapped (key, output_list) pairs.  Both the Map and Reduce modules 
-utilize partition parallelism to enable many Map tasks (and many  
-Reduce tasks) to run in parallel. 
-
-MapReduce has become very popular within Google for everything 
-from the construction of their core web index, to simple programs 
-written by a single developer in a half hour [DeanGhemawat08]1 .  The 
-MapReduce programming model has become available to programmers 
-outside of Google as well, via the Hadoop open-source runtime. 
-MapReduce is particularly attractive to developers for two main reasons:
- 
-• Data accessibility: Data is accessed from standard files, with no 
-need for a priori definition of schemas or file formats, and no 
-need to configure and load a database before getting answers.  
-This allows developers to "wrangle" any file format that they 
-have at hand; at a company like Google this includes web crawls 
-(HTML), term occurrence data, clickstream logs, and advertising 
-revenue history.  The focus on standard files also means that  
-developers can typically get work done without requesting permission 
-from the "Keepers of the Data" that guard traditional IT shops. 
-
-• Language Familiarity: Most of the MapReduce programmer’s  
-work is done in familiar programming languages used by  
-developers: Google’s MapReduce uses C++, and Hadoop uses 
-Java.  This exposes massive data parallelism to developers within 
-the context of their familiar development environment: editors, 
-debuggers, and so on.  By contrast, relatively few developers 
-work with data-centric languages like SQL on a daily basis, and 
-SQL experts tend to inhabit a different ecosystem (training, job 
-title) than typical software developers. 
-
-Technical common ground: Parallel Dataflow 
-
-The MapReduce revolution is so recent that the dust has yet to  
-settle on the new regime – there is still plenty of debate about how 
-MapReduce and parallel RDBMSs fit together in a data-centric  
-organization. Some database leaders have argued publicly that the 
-MapReduce phenomenon is not a technical revolution at all – they 
-characterize it as a reinvention of well-known parallel database 
-techniques that is missing key database functionality (ACID storage, 
-indexes, query optimization, etc.) 
-
-
-[DeWittStonebraker08].  The MapReduce proponents argue that they 
-neither need nor want a heavyweight database for many tasks, and 
-they have no interest in coding in SQL.  From their standpoint, 
-MapReduce has revolutionized the developer ecosystem, providing 
-them with easy access to parallelism over their own data, in their own 
-language framework.  
-
-Both these arguments have merit.  But the disconnect between these 
-viewpoints can lead to inefficiencies and confusion in an organization 
-trying to instill a broad data-driven culture.  Consider what happens 
-if the traditionally cautious IT department requires the use of a full 
-RDBMS feature stack, and the maverick developers focus on the light- 
-weight and programmer-friendly MapReduce framework.  Data assets 
-get partitioned across teams, as do in-house program for data analysis.  
-Worse, two separate data cultures evolve within the organization, 
-leading to destructive "data ownership" politics, and arguments over 
-tools rather than solutions. 
-
-Despite the differences in programming interfaces and software 
-philosophy, RDBMSs and MapReduce engines both are brought alive 
-by the same "beating heart": a massively parallel dataflow engine, 
-pumping data across a parallel network mesh, through high-performance 
-bulk operations (join, map, reduce, etc.). Is it possible to take that core 
-dataflow component, and provide interfaces for both ecosystems? 
-In principle, this should be entirely natural. The main barriers come 
-from software engineering realities.  The tried-and-true parallel RDBMS 
-engines were built in the 1980’s and 90’s with the dataflow engine 
-embedded deep into the relational codebase.  It is a tall order to 
-extract the "beating heart" from those systems for reuse elsewhere.  
-By contrast, MapReduce implementations like Hadoop provide none 
-of the key features required of a DBMS.  They have a lot of "heart", but 
-the body-building required to replicate a full-featured RDBMS would 
-take years. 
-
-Greenplum enters this arena from a unique direction.  Greenplum 
-began in the "heart transplant" business: its core technology effort 
-was to take PostgreSQL, the best-of-breed open-source RDBMS, and 
-insert a massively parallel dataflow engine into its core.  Based on 
-that success, Greenplum is now able to offer the first commercial  
-implementation of MapReduce, built on that same core parallel  
-technology.  Because Greenplum’s RDBMS and MapReduce share  
-the same core engine, they are uniquely interoperable. 
-
-Introducing Greenplum MapReduce 
-
-Greenplum MapReduce provides a convenient, easy-to-program  
-platform for massive data-parallelism. It implements a harness for  
-parallel Map and Reduce functions, along with flexible data access  
-to files, database records, and system services. 
-
-Greenplum allows developers to write Map and Reduce functions in 
-a variety of popular scripting languages: the list currently includes 
-Python and Perl.  Support for these popular languages includes access 
-to entire ecosystems of open-source packages via the Python Package 
-Index (PyPi) and the Comprehensive Perl Archive Network (CPAN).  This 
-includes a host of features not usually found in an RDBMS: free-text 
-analysis, statistical toolkits, graph algorithms, HTML and XML parsing, 
-web connectivity (SOAP, REST, HTTP), and many more. 
-
-In terms of data access, Greenplum MapReduce provides developers 
-with the familiar flexibility to access their data "where it lives": in files, 
-websites, or even via arbitrary operating system commands.  Greenplum 
-provides this data without any of the overheads that developers often 
-associate with traditional RDBMSs: no locking, logging or distributed 
-"commit" protocols.  On the other hand, for data that does need to 
-be protected by a full-featured RDBMS, Greenplum MapReduce offers 
-efficient native access to database records: it pushes MapReduce 
-programs down into Greenplum’s parallel database engine, without 
-the cost of going "out-of-box" to get data from a separate DBMS over 
-narrow client interfaces. 
-
-The Power of Synergy 
-
-Greenplum is unique in offering a commercial-grade implementation 
-of MapReduce, providing a robust implementation of the open interfaces 
-that enable and encourage developers to work with massive data sets. 
-But the biggest advantage of Greenplum’s implementation comes 
-from its shared technology core, which unifies MapReduce and RDBMS 
-functionality within a single parallel dataflow engine. 
-
- This unique architecture allows developers to mix and match data 
-sources and programming styles.  Greenplum’s solution is also able to 
-make MapReduce programs visible to SQL queries and vice-versa.  This 
-set of features enables a number of natural design patterns that are 
-unique to Greenplum: 
-
-• MapReduce programs over high-performance database tables. 
-Access to database data is trivial in Greenplum MapReduce: the 
-MapReduce program simply specifies the database table name 
-as its input.  Because Greenplum database tables are partitioned 
-across multiple machines, the initial Map phase is executed in 
-the database engine directly on the local partition, providing fully 
-parallel I/O with computation "pushed" to the data. By contrast, 
-a standalone MapReduce engine would require the programmer 
-to write data access routines into their MapReduce script.  That 
-extra programmer code would then access a remote database 
-server via a connectivity protocol like JDBC, and pull the database 
-records over to Map workers. 
-
-• SQL over external data sources.  Greenplum’s "External Table" 
-facility allows files and data-producing programs to be registered 
-as read-only tables in the database, and queried in SQL along- 
-side database tables.  External data is accessed and converted to 
-records on the fly during query processing.  Because these external  
-tables can be stored or generated on an arbitrary number of 
-nodes in the cluster, data access and conversion is a massively 
-parallel process.  
-
-• Durable storage of MapReduce outputs.  Many MapReduce  
-programs run for hours, and provide important analytic results.  
-Like standalone MapReduce implementations, Greenplum can 
-store these results in a filesystem.  But it is equally easy to store 
-the results of Greenplum MapReduce in a Greenplum database, 
-with full ACID durability guarantees, and the option to subsequently 
-analyze those outputs via Business Intelligence tools, SQL queries, 
-and other enterprise analytic software designed for databases.  
-Again, because the MapReduce code runs in the same engine 
-as the database, writing of output tables is fully parallelized and 
-requires no remote connectivity overheads. 
-
-• Rich integration of MapReduce and SQL code.  Greenplum’s 
-unique architecture removes barriers between code written in the 
-MapReduce framework, and code written in SQL. Because  
-Greenplum MapReduce scripts can be configured to flexibly  
-access the database, they can use arbitrary SQL queries as input.  
-In the other direction, Greenplum MapReduce scripts can be 
-registered as "views" in the database, and used as virtual tables 
-within SQL statements: the MapReduce job is run on the fly as 
-part of the SQL query processing, and its outputs are pipelined 
-directly into the relational query plan. Greenplum’s engine executes 
-all code – SQL, Map functions, Reduce functions – on the same 
-cluster of machines where the database is stored.  This integration 
- allows SQL and MapReduce developers to share code freely with- 
-out performance penalties or the need to work with "adapter"  
-software.  This flexibility removes the overhead of cultural and 
-political debates about the "right" programming framework 
-within an organization. 
-
-MapReduce in Use 
-
-MapReduce supports simple, easy-to-program dataflows: a single  
-data source piped into a chain of customizable Map and Reduce  
-operators.  As a result, MapReduce is especially well suited for  
-parallelizing custom tasks over a single dataset. 
-Data extraction and transformation tasks fit this model well.  Consider 
-the example of an e-commerce website with free-text descriptions of 
-products.  As a first phase in categorizing products, we would like to 
-automatically extract keywords from the HTML description text for each 
-product.  That is, we want to convert each free text description into a 
-set of pairs of the form (productID, keyword).   
-
- MapReduce makes this easy.  We configure it to route product pages 
-(which may be in files, a database, or even on the Web) to a cluster of 
-Greenplum servers, each running a Python Map operator.  The Python 
-Map code on each node repeatedly gets a product page, splits the 
-product description text into a list of potential keywords, and then 
-loops through the resulting list and outputs(productID, keyword) 
-pairs2.   These can be routed to Python Reduce operators running on 
-the cluster, which can gather up and count these pairs to produce 
-outputs of the form (productID, keyword, occurrences), where the last 
-field captures the number of times each keyword occurs in each product 
-description. This output can be stored in a database table for use in 
-subsequent tasks.  For example, using this table, products can be 
-"auto-categorized" by a simple SQL query that joins the MapReduce 
-output with a table of keywords and product categories. 
-
-As a very different example, the New York Times used a simple MapReduce 
-program to convert years of scanned newspaper articles into digital 
-text. The approach is to use parallel dataflow to "kick off" parallel 
-computation.  To do this in Greenplum, a list of image filenames can 
-be piped into a cluster of Greenplum Map operators written in Perl.  
-Each Map operator uses Perl’s system command to execute an Optical 
-Character Recognition program (e.g. the open source Tesseract tool) 
-to convert the image file into text.  No Reduce phase is required; the 
-results of the OCR program can be written to text files, or loaded as 
-text fields into a database table. 
-
-Both of these examples do information extraction, transformation and 
-loading, often called ETL in the data warehousing business.  Some 
-database engines advertise the ability to do ELT: loading the data into 
-the database before transforming it, to allow subsequent transformations 
-to run in SQL. Greenplum’s flexibility makes the reordering of the "L" 
-phase completely fluid: data can be stored inside or outside the  
-database, and accessed in either case by massively parallel code  
-written in either MapReduce or SQL.   So Greenplum easily enables  
-either ETL or ELT, along with options like ET (in which the data is always 
-stored outside the database) and LET (in which the raw form of the  
-information is stored in the database.)  This is the kind of flexibility 
-that comes from decoupling the parallel dataflow engine, allowing it  
-to interoperate with various storage and language interfaces. 
-
- An important detail in handling free text is to canonicalize multiple forms of the same 
-word: e.g. "driver", "drivers", and "driving" should all be converted to "drive" so they 
-will match. Because Greenplum MapReduce provides access to Perl and Python’s 
-open-source libraries, we can use Python’s nltk toolkit for Natural Language Processing 
-to do this task – a two-line addition to the basic Map program sketched above. 
-
-The previous examples focused on data extraction and transformation,  
-but MapReduce is also useful for deeper data mining and analytics.   
-Many companies employ experts in statistics and finance, who 
-increasingly want to run complex mathematical models over large 
-volumes of data. Recently, there have been a number of tutorials and 
-papers on easily implementing popular data mining techniques in 
-parallel using MapReduce [KimballMichelsBisciglia07, ChuEtAl06].  A 
-variety of sophisticated data mining and machine learning algorithms 
-have been expressed in this framework, including popular techniques 
-for classification, clustering, regression, and dimensionality reduction.  
-And in the Greenplum context, these algorithms can be flexibly combined 
-with SQL and run over both database tables and files. 
-
-Conclusion 
-
-MapReduce and SQL are two useful interfaces that enable software 
-developers to take advantage of parallel processing over big data sets.  
-Until recently, SQL was targeted at enterprise application programmers 
-accessing transactional records, and MapReduce was targeted at more 
-general software developers manipulating files.  This distinction was 
-mostly an artifact of the limitations of systems in the marketplace,  
-but has led to significant confusion and slowed the adoption of 
-MapReduce as a programming model in traditional data-rich settings 
-in the business world. 
-Greenplum’s technical core competency is parallel data technology. 
-By applying that expertise to both MapReduce and SQL programs, 
-Greenplum has changed the landscape for parallel data processing, 
-removing arbitrary barriers between programming styles and usage 
-scenarios.  The resulting Greenplum engine is a uniquely flexible and 
-scalable data processing system, allowing flexible combinations of 
-SQL and MapReduce, database tables and files. 
-
-References 
-
-[Codd70] E. F. Codd: A Relational Model of Data for Large Shared Data 
-Banks. Commun. ACM 13(6): 377-387 (1970) 
-[Gray78] Jim Gray: Notes on Data Base Operating Systems. In Michael 
-J. Flynn, et al. (Eds.): Operating Systems, An Advanced Course. Lecture 
-Notes in Computer Science 60. Springer, 1978: 393-481. 
-[BoralDeWitt83] Haran Boral, David J. DeWitt: Database Machines:  
-An Idea Whose Time Passed? A Critique of the Future of Database  
-Machines. International Workshop on Database Machines (IWDM) 
-1983: 166-187 
-[Brewer01] Eric A. Brewer: Lessons from Giant-Scale Services. IEEE 
-Internet Computing 5(4): 46-55 (2001) 
-[Kaushik06]  Avinash Kaushik. Web Analytics: An Hour a Day.  Sybex 
-Publishers, 2007. 
-[DeanGhemawat08] Jeffrey Dean, Sanjay Ghemawat: MapReduce:  
-simplified data processing on large clusters. Commun.  
-ACM 51(1): 107-113 (2008) 
-[DeWittStonebraker08]  David J. DeWitt and Michael Stonebraker.   
-MapReduce: A Major Step Backwards.  The Database Column  
-(weblog).  January 17, 2008. http://www.databasecolumn. 
-com/2008/01/mapreduce-a-major-step-back.html 
-[KimballMichelsBisciglia07] Aaron Kimball, Sierra Michels-Slettvet, 
-and Christophe Bisciglia. Cluster Computing and MapReduce. Google 
-Code University (website).  Summer, 2007. 
-[ChuEtAl06] Cheng-Tao Chu, Sang Kyun Kim, Yi-An Lin, YuanYuan Yu, 
-Gary Bradski, Andrew Ng, and Kunle Olukotun.  MapReduce for  
-Machine Learning on Multicore. Advances in Neural Information  
-Processing Systems (NIPS), December, 2006. 
-Revision 1. August 2008. 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/tools/doc/gpmapreduce_help
----------------------------------------------------------------------
diff --git a/tools/doc/gpmapreduce_help b/tools/doc/gpmapreduce_help
deleted file mode 100644
index be79f62..0000000
--- a/tools/doc/gpmapreduce_help
+++ /dev/null
@@ -1,144 +0,0 @@
-COMMAND NAME: gpmapreduce
-
-Runs Greenplum MapReduce jobs as defined in a YAML specification document.
-
-
-*****************************************************
-SYNOPSIS
-*****************************************************
-
-gpmapreduce -f <yaml_file> [<dbname> [<username>]]
-            [-k <name>=<value> | --key <name>=<value>] 
-            [-h <hostname> | --host <hostname>] 
-            [-p <port>| --port <port>] 
-            [-U <username> | --username <username>] [-W] [-v]
-
-gpmapreduce -V | --version
-
-gpmapreduce -h | --help
-
-gpmapreduce -x | --explain
-
-gpmapreduce -X | --explain-analyze
-
-
-*****************************************************
-PREREQUISITES
-*****************************************************
-
-The following are required prior to running this program:
-
-* You must have your MapReduce job defined in a YAML file.
-
-* You must be a Greenplum Database superuser to run MapReduce jobs 
-  written in untrusted Perl or Python.
-
-* You must be a Greenplum Database superuser to run MapReduce jobs 
-  with EXEC and FILE inputs.
-
-* Non-superuser roles must be granted external table permissions
-  using CREATE/ALTER ROLE in order to run MapReduce jobs. 
-  
-*****************************************************
-DESCRIPTION
-*****************************************************
-
-MapReduce is a programming model developed by Google for 
-processing and generating large data sets on an array of commodity 
-servers. Greenplum MapReduce allows programmers who are familiar 
-with the MapReduce paradigm to write map and reduce functions and 
-submit them to the Greenplum Database parallel engine for processing.
-
-In order for Greenplum to be able to process MapReduce functions, 
-the functions need to be defined in a YAML document, which is then 
-passed to the Greenplum MapReduce program, gpmapreduce, for execution 
-by the Greenplum Database parallel engine. The Greenplum system takes 
-care of the details of distributing the input data, executing the 
-program across a set of machines, handling machine failures, 
-and managing the required inter-machine communication.
-
-
-*****************************************************
-OPTIONS
-*****************************************************
-
-
--f <yaml_file>
-
-Required. The YAML file that contains the Greenplum MapReduce 
-job definitions. See the Greenplum Database Administrator Guide
-for more information about creating YAML documents.
-
-
--? | --help
-
-Show help, then exit.
-
-
--V | --version
-
-Show version information, then exit.
-
-
--v | --verbose
-
-Show verbose output.
-
-
--x | --explain
-
-Do not run MapReduce jobs, but produce explain plans.
-
-
--X | --explain-analyze
-
-Run MapReduce jobs and produce explain-analyze plans.
-
-
--k | --key <name>=<value>
-
-Sets a YAML variable.  A value is required. Defaults to �key� 
-if no variable name is specified. 
-
-
--h <host> | --host <host>
-
-Specifies the host name of the machine on which the Greenplum 
-master database server is running. If not specified, reads 
-from the environment variable PGHOST or defaults to localhost.
-
-
--p <port> | --port <port>
-
-Specifies the TCP port on which the Greenplum master database 
-server is listening for connections. If not specified, reads 
-from the environment variable PGPORT or defaults to 5432.
-
-
--U <username> | --username <username>
-
-The database role name to connect as. If not specified, reads 
-from the environment variable PGUSER or defaults to the 
-current system user name.
-
-
--W | --password
-
-Force a password prompt.
-
-
-*****************************************************
-EXAMPLES
-*****************************************************
-
-Run a MapReduce job as defined in my_yaml.txt:
-
-gpmapreduce -f my_yaml.txt
-
-
-*****************************************************
-SEE ALSO
-*****************************************************
-
-"Greenplum MapReduce YAML Specification" in the 
-Greenplum Database Administrator Guide


[16/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/src/mapred.c
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/src/mapred.c b/src/bin/gpmapreduce/src/mapred.c
deleted file mode 100644
index 2bf32ec..0000000
--- a/src/bin/gpmapreduce/src/mapred.c
+++ /dev/null
@@ -1,4041 +0,0 @@
-#include <mapred.h>
-#include <except.h>
-#include <mapred_errors.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <unistd.h>     /* for file "access" test */
-#include <errno.h>
-
-#define scalarfree(x)							\
-	do {										\
-		if (x) {								\
-			free(x);							\
-			x = NULL;							\
-		}										\
-	} while (0)
-
-
-/* instantiate the extern from mapred.h */
-const char *mapred_kind_name[MAPRED_MAXKIND+1] =
-{
-	"<NULL>",
-	"DOCUMENT",
-	"INPUT",
-	"OUTPUT",
-	"MAP",
-	"TRANSITION",
-	"CONSOLIDATE",
-	"FINALIZE",
-	"REDUCE",
-	"TASK",
-	"RUN",
-	"INTERNAL"
-};
-
-/* instantiate default parameter names from mapred.h */
-const char *default_parameter_names[MAPRED_MAXKIND+1][2] =
-{
-	{NULL, NULL},          /* MAPRED_NO_KIND */
-	{NULL, NULL},          /* MAPRED_DOCUMENT */
-	{NULL, NULL},          /* MAPRED_INPUT */
-	{NULL, NULL},          /* MAPRED_OUTPUT */
-	{"key", "value"},      /* MAPRED_MAPPER */
-	{"state", "value"},    /* MAPRED_TRANSITION */
-	{"state1", "state2"},  /* MAPRED_COMBINER */
-	{"state", NULL},       /* MAPRED_FINALIZER */
-	{NULL, NULL},          /* MAPRED_REDUCER */
-	{NULL, NULL},          /* MAPRED_TASK */
-	{NULL, NULL},          /* MAPRED_EXECUTION */
-	{NULL, NULL}           /* MAPRED_ADT */
-};
-
-/* instantiate default parameter names from mapred.h */
-const char *default_return_names[MAPRED_MAXKIND+1][2] =
-{
-	{NULL, NULL},          /* MAPRED_NO_KIND */
-	{NULL, NULL},          /* MAPRED_DOCUMENT */
-	{NULL, NULL},          /* MAPRED_INPUT */
-	{NULL, NULL},          /* MAPRED_OUTPUT */
-	{"key", "value"},      /* MAPRED_MAPPER */
-	{"value", NULL},       /* MAPRED_TRANSITION */
-	{"value", NULL},       /* MAPRED_COMBINER */
-	{"value", NULL},       /* MAPRED_FINALIZER */
-	{NULL, NULL},          /* MAPRED_REDUCER */
-	{NULL, NULL},          /* MAPRED_TASK */
-	{NULL, NULL},          /* MAPRED_EXECUTION */
-	{NULL, NULL}           /* MAPRED_ADT */
-};
-
-
-/* 
- * libpq Errors that we care about
- * (would be better to add <errcodes.h> to the include path)
- */
-const char *IN_FAILED_SQL_TRANSACTION = "25P02";
-const char *OBJ_DOES_NOT_EXIST        = "42P01";
-const char *SCHEMA_DOES_NOT_EXIST     = "3F000";
-
-const char *DISTRIBUTION_NOTICE = "NOTICE:  Table doesn't have 'DISTRIBUTED BY' clause";
-
-/* local prototypes */
-void *         mapred_malloc(int size);
-void             mapred_free(void *ptr);
-
-buffer_t *        makebuffer(size_t bufsize, size_t grow);
-void                bufreset(buffer_t *b);
-void                  bufcat(buffer_t **bufp, char* fmt);
-void   ignore_notice_handler(void *arg, const PGresult *res);
-void    print_notice_handler(void *arg, const PGresult *res);
-void    mapred_setup_columns(PGconn *conn, mapred_object_t *obj);
-
-boolean mapred_create_object(PGconn *conn, mapred_document_t *doc, 
-							 mapred_object_t *obj);
-void    mapred_remove_object(PGconn *conn, mapred_document_t *doc,
-							 mapred_object_t *obj);
-void      mapred_run_queries(PGconn *conn, mapred_document_t *doc);
-
-void mapred_resolve_dependencies(PGconn *conn, mapred_document_t *doc);
-void mapred_resolve_ref(mapred_olist_t *olist, mapred_reference_t *ref);
-void mapred_resolve_object(PGconn *conn, mapred_document_t *doc, 
-						   mapred_object_t *obj, int *exec_count);
-
-void lookup_function_in_catalog(PGconn *conn, mapred_document_t *doc, 
-								mapred_object_t *obj);
-
-/* Wrappers around malloc/free to handle error conditions more cleanly */
-void *mapred_malloc(int size)
-{
-	void *m;
-	XASSERT(size > 0);
-
-#ifdef INTERNAL_BUILD
-	if (global_debug_flag && global_verbose_flag)
-		fprintf(stderr, "Allocating %d bytes: ", size);
-#endif
-
-	m = malloc(size);
-	if (!m)
-		XRAISE(MEMORY_ERROR, "Memory allocation failure");
-
-#ifdef INTERNAL_BUILD
-	if (global_debug_flag && global_verbose_flag)
-		fprintf(stderr, "%p\n", m);
-#endif
-
-	return m;
-}
-
-#define copyscalar(s)							\
-	strcpy(mapred_malloc(strlen(s)+1), s)
-
-void mapred_free(void *ptr)
-{
-	XASSERT(ptr);
-
-#ifdef INTERNAL_BUILD
-	if (global_debug_flag && global_verbose_flag)
-		fprintf(stderr, "Freeing memory: %p\n", ptr);
-#endif
-
-	free(ptr);
-}
-
-int mapred_obj_error(mapred_object_t *obj, char *fmt, ...)
-{
-	va_list arg;
-
-	if (global_verbose_flag)
-		fprintf(stderr, "    - ");
-
-	fprintf(stderr, "Error: ");
-	if (obj && obj->name)
-		fprintf(stderr, "%s '%s': ", mapred_kind_name[obj->kind], obj->name);
-	if (obj && !obj->name)
-		fprintf(stderr, "%s: ", mapred_kind_name[obj->kind]);
-
-	va_start(arg, fmt);
-	vfprintf(stderr, fmt, arg);
-	va_end(arg);
-	if (obj->line > 0)
-		fprintf(stderr, ", at line %d\n", obj->line);
-	else
-		fprintf(stderr, "\n");
-	
-	return MAPRED_PARSE_ERROR;
-}
-
-static void mapred_obj_debug(mapred_object_t *obj)
-{
-	mapred_plist_t *plist;
-
-	if (!obj)
-	{
-		fprintf(stderr, "Object is NULL");
-		return;
-	}
-	fprintf(stderr, "%s: \n", mapred_kind_name[obj->kind]);
-	fprintf(stderr, "  NAME: '%s': \n", obj->name ? obj->name : "-");
-	switch (obj->kind)
-	{
-		case MAPRED_NO_KIND:
-		case MAPRED_DOCUMENT:
-		case MAPRED_ADT:
-		case MAPRED_INPUT:
-		case MAPRED_OUTPUT:
-		case MAPRED_TASK:
-		case MAPRED_EXECUTION:
-		case MAPRED_REDUCER:
-		{
-			fprintf(stderr, "  DEBUG: 'debug output not yet implemented'\n");
-			break;
-		}
-
-		case MAPRED_MAPPER:
-		case MAPRED_TRANSITION:
-		case MAPRED_COMBINER:
-		case MAPRED_FINALIZER:
-		{
-			fprintf(stderr, "  LANGUAGE: %s\n", obj->u.function.language ? 
-					obj->u.function.language : "-");
-			fprintf(stderr, "  PARAMETERS: [");
-			for (plist = obj->u.function.parameters; plist; plist = plist->next)
-			{
-				fprintf(stderr, "%s %s%s", plist->name, plist->type, 
-						plist->next ? ", " : "");
-			}
-			fprintf(stderr,"]\n");
-			fprintf(stderr, "  RETURNS: [");
-			for (plist = obj->u.function.returns; plist; plist = plist->next)
-			{
-				fprintf(stderr, "%s %s%s", plist->name, plist->type, 
-						plist->next ? ", " : "");
-			}
-			fprintf(stderr,"]\n");
-			fprintf(stderr, "  LIBRARY: %s\n", obj->u.function.library ?
-					obj->u.function.library : "-");
-			fprintf(stderr, "  FUNCTION: %s\n", obj->u.function.body ?
-					obj->u.function.body : "-");
-			break;
-		}
-	}
-}
-
-
-/* -------------------------------------------------------------------------- */
-/* Functions that play with buffers                                           */
-/* -------------------------------------------------------------------------- */
-buffer_t *makebuffer(size_t bufsize, size_t grow)
-{
-	buffer_t *b;
-
-	XASSERT(bufsize > 0 && grow > 0);
-
-	b = mapred_malloc(sizeof(buffer_t) + bufsize);
-	b->buffer   = (char*)(b+1);
-	b->bufsize  = bufsize;
-	b->grow     = grow;
-	b->position = 0;
-	b->buffer[0] = '\0';
-	return b;
-}
-
-/* to re-use a buffer just "reset" it */
-void bufreset(buffer_t *b)
-{
-	XASSERT(b && b->bufsize > 0 && b->grow > 0);
-	b->position = 0;
-	b->buffer[0] = '\0';
-}
-
-/* 
- * A simple wrapper around a strncpy that handles resizing an input buffer
- * when needed.
- */
-void bufcat(buffer_t **bufp, char* str)
-{
-	buffer_t  *b;
-	size_t     len;
-
-	XASSERT(bufp && *bufp);
-	XASSERT(str);
-
-	b = *bufp;
-	len = strlen(str);
-	
-	/* If the buffer is too small, grow it */
-	if (b->bufsize <= b->position + len)
-	{
-		buffer_t *newbuf;
-
-		/* use the minumum of "grow" and the new length for the grow amount */
-		if (b->grow <= len)
-			b->grow = len+1;
-
-		newbuf = makebuffer(b->bufsize + b->grow, b->grow);
-		memcpy(newbuf->buffer, b->buffer, b->position+1);
-		newbuf->position = b->position;
-		*bufp = newbuf;
-		mapred_free(b);
-		b = newbuf;
-	}
-
-	/* We are now guaranteed that we have enough space in the buffer */
-	XASSERT( b->bufsize - b->position > len );
-	strcpy(b->buffer+b->position, str);
-	b->position += len;
-	b->buffer[b->position] = '\0';
-}
-
-
-/*
- * Currently we just ignore all warnings, may eventually do something
- * smarter, but this is preferable to dumping them to libpq's default
- * of dumping them to stderr.
- */
-void ignore_notice_handler(void *arg, const PGresult *res) 
-{
-}
-
-void print_notice_handler(void *arg, const PGresult *res) 
-{
-	char *error = PQresultErrorMessage(res);
-	if (!strncmp(error, DISTRIBUTION_NOTICE, strlen(DISTRIBUTION_NOTICE)-1))
-		return;
-
-	if (global_verbose_flag)
-		fprintf(stderr, "   - ");
-	fprintf(stderr, "%s", error);
-}
-
-/* 
- * If a function is already defined in the database we need to be able to
- * lookup the function information directly from the catalog.  This is 
- * fairly similar to func_get_detail in backend/parser/parse_func.c, but
- * the lookup from yaml is slightly different because we don't know the 
- * context that the function is in, but we _might_ have been told some
- * of the parameter information already.
- */
-void lookup_function_in_catalog(PGconn *conn, mapred_document_t *doc, 
-								mapred_object_t *obj)
-{
-	PGresult			*result	 = NULL;
-	PGresult			*result2 = NULL;
-	mapred_plist_t		*plist, *plist2;
-	mapred_plist_t		*newitem = NULL;
-	mapred_plist_t		*returns = NULL;
-	buffer_t			*buffer	 = NULL;
-	char				*tmp1	 = NULL;
-	char				*tmp2	 = NULL;
-	char				*tmp3	 = NULL;
-	const int			STR_LEN  = 50;
-	char				str[STR_LEN];
-	int					i, nargs;
-	
-	XASSERT(doc);
-	XASSERT(obj);
-	XASSERT(obj->kind == MAPRED_MAPPER     ||
-			obj->kind == MAPRED_TRANSITION ||
-			obj->kind == MAPRED_COMBINER   ||
-			obj->kind == MAPRED_FINALIZER);
-
-	obj->internal = true;
-	obj->u.function.internal_returns = NULL;
-
-	XTRY 
-	{
-		buffer = makebuffer(1024, 1024);
-
-		/* Try to lookup the specified function */
-		bufcat(&buffer, 
-			   "SELECT proretset, prorettype::regtype, pronargs,\n"
-			   "       proargnames, proargmodes, \n"
-			   "       (proargtypes::regtype[])[0:pronargs] as proargtypes,\n"
-			   "       proallargtypes::regtype[],\n");
-
-		/*
-		 * If we have return types defined in the yaml then we want to resolve
-		 * them to their authorative names for comparison purposes. 
-		 */
-		if (obj->u.function.returns)
-		{
-			bufcat(&buffer, "       ARRAY[");
-			for (plist = obj->u.function.returns; plist; plist = plist->next)
-			{
-				if (plist->type)
-				{
-					bufcat(&buffer, "'");
-					bufcat(&buffer, plist->type);
-					bufcat(&buffer, "'::regtype");
-				}
-				else
-				{
-					/* If we don't know the type, punt */
-					bufcat(&buffer, "'-'::regtype");
-				}
-				if (plist->next)
-					bufcat(&buffer, ", ");
-			}
-			bufcat(&buffer, "] as yaml_rettypes\n");
-		}
-		else
-		{
-			bufcat(&buffer, "       null::regtype[] as yaml_rettypes\n");
-		}
-
-		bufcat(&buffer,
-			   "FROM   pg_proc\n"
-			   "WHERE  not proisagg and not proiswin\n"
-			   "  AND  proname = lower('");
-		bufcat(&buffer, obj->name);
-		bufcat(&buffer, "')\n");
-
-		/* Fill in the known parameter types */
-		nargs = 0;
-		if (obj->u.function.parameters)
-		{
-			bufcat(&buffer, "  AND  (proargtypes::regtype[])[0:pronargs] = ARRAY[");
-			for (plist = obj->u.function.parameters; plist; plist = plist->next)
-			{
-				nargs++;
-				bufcat(&buffer, "'");
-				bufcat(&buffer, plist->type);
-				bufcat(&buffer, "'::regtype");
-				if (plist->next)
-					bufcat(&buffer, ", ");
-			}
-			snprintf(str, STR_LEN, "]\n  AND pronargs=%d\n", nargs);
-			bufcat(&buffer, str);
-		}
-		
-		/* Run the SQL */
-		if (global_print_flag || global_debug_flag)
-			printf("%s", buffer->buffer);
-		result = PQexec(conn, buffer->buffer);
-		bufreset(buffer);
-		
-		if (PQresultStatus(result) != PGRES_TUPLES_OK)
-		{
-			/* 
-			 * The SQL statement failed: 
-			 * Most likely scenario is a bad datatype causing the regtype cast
-			 * to fail.
-			 */
-			char *code  = PQresultErrorField(result, PG_DIAG_SQLSTATE);
-			char *error = PQresultErrorMessage(result);
-
-			printf("errcode=\"%s\"\n", code);  /* Todo: validate expected error code */
-
-			mapred_obj_error(obj, "SQL Error resolving function: \n  %s",
-							 error);
-			XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-		}
-		else if (PQntuples(result) == 0)
-		{
-			/* No such function */
-			mapred_obj_error(obj, "No such function");
-			XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-		}
-		else if (PQntuples(result) > 1)
-		{
-			XASSERT(!obj->u.function.parameters);
-			mapred_obj_error(obj, "Ambiguous function, supply a function "
-							 "prototype for disambiguation");
-			XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-		}
-		else
-		{
-			char		*value;
-			int          len;
-			boolean		 retset;
-			int          nargs;
-			char		*argtypes	 = NULL;
-			char		*argnames	 = "";
-			char		*argmodes	 = "";
-			char		*allargtypes = "";
-			char		*rettype	 = NULL;
-			char        *yaml_rettypes = "";
-			char        *type, *typetokens = NULL;
-			char        *name, *nametokens = NULL;
-			char        *mode, *modetokens = NULL;
-			boolean     name_end, mode_end;
-				
-			value = PQgetvalue(result, 0, 0);   /* Column 0: proretset */
-			retset = (value[0] == 't');
-			value = PQgetvalue(result, 0, 1);   /* Column 1: prorettype */
-			rettype = value;
-			value = PQgetvalue(result, 0, 2);   /* Column 2: pronargs */
-			nargs = (int) strtol(value, (char **) NULL, 10);
-			
-			/* 
-			 * Arrays are formated as:  "{value,value,...}" 
-			 * of which we only want "value,value, ..." 
-			 * so find the part of the string between the braces
-			 */
-			if (!PQgetisnull(result, 0, 3))   /* Column 3: proargnames */
-			{
-				value = PQgetvalue(result, 0, 3);
-				argnames = value+1;
-				len = strlen(argnames);
-				if (len > 0)
-					argnames[len-1] = '\0';
-			}
-
-			if (!PQgetisnull(result, 0, 4))   /* Column 4: proargmodes */
-			{
-				value = PQgetvalue(result, 0, 4);
-				argmodes = value+1;
-				len = strlen(argmodes);
-				if (len > 0)
-					argmodes[len-1] = '\0';
-			}
-			if (!PQgetisnull(result, 0, 5))   /* Column 5: proargtypes */
-			{
-				value = PQgetvalue(result, 0, 5);
-				argtypes = value+1;
-				len = strlen(argtypes);
-				if (len > 0)
-					argtypes[len-1] = '\0';
-			}
-			if (!PQgetisnull(result, 0, 6))   /* Column 6: proallargtypes */
-			{
-				value = PQgetvalue(result, 0, 6);
-				allargtypes = value+1;
-				len = strlen(allargtypes);
-				if (len > 0)
-					allargtypes[len-1] = '\0';
-			}
-			if (!PQgetisnull(result, 0, 7))   /* Column 7: yaml_rettypes */
-			{
-				value = PQgetvalue(result, 0, 7);
-				yaml_rettypes = value+1;
-				len = strlen(yaml_rettypes);
-				if (len > 0)
-					yaml_rettypes[len-1] = '\0';
-			}
-
-			/*
-			 * These constraints should all be enforced in the catalog, so
-			 * if something is wrong then it's a coding error above. 
-			 */
-			XASSERT(rettype);
-			XASSERT(argtypes);
-			XASSERT(nargs >= 0);
-
-			/*
-			 * If we just derived the parameters from the catalog then we
-			 * need complete our internal metadata.
-			 */
-			plist = NULL;
-			if (!obj->u.function.parameters)
-			{
-				/* strtok is destructive and we need to preserve the original
-				 * string, so we make some annoying copies prior to strtok.
-				 */
-				tmp1 = copyscalar(argtypes);
-				tmp2 = copyscalar(argnames);
-				tmp3 = copyscalar(argmodes);
-
-				type = strtok_r(tmp1, ",", &typetokens);
-				name = strtok_r(tmp2, ",", &nametokens);
-				mode = strtok_r(tmp3, ",", &modetokens);
-
-				/* 
-				 * Name and mode are used for IN/OUT parameters and may not be 
-				 * present.  In the event that they are we are looking for:
-				 *   - the "i" (in) arguments
-				 *   - the "b" (inout) arguments
-				 * we skip over:
-				 *   - the "o" (out) arguments.
-				 *   - the "t" (table out) arguments.
-				 *
-				 * Further it is possible for some of the arguments to be named
-				 * and others to be unnamed.  The unnamed arguments will show
-				 * up as "" (two quotes, not an empty string) if there is an
-				 * argnames defined.
-				 *
-				 * If argmodes is not defined then all names in proargnames 
-				 * refer to input arguments.  
-				 */
-
-				while (mode && strcmp(mode, "i") && strcmp(mode, "b"))
-				{
-					name = strtok_r(NULL, ",", &nametokens);
-					mode = strtok_r(NULL, ",", &modetokens);
-				}
-				name_end = (NULL == name);
-				mode_end = (NULL == mode);
-
-				i = 0;
-				while (type)
-				{
-					/* Keep track of which parameter we are on */
-					i++;
-					XASSERT(i <= nargs);
-
-					/* 
-					 * If a name was not specified by the user, and was not
-					 * specified by the in/out parameters then we assign it a
-					 * default name.
-					 */
-					if (!name)
-					{
-						/* single argument functions always default to "value" */
-						if (i == 1 && nargs == 1)
-							name = (char*) "value";
-
-						/* Base name on default parameter names for the first
-						 * two arguments */
-						else if (i <= 2)
-							name = (char*) default_parameter_names[obj->kind][i-1];
-						
-						/*
-						 * If we still didn't decide on a name, make up
-						 * something useless.
-						 */
-						if (!name)
-						{
-							snprintf(str, STR_LEN, "parameter%d", i);
-							name = str;
-						}
-					}
-					
-					if (!plist)
-					{
-						plist = mapred_malloc(sizeof(mapred_plist_t));
-						plist->name = copyscalar(name);
-						plist->type = copyscalar(type);
-						plist->next = (mapred_plist_t *) NULL;
-						obj->u.function.parameters = plist;
-					}
-					else
-					{
-						plist->next = mapred_malloc(sizeof(mapred_plist_t));
-						plist = plist->next;
-						plist->name = copyscalar(name);
-						plist->type = copyscalar(type);
-						plist->next = (mapred_plist_t *) NULL;
-					}
-					
-					/* Procede to the next parameter */
-					type = strtok_r(NULL, ",", &typetokens);
-					if (!name_end)
-					{
-						name = strtok_r(NULL, ",", &nametokens);
-						name_end = (NULL == name);
-					}
-					if (!mode_end)
-					{
-						mode = strtok_r(NULL, ",", &modetokens);
-						mode_end = (NULL == mode);
-					}
-					while (mode && strcmp(mode, "i") && strcmp(mode, "b"))
-					{
-						if (!name_end)
-						{
-							name = strtok_r(NULL, ",", &nametokens);
-							name_end = (NULL == name);
-						}
-						if (!mode_end)
-						{
-							mode = strtok_r(NULL, ",", &modetokens);
-							mode_end = (NULL == mode);
-						}
-					}
-				}
-
-				mapred_free(tmp1);
-				mapred_free(tmp2);
-				mapred_free(tmp3);
-				tmp1 = NULL;
-				tmp2 = NULL;
-				tmp3 = NULL;
-			}
-
-			/* 
-			 * Check that the number of parameters received is appropriate.
-			 * This would be better moved to a generalized validation routine.
-			 */
-			switch (obj->kind)
-			{
-
-				case MAPRED_MAPPER:
-					/*
-					 * It would probably be possible to start supporting zero
-					 * argument mappers, but:
-					 *   1) It would require more modifications
-					 *   2) Doesn't currently have a known use case
-					 *   3) Has easy workarounds
-					 */
-					if (nargs < 1)
-					{
-						mapred_obj_error(obj, "Transition functions require "
-										 "two or more parameters");
-						XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-					}
-					break;
-
-				case MAPRED_TRANSITION:
-					if (nargs < 2)
-					{
-						mapred_obj_error(obj, "Transition functions require "
-										 "two or more parameters");
-						XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-					}
-					if (retset)
-					{
-						mapred_obj_error(obj, "Transition functions cannot "
-										 "be table functions");
-						XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-					}
-					break;
-
-				case MAPRED_COMBINER:
-					if (nargs != 2)
-					{
-						mapred_obj_error(obj, "Consolidate functions require "
-										 "exactly two parameters");
-						XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-					}
-					if (retset)
-					{
-						mapred_obj_error(obj, "Consolidate functions cannot "
-										 "be table functions");
-						XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-					}
-					break;
-
-				case MAPRED_FINALIZER:
-					if (nargs != 1)
-					{
-						mapred_obj_error(obj, "Finalize functions require "
-										 "exactly one parameter");
-						XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-					}
-					break;
-
-				default:
-					XASSERT(false);
-			}
-
-			/* Fill in return type information */
-			if (retset)
-				obj->u.function.mode = MAPRED_MODE_MULTI;
-			else
-				obj->u.function.mode = MAPRED_MODE_SINGLE;
-
-			/* 
-			 * Determine the return type information, there are 3 primary 
-			 * subcases:
-			 *
-			 *  1) Function is defined with OUT/TABLE parameters.
-			 *  2) Function returns a simple type.
-			 *  3) Function returns a complex type.
-			 *  4) Return type is void [error]
-			 */
-			plist = returns = NULL;
-			if (argmodes && strlen(argmodes) > 0)
-			{
-
-				/* strtok is destructive and we need to preserve the original
-				 * string, so we make some annoying copies prior to strtok.
-				 */
-				tmp1 = copyscalar(allargtypes);
-				tmp2 = copyscalar(argnames);
-				tmp3 = copyscalar(argmodes);
-
-				type = strtok_r(tmp1, ",", &typetokens);
-				name = strtok_r(tmp2, ",", &nametokens);
-				mode = strtok_r(tmp3, ",", &modetokens);
-				
-				i = 1;
-				while (mode)
-				{
-					while (mode && 
-						   strcmp(mode, "o") && 
-						   strcmp(mode, "b") && 
-						   strcmp(mode, "t"))
-					{
-						/* skip input parameters */
-						type = strtok_r(NULL, ",", &typetokens);
-						name = strtok_r(NULL, ",", &nametokens);
-						mode = strtok_r(NULL, ",", &modetokens);
-					}
-					if (mode)
-					{
-						XASSERT(type);
-
-						newitem = mapred_malloc(sizeof(mapred_plist_t));
-
-						/* 
-						 * Note we haven't made local copies of these, we will
-						 * do this after resolution when validating against any
-						 * RETURNS defined in the yaml, if any.
-						 */
-
-						if( NULL != name &&
-								0 != strcmp(name, "") &&
-								0 != strcmp(name, "\"\"") )
-						{
-							/*if name defined in db, just use it*/
-							newitem->name = copyscalar(name);
-						}
-						else
-						{
-							/*else just obey the default name in db*/
-							snprintf( str, STR_LEN, "column%d", i);
-							newitem->name = copyscalar(str);
-						}
-						
-						newitem->type = copyscalar(type);
-						
-						newitem->next = NULL;
-
-						if (plist)
-							plist->next = newitem;
-						else
-							returns = newitem;
-						plist = newitem;
-						++i;
-					}
-					type = strtok_r(NULL, ",", &typetokens);
-					name = strtok_r(NULL, ",", &nametokens);
-					mode = strtok_r(NULL, ",", &modetokens);
-				}
-
-				mapred_free(tmp1);
-				mapred_free(tmp2);
-				mapred_free(tmp3);
-				tmp1 = NULL;
-				tmp2 = NULL;
-				tmp3 = NULL;
-			}
-
-			/* 
-			 * If the arguments were not defined in the function definition then
-			 * we check to see if this was a complex type by looking up the type
-			 * information in pg_attribute.
-			 */
-			if (!returns)
-			{
-				bufcat(&buffer,
-					   "SELECT attname, atttypid::regtype\n"
-					   "FROM   pg_attribute a\n"
-					   "JOIN   pg_class c on (a.attrelid = c.oid)\n"
-					   "WHERE  not a.attisdropped\n"
-					   "  AND  a.attnum > 0\n"
-					   "  AND  c.reltype = '");
-				bufcat(&buffer, rettype);
-				bufcat(&buffer, 
-					   "'::regtype\n"
-					   "ORDER BY -attnum");
-				result2 = PQexec(conn, buffer->buffer);
-				bufreset(buffer);
-				
-				if (PQresultStatus(result2) != PGRES_TUPLES_OK)
-				{
-					char *error = PQresultErrorMessage(result);
-
-					mapred_obj_error(obj, "Error resolving function: %s", error);
-					XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-				}
-				else if (PQntuples(result2) > 0)
-				{
-					/* We have a complex type, build the return list */
-					for (i = 0; i < PQntuples(result2); i++)
-					{
-						name = PQgetvalue(result2, i, 0);
-						type = PQgetvalue(result2, i, 1);
-
-						newitem = mapred_malloc(sizeof(mapred_plist_t));
-						newitem->name = copyscalar(name);
-						newitem->type = copyscalar(type);
-						newitem->next = returns;
-						returns = newitem;
-					}
-				}
-			}
-
-			/* 
-			 * If the return types were not defined in either the argument list
-			 * nor the catalog then we assume it is a simple type.
-			 */
-			if (!returns)
-			{
-				/* Check against "void" which is a special return type that
-				 * means there is no return value - which we don't support for
-				 * mapreduce.
-				 */
-				if (!strcmp(rettype, "void"))
-				{
-					mapred_obj_error(obj, "Function returns void");
-					XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-				}
-				returns = mapred_malloc(sizeof(mapred_plist_t));
-				returns->type = copyscalar(rettype);
-				returns->name = NULL;
-				returns->next = NULL;
-			}
-
-			/* 
-			 * We now should have a returns list, compare it against the RETURNS
-			 * list given in the yaml.  The yaml overrides return names, but can
-			 * not override return types.  If the return types are incompatible
-			 * raise an error.  
-			 */
-			obj->u.function.internal_returns = returns;
-			if (obj->u.function.returns)
-			{
-				/* 
-				 * The first thing to do is normalize the given return types 
-				 * with their formal names.  This will, for example turn a type
-				 * like "float8" => "double precision".  The input name might
-				 * be correct (float8) but we need it represented as the formal
-				 * name so that we can compare against the formal name we got
-				 * when we looked up the function in the catalog.
-				 */
-				plist = obj->u.function.returns;
-				type = strtok_r(yaml_rettypes, ",", &typetokens);
-				while (plist)
-				{
-					XASSERT(type);  /* should be an equal number */
-					
-					/* 
-					 * If we have a type specified replace it with the one we
-					 * resolved from the select stmt, otherwise just keep it
-					 * as NULL and fill it in during the compare against what
-					 * was in the catalog.
-					 */
-					if (plist->type)
-					{
-						mapred_free(plist->type);
-						
-						/* 
-						 * When in an array the typname may get wrapped in
-						 * double quotes, if so we need to strip them back out.
-						 */
-						if (type[0] == '"')
-						{
-							plist->type = copyscalar(type+1);
-							plist->type[strlen(plist->type)-1] = '\0';
-						}
-						else
-						{
-							plist->type = copyscalar(type);
-						}
-					}
-
-					plist = plist->next;
-					type = strtok_r(NULL, ",", &typetokens);
-				}
-
-
-				/* Compare against actual function return types */
-				plist = obj->u.function.returns;
-				plist2 = returns;
-				while (plist && plist2)
-				{
-					XASSERT(plist->name);   /* always defined in YAML */
-					XASSERT(plist2->type);  /* always defined in SQL */
-					
-					/* 
-					 * In the YAML it is possible to have a name without a type,
-					 * if that is the case then simply take the SQL type.
-					 */
-					if (!plist->type)
-						plist->type = copyscalar(plist2->type);
-					else if (strcmp(plist->type, plist2->type))
-						break;
-					plist  = plist->next;
-					plist2 = plist2->next;
-				}
-				if (plist || plist2)
-				{
-					mapred_obj_error(obj, "RETURN parameter '%s %s' != '%s %s'",
-									 plist ? plist->name : "\"\"",
-									 plist ? plist->type : "-",
-									 plist2 ? (plist2->name ? plist2->name : plist->name) : "\"\"",
-									 plist2 ? plist2->type : "-");
-					XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-				}
-			}
-			else
-			{
-				obj->u.function.returns = returns;
-				i = 0;
-				for (plist = returns; plist; plist = plist->next)
-				{
-					XASSERT(plist->type);
-					i++;
-					plist->type = copyscalar(plist->type);
-
-					/*
-					 * if plist->name is not null and empty string,
-					 * then use that name
-					 */
-					if (plist->name &&
-							0 != strcmp(plist->name, "") &&
-							0 != strcmp(plist->name, "\"\"") )
-					{
-						plist->name = copyscalar(plist->name);
-					}
-					/*
-					 * else We need generate a name anyway
-					 */
-					else
-					{
-						/* 
-						 * Manufacture a name for a column based on default
-						 * naming rules. 
-						 */
-						name = (char*) NULL;
-						if (i <= 2) 
-							name = (char*) default_return_names[obj->kind][i-1];
-						if (!name)
-						{
-							snprintf(str, STR_LEN, "parameter%d", i);
-							name = str;
-						}
-						plist->name = copyscalar(name);
-					}
-				}				
-			}
-		}
-	}
-	XFINALLY
-	{
-		if (result)
-			PQclear(result);
-		if (result2)
-			PQclear(result2);
-		if (buffer)
-			mapred_free(buffer);
-
-		if (tmp1)
-			mapred_free(tmp1);
-		if (tmp2)
-			mapred_free(tmp2);
-		if (tmp3)
-			mapred_free(tmp3);
-
-	}
-	XTRY_END;
-}
-
-void mapred_run_document(PGconn *conn, mapred_document_t *doc)
-{
-	PGresult       *result;
-	mapred_olist_t *olist;
-	boolean         done;
-	boolean         executes;
-
-	/* Ignore NOTICE messages from database */
-	PQsetNoticeReceiver(conn, ignore_notice_handler, NULL);
-
-	/* Establish a name-prefix for temporary objects */
-	doc->prefix = mapred_malloc(64);
-	snprintf(doc->prefix, 64, "mapreduce_%d_", PQbackendPID(conn));
-	
-
-	/*
-	 * Resolution of dependecies was defered until now so that
-	 * a database connection could be available to look up any
-	 * dependencies that are not defined within the YAML document.
-	 */
-	if (global_verbose_flag)
-		fprintf(stderr, "  - Resolving Dependencies:\n");
-	mapred_resolve_dependencies(conn, doc);
-	if (global_verbose_flag)
-		fprintf(stderr, "    - DONE\n");
-
-	XTRY
-	{
-
-		/*
-		 * Setting gp_mapreduce_define will disable logging of sql 
-		 * statements. 
-		 */
-#ifndef INTERNAL_BUILD
-		result = PQexec(conn, "set gp_mapreduce_define=true");
-		PQclear(result);
-#endif
-
-		/*
-		 * By running things within a transaction we can effectively
-		 * obscure the mapreduce sql definitions.  They could still
-		 * be exposed by a savy user via mapreduce views that access
-		 * the catalog tables, but it's a cleaner method of handling
-		 * things.
-		 */
-		result = PQexec(conn, "BEGIN TRANSACTION");
-		if (PQresultStatus(result) != PGRES_COMMAND_OK)
-		{
-			PQclear(result);
-			XRAISE(MAPRED_SQL_ERROR, NULL);
-		}
-		PQclear(result);
-
-		/* With dependencies resolved we can now try creating objects */
-		if (global_verbose_flag)
-			fprintf(stderr, "  - Creating Objects\n");
-
-		/* 
-		 * we don't try to create any executes until all non-executes are 
-		 * successfully created 
-		 */
-		executes = false;
-		do
-		{
-			boolean progress = false;
-
-			/*
-			 * We keep a buffer of errors during parsing, and display them at
-			 * the end if they haven't been resolved.
-			 */
-			if (!doc->errors)
-				doc->errors = makebuffer(1024, 1024);
-			else
-				bufreset(doc->errors);
-			
-
-			/* 
-			 * Loop through the objects, creating each in turn.
-			 * If an object has dependencies that have not been created yet
-			 * it will return false and we will make additional passes through
-			 * the object list 
-			 */  
-			done  = true;
-			for (olist = doc->objects; olist; olist = olist->next)
-			{
-				mapred_object_t *obj = olist->object;
-				if (!obj->created && 
-					(executes || obj->kind != MAPRED_EXECUTION))
-				{
-					if (global_verbose_flag && obj->kind != MAPRED_ADT)
-					{
-						fprintf(stderr, "    - %s:\n", 
-								mapred_kind_name[obj->kind]);
-						fprintf(stderr, "       NAME: %s\n", obj->name);
-					}
-
-					if (!mapred_create_object(conn, doc, obj))
-						done = false;
-					else
-						progress = true;
-				}
-			}
-			
-			/*
-			 * If all non-execute objects have been created then switch over
-			 * and start creating the execution jobs 
-			 */
-			if (done && !executes)
-			{
-				executes = true;
-				done = false;
-			}
-
-			
-			/* 
-			 * If we looped through the list, we are not done, and no progress
-			 * was made then we have an infinite cycle and should probably stop.
-			 */
-			if (!done && !progress)
-			{
-				if (doc->errors && doc->errors->position > 0)
-					fprintf(stderr, "%s", doc->errors->buffer);
-				XRAISE(MAPRED_PARSE_ERROR, 
-					   "Unable to make forward progress creating objects\n");
-			}
-
-		} while (!done);
-
-		/*
-		 * Re-enable statement logging before we try running queries
-		 */
-#ifndef INTERNAL_BUILD
-		result = PQexec(conn, "set gp_mapreduce_define=false");
-		PQclear(result);
-#endif
-
-		/* objects created, execute queries */
-		mapred_run_queries(conn, doc);
-	}
-	XCATCH(MAPRED_SQL_ERROR)
-	{
-		if (global_verbose_flag)
-			fprintf(stderr, "    - ");
-		fprintf(stderr, "%s", PQerrorMessage(conn));
-		XRERAISE();
-	}
-	XFINALLY
-	{
-
-		/*
-		 * disable statement logging before deleting objects 
-		 */
-#ifndef INTERNAL_BUILD
-		result = PQexec(conn, "set gp_mapreduce_define=true");
-		PQclear(result);
-#endif
-
-		/* Remove all the objects that we created */
-		if (global_print_flag || global_debug_flag)
-			printf("\n");
-		for (olist = doc->objects; olist; olist = olist->next)
-			mapred_remove_object(conn, doc, olist->object);
-		if (global_print_flag || global_debug_flag)
-			printf("\n");
-
-		/*
-		 * We always commit the transaction, even on failure since the failure
-		 * may have occured after we generated some output tables and we want
-		 * to keep the partial results.
-		 */
-		result = PQexec(conn, "COMMIT TRANSACTION");
-		if (PQresultStatus(result) != PGRES_COMMAND_OK)
-		{
-			if (global_verbose_flag)
-				fprintf(stderr, "    - ");
-			fprintf(stderr, "%s", PQerrorMessage(conn));
-		}
-	}
-	XTRY_END;
-}
-
-
-void mapred_resolve_dependencies(PGconn *conn, mapred_document_t *doc)
-{
-	mapred_olist_t     *olist;
-	int                 exec_count = 0;
-
-	/* Walk the list of objects */
-	for (olist = doc->objects; olist; olist = olist->next)
-		mapred_resolve_object(conn, doc, olist->object, &exec_count);
-
-}
-
-void mapred_resolve_object(PGconn *conn, mapred_document_t *doc, 
-						   mapred_object_t *obj, int *exec_count)
-{
-	mapred_olist_t  *newlist;
-	mapred_object_t *sub;   /* sub-object */
-	size_t           len;
-
-	switch (obj->kind)
-	{
-		/* Objects with no dependencies */
-		case MAPRED_OUTPUT:
-		case MAPRED_ADT:
-			break;
-
-		case MAPRED_INPUT:
-			/* 
-			 * For FILE/GPFDIST/EXEC inputs we will create a name-prefixed
-			 * version of the object to prevent name collisions, and then
-			 * create a second temporary view over the external table to
-			 * support access to the input by "name".  This involves creating
-			 * a second copy of the input which we place directly after the
-			 * original input in the document object list.
-			 */
-			if (obj->u.input.type == MAPRED_INPUT_GPFDIST ||
-				obj->u.input.type == MAPRED_INPUT_FILE    ||
-				obj->u.input.type == MAPRED_INPUT_EXEC)
-			{
-				mapred_object_t *newinput;
-				mapred_olist_t  *parent;
-
-				newinput = mapred_malloc(sizeof(mapred_object_t));
-				memset(newinput, 0, sizeof(mapred_object_t));
-				newinput->kind = MAPRED_INPUT;
-				len = strlen(obj->name) + 1;
-				newinput->name = mapred_malloc(len);
-				sprintf(newinput->name, "%s", obj->name);
-				newinput->u.input.type = MAPRED_INPUT_QUERY;
-				len = strlen(doc->prefix) + strlen(obj->name) + 16;
-				newinput->u.input.desc = mapred_malloc(len);
-				snprintf(newinput->u.input.desc, len,
-						 "select * from %s%s",
-						 doc->prefix, obj->name);
-				
-				/* 
-				 * Find parent input in the doclist and add the new object 
-				 * immediately after it.
-				 */
-				for (parent = doc->objects;
-					 parent && parent->object != obj;
-					 parent = parent->next);
-				XASSERT(parent);
-				newlist = mapred_malloc(sizeof(mapred_olist_t));
-				newlist->object = newinput;
-				newlist->next = parent->next;
-				parent->next = newlist;
-			}
-			break;
-
-
-		case MAPRED_MAPPER:
-		case MAPRED_TRANSITION:
-		case MAPRED_COMBINER:
-		case MAPRED_FINALIZER:
-
-
-			/* 
-			 * If the function is an internal function then we try to resolve
-			 * the function by looking it up in the catalog.
-			 */
-			obj->u.function.internal_returns = NULL;
-			obj->internal = false;
-
-			if (!obj->u.function.language)
-			{
-				obj->internal = true;
-				lookup_function_in_catalog(conn, doc, obj);
-			}
-			/* ??? */
-			else if (!obj->u.function.returns)
-			{
-				XASSERT(false);
-			}
-
-			/* 
-			 * The function types may manufacture a dependency on an adt, 
-			 * but have no other dependencies.
-			 */		
-			else if (obj->u.function.returns->next)
-			{
-				sub = mapred_malloc(sizeof(mapred_object_t));
-				memset(sub, 0, sizeof(mapred_object_t));
-				sub->kind = MAPRED_ADT;
-				len = strlen(doc->prefix) + strlen(obj->name) + 7;
-				sub->name = mapred_malloc(len);
-				snprintf(sub->name, len, "%s%s_rtype", 
-						 doc->prefix, obj->name);
-				sub->u.adt.returns = obj->u.function.returns;
-				
-				obj->u.function.rtype.name = sub->name;
-				obj->u.function.rtype.object = sub;
-
-				/* Add the ADT to the list of document objects */
-				newlist = mapred_malloc(sizeof(mapred_olist_t));
-				newlist->object = sub;
-				newlist->next = doc->objects;
-				doc->objects = newlist;
-
-				/* And resolve the sub-object */
-				mapred_resolve_object(conn, doc, sub, exec_count);
-			}
-			else
-			{
-				obj->u.function.rtype.name = obj->u.function.returns->type;
-				obj->u.function.rtype.object = NULL;
-			}
-			break;
-
-
-		case MAPRED_REDUCER:
-		{
-			/*
-			 * If we have a function, but no object then we assume that it is
-			 * a database function.  Create a dummy object to handle this case.
-			 */
-			mapred_resolve_ref(doc->objects, &obj->u.reducer.transition);
-			if (obj->u.reducer.transition.name &&
-				!obj->u.reducer.transition.object)
-			{
-				len = strlen(obj->u.reducer.transition.name) + 1;
-				sub = mapred_malloc(sizeof(mapred_object_t));
-				memset(sub, 0, sizeof(mapred_object_t));
-				sub->kind = MAPRED_TRANSITION;
-				sub->name = mapred_malloc(len);
-				sub->line = obj->line;
-				strncpy(sub->name, obj->u.reducer.transition.name, len);
-
-				
-				newlist = mapred_malloc(sizeof(mapred_olist_t));
-				newlist->object = sub;
-				newlist->next = doc->objects;
-				doc->objects = newlist;
-				obj->u.reducer.transition.object = sub;
-
-				/* And resolve the sub-object */
-				mapred_resolve_object(conn, doc, sub, exec_count);
-			}
-			mapred_resolve_ref(doc->objects, &obj->u.reducer.combiner);
-			if (obj->u.reducer.combiner.name &&
-				!obj->u.reducer.combiner.object)
-			{
-				len = strlen(obj->u.reducer.combiner.name) + 1;
-				sub = mapred_malloc(sizeof(mapred_object_t));
-				memset(sub, 0, sizeof(mapred_object_t));
-				sub->kind = MAPRED_COMBINER;
-				sub->name = mapred_malloc(len);
-				sub->line = obj->line;
-				strncpy(sub->name, obj->u.reducer.combiner.name, len);
-				
-				newlist = mapred_malloc(sizeof(mapred_olist_t));
-				newlist->object = sub;
-				newlist->next = doc->objects;
-				doc->objects = newlist;
-				obj->u.reducer.combiner.object = sub;
-
-				/* And resolve the sub-object */
-				mapred_resolve_object(conn, doc, sub, exec_count);
-			}
-			mapred_resolve_ref(doc->objects, &obj->u.reducer.finalizer);
-			if (obj->u.reducer.finalizer.name &&
-				!obj->u.reducer.finalizer.object)
-			{
-				len = strlen(obj->u.reducer.finalizer.name) + 1;
-				sub = mapred_malloc(sizeof(mapred_object_t));
-				memset(sub, 0, sizeof(mapred_object_t));
-				sub->kind = MAPRED_FINALIZER;
-				sub->name = mapred_malloc(len);
-				sub->line = obj->line;
-				strncpy(sub->name, obj->u.reducer.finalizer.name, len);
-				
-				newlist = mapred_malloc(sizeof(mapred_olist_t));
-				newlist->object = sub;
-				newlist->next = doc->objects;
-				doc->objects = newlist;
-				obj->u.reducer.finalizer.object = sub;
-
-				/* And resolve the sub-object */
-				mapred_resolve_object(conn, doc, sub, exec_count);
-			}
-
-			break;
-		}
-
-
-		case MAPRED_TASK:
-		case MAPRED_EXECUTION:
-		{
-			/* 
-			 * Resolving a task may require recursion to resolve other
-			 * tasks to work out parameter lists.  We keep track of 
-			 * our resolution state in order to detect potential 
-			 * infinite recursion issues.
-			 */
-			if (obj->u.task.flags & mapred_task_resolved)
-				return;
-
-			/* Assign a name to anonymous executions */
-			if (!obj->name)
-			{
-				size_t     len;
-
-				XASSERT(obj->u.task.execute);
-
-				/* 10 characters for max int digits, 4 for "run_" */
-				len = strlen(doc->prefix) + 16;
-				obj->name = mapred_malloc(len);
-				snprintf(obj->name, len, "%srun_%d",
-						 doc->prefix, ++(*exec_count));
-			}
-
-			/* Check for infinite recursion */
-			if (obj->u.task.flags & mapred_task_resolving)
-			{
-				mapred_obj_error(obj, "Infinite recursion detected while "
-								 "trying to resove TASK");
-				XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-			}
-			obj->u.task.flags |= mapred_task_resolving;
-
-			/* Validate object types */
-			if (obj->u.task.input.name)
-			{
-				mapred_resolve_ref(doc->objects, &obj->u.task.input);
-				sub = obj->u.task.input.object;
-				
-				/* If we can't find the input, throw an error */
-				if (!sub)
-				{
-					/* Can't find INPUT object */
-					mapred_obj_error(obj, "SOURCE '%s' not found in document",
-									 obj->u.task.input.name);
-					XRAISE(MAPRED_PARSE_ERROR, "Object Resolution Failure");
-				}
-
-				/* 
-				 * The input must either be an INPUT or a TASK 
-				 */
-				switch (sub->kind)
-				{
-					case MAPRED_INPUT:
-						break;
-
-					case MAPRED_TASK:
-						/* This objects input is the sub objects output */
-						mapred_resolve_object(conn, doc, sub, exec_count);
-						break;
-							
-						/* Otherwise generate an error */
-					default:
-
-						/* SOURCE wasn't an INPUT */
-						mapred_obj_error(obj, "SOURCE '%s' is neither an INPUT nor a TASK",
-										 obj->u.task.input.name);	
-						XRAISE(MAPRED_PARSE_ERROR, "Object Resolution Failure");
-				}
-			}
-			
-			if (obj->u.task.mapper.name)
-			{
-				mapred_resolve_ref(doc->objects, &obj->u.task.mapper);
-				sub = obj->u.task.mapper.object;
-				
-				if (!sub)
-				{
-					/* Create an internal map function */
-					len = strlen(obj->u.task.mapper.name) + 1;
-					sub = mapred_malloc(sizeof(mapred_object_t));
-					memset(sub, 0, sizeof(mapred_object_t));
-					sub->kind = MAPRED_MAPPER;
-					sub->name = mapred_malloc(len);
-					sub->line = obj->line;
-					strncpy(sub->name, obj->u.task.mapper.name, len);
-
-					newlist = mapred_malloc(sizeof(mapred_olist_t));
-					newlist->object = sub;
-					newlist->next = doc->objects;
-					doc->objects = newlist;
-					obj->u.task.mapper.object = sub;
-
-					/* And resolve the sub-object */
-					mapred_resolve_object(conn, doc, sub, exec_count);
-				}
-				else
-				{
-					/* Allow any function type */
-					switch (sub->kind)
-					{
-						case MAPRED_MAPPER:
-						case MAPRED_TRANSITION:
-						case MAPRED_COMBINER:
-						case MAPRED_FINALIZER:
-							break;
-
-						default:
-							mapred_obj_error(obj, "MAP '%s' is not a MAP object",
-											 obj->u.task.mapper.name);
-							XRAISE(MAPRED_PARSE_ERROR, "Object Resolution Failure");
-					}
-				}
-			}
-
-			if (obj->u.task.reducer.name)
-			{
-				mapred_resolve_ref(doc->objects, &obj->u.task.reducer);
-				sub = obj->u.task.reducer.object;
-				
-				if (!sub)
-				{
-					/* FIXME: non-yaml reducers */
-				}
-				else if (sub->kind == MAPRED_REDUCER)
-				{   /* Validate Reducer */
-					mapred_resolve_object(conn, doc, sub, exec_count);
-				}
-				else 
-				{   /* It's an object, but not a REDUCER */
-					mapred_obj_error(obj, "REDUCE '%s' is not a REDUCE object",
-									 obj->u.task.reducer.name);
-					XRAISE(MAPRED_PARSE_ERROR, "Object Resolution Failure");
-				}
-			}
-
-			if (obj->u.task.output.name)
-			{
-				mapred_resolve_ref(doc->objects, &obj->u.task.output);
-
-				sub = obj->u.task.output.object;
-				if (sub && sub->kind != MAPRED_OUTPUT)
-				{
-					mapred_obj_error(obj, "TARGET '%s' is not an OUTPUT object",
-									 obj->u.task.output.name);
-					XRAISE(MAPRED_PARSE_ERROR, "Object Resolution Failure");
-				}
-				if (!sub && obj->u.task.output.name)
-				{
-					mapred_obj_error(obj, "TARGET '%s' is not defined in "
-									 "document",
-									 obj->u.task.output.name);
-					XRAISE(MAPRED_PARSE_ERROR, "Object Resolution Failure");
-				}
-			}
-	
-			/* clear resolving bit and set resolved bit */
-			obj->u.task.flags &= !mapred_task_resolving;
-			obj->u.task.flags |= mapred_task_resolved;
-			break;
-		}
-
-		default:
-			XASSERT(false);
-	}
-
-	if (global_debug_flag)
-		mapred_obj_debug(obj);
-}
-
-/* 
- * mapred_setup_columns -
- *   setup column lists (input, output, grouping, etc)
- *
- *   This is usually able to be determined directly from the YAML,
- *   but for some things (defined in the database rather than in
- *   the YAML, eg QUERY INPUTS) we can not determine the columns
- *   until the object has been created.  Which can trickle down to
- *   any object that depends on it.  
- *
- *   For this reason we don't setup the columns during the parse phase,
- *   but rather just before or just after we actually create the object
- *   once we know that all the dependencies have already been created.
- */
-void mapred_setup_columns(PGconn *conn, mapred_object_t *obj)
-{
-	mapred_object_t *sub;
-	PGresult        *result;
-
-	/* switch based on object type */
-	switch (obj->kind)
-	{
-		case MAPRED_ADT:
-			break;
-
-		case MAPRED_INPUT:
-
-			/* 
-			 * Should be called after creation, otherwise catalog queries 
-			 * could fail.
-			 */
-			XASSERT(obj->created);
-
-			/* setup the column list for database defined inputs */
-			if (obj->u.input.type == MAPRED_INPUT_TABLE ||
-				obj->u.input.type == MAPRED_INPUT_QUERY)
-			{
-				/* 
-				 * This gets the ordered list of columns for the first
-				 * input of the given name in the user's search path.
-				 */
-				buffer_t *buffer = makebuffer(1024, 1024);
-				bufcat(&buffer, 
-					   "SELECT  attname, "
-					   "        pg_catalog.format_type(atttypid, atttypmod)\n"
-					   "FROM    pg_catalog.pg_attribute\n"
-					   "WHERE   attnum > 0 AND attrelid = lower('");
-				if (obj->u.input.type == MAPRED_INPUT_TABLE)
-					bufcat(&buffer, obj->u.input.desc);
-				else
-					bufcat(&buffer, obj->name);
-				bufcat(&buffer, 
-					   "')::regclass\n"
-					   "ORDER BY   -attnum;\n\n");
-			
-				if (global_debug_flag)
-					printf("%s", buffer->buffer);			
-						
-				result = PQexec(conn, buffer->buffer);
-				mapred_free(buffer);
-
-				if (PQresultStatus(result) == PGRES_TUPLES_OK &&
-					PQntuples(result) > 0)
-				{
-					mapred_plist_t *newitem;
-					int i;
-
-					/* Destroy any previous default values we setup */
-					mapred_destroy_plist(&obj->u.input.columns);
-
-					/* 
-					 * The columns were sorted reverse order above so
-					 * the list can be generated back -> front
-					 */
-					for (i = 0; i < PQntuples(result); i++)
-					{
-						char *name = PQgetvalue(result, i, 0);
-						char *type = PQgetvalue(result, i, 1);
-					
-						/* Add the column to the list */
-						newitem = mapred_malloc(sizeof(mapred_plist_t));
-						newitem->name = mapred_malloc(strlen(name)+1);
-						strncpy(newitem->name, name, strlen(name)+1);
-						newitem->type = mapred_malloc(strlen(type)+1);
-						strncpy(newitem->type, type, strlen(type)+1);
-						newitem->next = obj->u.input.columns;
-						obj->u.input.columns = newitem;
-					}
-				}
-				else
-				{
-					char *error = PQresultErrorField(result, PG_DIAG_SQLSTATE);
-					char *name;
-
-					if (obj->u.input.type == MAPRED_INPUT_TABLE)
-						name = obj->u.input.desc;
-					else
-						name = obj->name;
-
-					if (PQresultStatus(result) == PGRES_TUPLES_OK)
-					{
-						mapred_obj_error(obj, "Table '%s' contains no rows", name);
-					}
-					else if (!strcmp(error, OBJ_DOES_NOT_EXIST) ||
-							 !strcmp(error, SCHEMA_DOES_NOT_EXIST) )
-					{
-						mapred_obj_error(obj, "Table '%s' not found", name);
-					}
-					else 
-					{
-						mapred_obj_error(obj, "Table '%s' unknown error: %s", name, error);
-					}
-					XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-				}
-				PQclear(result);
-			}
-			break;
-
-
-		case MAPRED_OUTPUT:
-			break;
-
-		case MAPRED_MAPPER:
-		case MAPRED_TRANSITION:
-		case MAPRED_COMBINER:
-		case MAPRED_FINALIZER:
-			XASSERT(obj->u.function.parameters);
-			XASSERT(obj->u.function.returns);
-			break;
-
-
-		case MAPRED_REDUCER:
-		{
-			mapred_object_t *transition = obj->u.reducer.transition.object;
-
-			XASSERT(transition);
-			XASSERT(transition->u.function.parameters);
-			obj->u.reducer.parameters = 
-				transition->u.function.parameters->next;
-
-			/* 
-			 * Use the return result of:
-			 *   1) The finalizer
-			 *   2) The combiner, or
-			 *   3) The transition
-			 *
-			 * in that order, if the return is not derivable then
-			 * fall into the default value of a single text column
-			 * named "value"
-			 */
-			if (obj->u.reducer.finalizer.name)
-				sub = obj->u.reducer.finalizer.object;
-			else if (obj->u.reducer.combiner.name)
-				sub = obj->u.reducer.combiner.object;
-			else
-				sub = obj->u.reducer.transition.object;			 
-					
-			if (sub)
-				obj->u.reducer.returns = sub->u.function.returns;
-
-			if (!obj->u.reducer.returns)
-			{
-				/* 
-				 * If unable to determine the returns based on the reducer 
-				 * components (generally due to use of SQL functions) then 
-				 * use the default of a single text column named "value".
-				 */
-				obj->u.reducer.returns = mapred_malloc(sizeof(mapred_plist_t));
-				obj->u.reducer.returns->name = "value";
-				obj->u.reducer.returns->type = "text";
-				obj->u.reducer.returns->next = NULL;
-			}
-			break;
-		}
-
-
-		case MAPRED_TASK:
-		case MAPRED_EXECUTION:
-		{
-			mapred_plist_t *scan;
-			mapred_plist_t *last = NULL;
-
-			/* 
-			 * The input must either be an INPUT or a TASK 
-			 */
-			sub = obj->u.task.input.object;
-			switch (sub->kind)
-			{
-				case MAPRED_INPUT:
-					obj->u.task.parameters = sub->u.input.columns;
-					break;
-
-				case MAPRED_TASK:
-					/* union the input tasks returns and grouping */					
-					for (scan = sub->u.task.grouping;
-						 scan; 
-						 scan = scan->next)
-					{
-						if (!last)
-						{
-							obj->u.task.parameters = 
-								mapred_malloc(sizeof(mapred_plist_t));
-							last = obj->u.task.parameters;
-						}
-						else
-						{
-							last->next = 
-								mapred_malloc(sizeof(mapred_plist_t));
-							last = last->next;
-						}
-						last->name = scan->name;
-						last->type = scan->type;
-						last->next = NULL;
-					}
-					for (scan = sub->u.task.returns;
-						 scan;
-						 scan = scan->next)
-					{
-						if (!last)
-						{
-							obj->u.task.parameters = 
-								mapred_malloc(sizeof(mapred_plist_t));
-							last = obj->u.task.parameters;
-						}
-						else
-						{
-							last->next = 
-								mapred_malloc(sizeof(mapred_plist_t));
-							last = last->next;
-						}
-						last->name = scan->name;
-						last->type = scan->type;
-						last->next = NULL;
-					}
-					break;
-							
-				default:
-					/* Should have already been validated */
-					XASSERT(false);
-			}
-			
-			if (obj->u.task.mapper.name)
-			{
-				sub = obj->u.task.mapper.object;				
-				if (!sub)
-				{
-					/* FIXME: Lookup function in database */
-					/* for now... do nothing */
-				}
-				else
-				{
-					/* Allow any function type */
-					switch (sub->kind)
-					{
-						case MAPRED_MAPPER:
-						case MAPRED_TRANSITION:
-						case MAPRED_COMBINER:
-						case MAPRED_FINALIZER:
-							break;
-
-						default:
-							/* Should have already been validated */
-							XASSERT(false); 
-					}
-				}
-			}
-
-			if (obj->u.task.reducer.name)
-			{
-				mapred_clist_t *keys;
-				mapred_plist_t *source;
-
-				/* 
-				 * The grouping columns for a task are the columns produced
-				 * by the input/mapper that are not consumed by the reducer.
-				 * 
-				 * A special exception is made for a column named "key" which
-				 * is always a grouping column. 
-				 *
-				 * FIXME: deal with non-yaml map functions
-				 *
-				 * FIXME: deal with KEY specifications
-				 */
-				if (obj->u.task.mapper.object)
-					source = obj->u.task.mapper.object->u.function.returns;
-				else
-					source = obj->u.task.parameters;
-
-				sub = obj->u.task.reducer.object;				
-				if (!sub)
-				{
-					/*
-					 * The output of a built in function is defined to be 
-					 * "value", with an input of "value", everything else
-					 * is defined to be a grouping column.
-					 */
-					last = NULL;
-					for (scan = source; scan; scan = scan->next)
-					{
-						if (strcasecmp(scan->name, "value"))
-						{
-							if (!last)
-							{
-								obj->u.task.grouping = 
-									mapred_malloc(sizeof(mapred_plist_t));
-								last = obj->u.task.grouping;
-							}
-							else
-							{
-								last->next = 
-									mapred_malloc(sizeof(mapred_plist_t));
-								last = last->next;
-							}
-							last->name = scan->name;
-							last->type = scan->type;
-							last->next = NULL;
-						}
-					}
-				}
-				else
-				{
-					/* Validate Reducer */					
-					XASSERT(sub->kind == MAPRED_REDUCER);
-
-					/* 
-					 * source is the set of input columns that the reducer has
-					 * to work with.  
-					 *
-					 * Loop the reducer "keys" clause to determine what keys are
-					 * present.  
-					 */
-					last = NULL;
-					for (keys = sub->u.reducer.keys; keys; keys = keys->next)
-					{
-						/*
-						 * If there is a '*' in the keys then it catches all
-						 * unreferenced columns.
-						 */
-						if (keys->value[0] == '*' && keys->value[1] == '\0')
-						{
-							/* 
-							 * Add all sources not found in either parameters, 
-							 * or explicitly mentioned in keys
-							 */
-							for (scan = source; scan; scan = scan->next)
-							{
-								mapred_plist_t *pscan;
-								mapred_clist_t *kscan;
-
-								for (pscan = sub->u.reducer.parameters; 
-									 pscan; 
-									 pscan = pscan->next)
-								{
-									if (!strcasecmp(scan->name, pscan->name))
-										break;
-								}
-								if (pscan)
-									continue;   /* found in parameters */
-								for (kscan = sub->u.reducer.keys; 
-									 kscan; 
-									 kscan = kscan->next)
-								{
-									if (!strcasecmp(scan->name, kscan->value))
-										break;
-								}
-								if (kscan)
-									continue;   /* found in keys */
-
-								/* we have an unmatched source, add to grouping */
-								if (!last)
-								{
-									obj->u.task.grouping = 
-										mapred_malloc(sizeof(mapred_plist_t));
-									last = obj->u.task.grouping;
-								}
-								else
-								{
-									last->next = 
-										mapred_malloc(sizeof(mapred_plist_t));
-									last = last->next;
-								}
-								last->name = scan->name;
-								last->type = scan->type;
-								last->next = NULL;
-							}
-						}
-						else
-						{
-							/* Look for the referenced key in the source list */
-							for (scan = source; scan; scan = scan->next)
-								if (!strcasecmp(keys->value, scan->name))
-								{
-									/* we have a match, add the key to grouping */
-									if (!last)
-									{
-										obj->u.task.grouping = 
-											mapred_malloc(sizeof(mapred_plist_t));
-										last = obj->u.task.grouping;
-									}
-									else
-									{
-										last->next = 
-											mapred_malloc(sizeof(mapred_plist_t));
-										last = last->next;
-									}
-									last->name = scan->name;
-									last->type = scan->type;
-									last->next = NULL;
-									break;
-								}
-						}
-					}
-				}
-			}
-			
-			/*
-			 * If there is a reducer then the "returns" columns are the 
-			 * output of the reducer, and must be unioned with the grouping 
-			 * columns for final output.
-			 *
-			 * If there is no reducer then the returns columns are the
-			 * returns columns of the mapper or the input
-			 */
-			if (obj->u.task.reducer.name)
-			{
-				/*
-				 * If it is a built in function then we'll just fall into the
-				 * default of a single text column named "value". 
-				 */
-				sub = obj->u.task.reducer.object;
-				if (sub)
-					obj->u.task.returns = sub->u.reducer.returns;
-
-			}
-			else if (obj->u.task.mapper.name)
-			{
-				sub = obj->u.task.mapper.object;
-				if (sub)
-					obj->u.task.returns = sub->u.function.returns;
-			}
-			else
-			{
-				obj->u.task.returns = obj->u.task.parameters;
-			}
-
-			if (!obj->u.task.returns)
-			{
-				/* 
-				 * If unable to determine the returns based on the reducer 
-				 * components (generally due to use of SQL functions) then 
-				 * use the default of a single text column named "value".
-				 */
-				obj->u.task.returns = mapred_malloc(sizeof(mapred_plist_t));
-				obj->u.task.returns->name = "value";
-				obj->u.task.returns->type = "text";
-				obj->u.task.returns->next = NULL;
-			}
-			break;
-		}
-
-		default:
-			XASSERT(false);
-	}
-}
-
-void mapred_resolve_ref(mapred_olist_t *olist, mapred_reference_t *ref)
-{
-	XASSERT(ref);
-	if (!ref->name)
-		return;
-
-	/* Scan the list of objects until we find one with a matching name */
-	for (; olist; olist = olist->next)
-	{
-		if (olist->object->name && !strcasecmp(ref->name, olist->object->name))
-		{
-			ref->object = olist->object;
-			return;
-		}
-	}
-}
-
-/* Some basic destructors */
-void mapred_destroy_object(mapred_object_t **objh)
-{
-	mapred_object_t *obj;
-
-	/* 
-	 * We are passed a handle to the object, get the actual pointer and point
-	 * the handle to NULL so that it is not stale once we free the list below.
-	 */
-	if (!objh || !*objh)
-		return;
-	obj = *objh;
-	*objh = (mapred_object_t *) NULL;
-	
-	/* What fields are valid is dependent on what kind of object it is */
-	scalarfree(obj->name);
-	switch (obj->kind)
-	{
-		case MAPRED_NO_KIND:
-			break;
-
-		case MAPRED_DOCUMENT:
-			scalarfree(obj->u.document.version);
-			scalarfree(obj->u.document.database);
-			scalarfree(obj->u.document.user);
-			scalarfree(obj->u.document.host);
-			mapred_destroy_olist(&obj->u.document.objects);
-			mapred_destroy_olist(&obj->u.document.execute);
-			break;
-
-		case MAPRED_INPUT:
-			scalarfree(obj->u.input.desc);
-			scalarfree(obj->u.input.delimiter);
-			scalarfree(obj->u.input.encoding);
-			mapred_destroy_clist(&obj->u.input.files);
-			mapred_destroy_plist(&obj->u.input.columns);
-			break;
-
-		case MAPRED_OUTPUT:
-			scalarfree(obj->u.output.desc);
-			break;
-
-		case MAPRED_MAPPER:
-		case MAPRED_TRANSITION:
-		case MAPRED_COMBINER:
-		case MAPRED_FINALIZER:
-			scalarfree(obj->u.function.body);
-			scalarfree(obj->u.function.language);
-			mapred_destroy_plist(&obj->u.function.parameters);
-			
-			if( obj->internal &&
-					obj->u.function.internal_returns != obj->u.function.returns )
-				mapred_destroy_plist(&obj->u.function.internal_returns);
-
-			mapred_destroy_plist(&obj->u.function.returns);
-			break;
-
-		case MAPRED_REDUCER:
-			scalarfree(obj->u.reducer.transition.name);
-			scalarfree(obj->u.reducer.combiner.name);
-			scalarfree(obj->u.reducer.finalizer.name);
-			scalarfree(obj->u.reducer.initialize);
-			break;
-
-		case MAPRED_TASK:
-		case MAPRED_EXECUTION:
-			scalarfree(obj->u.task.input.name);
-			scalarfree(obj->u.task.mapper.name);
-			scalarfree(obj->u.task.reducer.name);
-			scalarfree(obj->u.task.output.name);
-			break;
-
-		/*
-		 * ADT just borrowed the parameter list from the owning function,
-		 * so it has nothing else to delete.
-		 */
-		case MAPRED_ADT:
-			break;
-
-		default:
-			XASSERT(false);
-	}
-}
-
-void mapred_destroy_olist(mapred_olist_t **olisth)
-{
-	mapred_olist_t *olist;
-	mapred_olist_t *next;
-
-	/* 
-	 * We are passed a handle to the olist, get the actual pointer and point
-	 * the handle to NULL so that it is not stale once we free the list below.
-	 */
-	if (!olisth || !*olisth)
-		return;
-	olist = *olisth;
-	*olisth = (mapred_olist_t *) NULL;
-
-	/* Walk the list destroying each item as we come to it. */
-	while (olist)
-	{
-		mapred_destroy_object(&olist->object);
-		next = olist->next;
-		mapred_free(olist);
-		olist = next;
-	}
-}
-
-
-void mapred_destroy_clist(mapred_clist_t **clisth)
-{
-	mapred_clist_t *clist;
-	mapred_clist_t *next;
-
-	/* 
-	 * We are passed a handle to the olist, get the actual pointer and point
-	 * the handle to NULL so that it is not stale once we free the list below.
-	 */
-	if (!clisth || !*clisth)
-		return;
-	clist = *clisth;
-	*clisth = (mapred_clist_t *) NULL;
-
-	/* Walk the list destroying each item as we come to it. */
-	while (clist)
-	{
-		scalarfree(clist->value);
-		next = clist->next;
-		mapred_free(clist);
-		clist = next;
-	}
-}
-
-void mapred_destroy_plist(mapred_plist_t **plisth)
-{
-	mapred_plist_t *plist;
-	mapred_plist_t *next;
-
-	/* 
-	 * We are passed a handle to the olist, get the actual pointer and point
-	 * the handle to NULL so that it is not stale once we free the list below.
-	 */
-	if (!plisth || !*plisth)
-		return;
-	plist = *plisth;
-	*plisth = (mapred_plist_t *) NULL;
-
-	/* Walk the list destroying each item as we come to it. */
-	while (plist)
-	{
-		scalarfree(plist->name);
-		scalarfree(plist->type);
-		next = plist->next;
-		mapred_free(plist);
-		plist = next;
-	}
-}
-
-
-
-
-/* -------------------------------------------------------------------------- */
-/* Functions that get things done                                             */
-/* -------------------------------------------------------------------------- */
-void mapred_run_queries(PGconn *conn, mapred_document_t *doc)
-{
-	mapred_olist_t  *olist;
-	mapred_plist_t  *columns;
-	mapred_object_t *output;
-	PGresult        *result  = NULL;
-	FILE            *outfile = stdout;
-	buffer_t        *buffer  = NULL;
-
-	XTRY 
-	{
-		/* allocates 512 bytes, extending by 512 bytes if we run out. */
-		buffer = makebuffer(512, 512);
-		
-		/* Loop through all objects */
-		for (olist = doc->objects; olist; olist = olist->next)
-		{
-			if (olist->object->kind == MAPRED_EXECUTION)
-			{
-				boolean exists = false;
-
-				XASSERT(olist->object->name);
-
-				/* Reset the buffer from any previous executions */
-				bufreset(buffer);
-				
-				output = olist->object->u.task.output.object;
-
-				/*
-				 *  [CREATE TABLE <name> AS ]
-				 *    SELECT * FROM <name>
-				 *    ORDER BY <column-list>
-				 */
-				if (output && output->u.output.type == MAPRED_OUTPUT_TABLE)
-				{
-					/* does the table already exist? */
-					bufcat(&buffer, 
-						   "SELECT n.nspname \n"
-						   "FROM   pg_catalog.pg_class c JOIN \n"
-						   "       pg_catalog.pg_namespace n on \n"
-						   "       (c.relnamespace = n.oid) \n"
-						   "WHERE  n.nspname = ANY(current_schemas(true)) \n"
-						   "  AND  c.relname = lower('");
-					bufcat(&buffer, output->u.output.desc);
-					bufcat(&buffer, "')");
-					result = PQexec(conn, buffer->buffer);
-					if (PQresultStatus(result) == PGRES_TUPLES_OK &&
-						PQntuples(result) > 0)
-						exists = true;
-					bufreset(buffer);
-
-					if (exists && output->u.output.mode == MAPRED_OUTPUT_MODE_REPLACE)
-					{
-						bufcat(&buffer, "DROP TABLE ");
-						bufcat(&buffer, output->u.output.desc);
-						PQexec(conn, "SAVEPOINT mapreduce_save");
-						result = PQexec(conn, buffer->buffer);
-						if (PQresultStatus(result) == PGRES_COMMAND_OK)
-						{
-							PQexec(conn, "RELEASE SAVEPOINT mapreduce_save");
-						}
-						else
-						{
-							/* rollback to savepoint */
-							PQexec(conn, "ROLLBACK TO SAVEPOINT mapreduce_save");
-							PQexec(conn, "RELEASE SAVEPOINT mapreduce_save");
-
-							if (global_verbose_flag)
-								fprintf(stderr, "   - ");
-							fprintf(stderr, "Error: %s\n",
-									PQresultErrorField(result, PG_DIAG_MESSAGE_PRIMARY));
-							mapred_obj_error(output, "Table '%s' can't be replaced",
-											 output->u.output.desc);
-							XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-						}
-						bufreset(buffer);
-						exists = false;
-					}
-
-					/* Handle Explain for OUTPUT TABLE */
-					if (global_explain_flag & global_analyze)
-						bufcat(&buffer, "EXPLAIN ANALYZE ");
-					else if (global_explain_flag)
-						bufcat(&buffer, "EXPLAIN ");
-
-					if (!exists)
-					{
-						bufcat(&buffer, "CREATE TABLE ");
-						bufcat(&buffer, output->u.output.desc);
-						bufcat(&buffer, " AS ");
-					}
-					else if (output->u.output.mode == MAPRED_OUTPUT_MODE_APPEND)
-					{
-						bufcat(&buffer, "INSERT INTO ");
-						bufcat(&buffer, output->u.output.desc);
-						bufcat(&buffer, " (");
-					}
-					else 
-					{
-						/* exists, mode is neither replace or append => error */
-						mapred_obj_error(output, "Table '%s' already exists",
-										 output->u.output.desc);
-						XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-					}
-				}
-				/* Handle Explain for non-table output */
-				else if (global_explain_flag & global_analyze)
-				{
-					bufcat(&buffer, "EXPLAIN ANALYZE ");
-				}
-				else if (global_explain_flag)
-				{
-					bufcat(&buffer, "EXPLAIN ");
-				}
-
-				bufcat(&buffer, "SELECT * FROM ");
-				bufcat(&buffer, olist->object->name);
-
-				/* 
-				 * add the DISTRIBUTED BY clause for output tables
-				 * OR, the ORDER BY clause for other output formats
-				 */
-				if (output && output->u.output.type == MAPRED_OUTPUT_TABLE)
-				{
-
-					/* 
-					 * If there are no key columns then leave off the
-					 * distributed by clause and let the server choose.
-					 */
-					if (exists)
-						bufcat(&buffer, ")");
-
-					else if (olist->object->u.task.grouping)
-					{
-						bufcat(&buffer, " DISTRIBUTED BY (");
-						columns = olist->object->u.task.grouping;
-						while (columns)
-						{
-							bufcat(&buffer, columns->name);
-							if (columns->next)
-								bufcat(&buffer, ", ");
-							columns = columns->next;				   
-						}
-						bufcat(&buffer, ")");
-					}
-					else
-					{
-						/* 
-						 * don't have any hints for what the distribution keys
-						 * should be, so we do nothing and let the database 
-						 * decide
-						 */
-					}
-				}
-				else
-				{
-					if (olist->object->u.task.returns ||
-						olist->object->u.task.grouping)
-					{
-						bufcat(&buffer, " ORDER BY ");
-						columns = olist->object->u.task.grouping;
-						while (columns)
-						{
-							bufcat(&buffer, columns->name);
-							if (columns->next || olist->object->u.task.returns)
-								bufcat(&buffer, ", ");
-							columns = columns->next;	   
-						}
-						columns = olist->object->u.task.returns;
-						while (columns)
-						{
-							bufcat(&buffer, columns->name);
-							if (columns->next)
-								bufcat(&buffer, ", ");
-							columns = columns->next;			   
-						}
-					}
-				}
-				bufcat(&buffer, ";\n");
-
-				/* Tell the user what job we are running */
-				if (global_verbose_flag)
-					fprintf(stderr, "  - RUN: ");
-				if (global_print_flag || global_debug_flag)
-					fprintf(stderr, "%s", buffer->buffer);
-				else
-					fprintf(stderr, "%s\n", olist->object->name);
-
-				/* But we only execute it if we are not in "print-only" mode */
-				if (!global_print_flag)
-				{
-					/* If we have an output file, open it for write now */
-					if (output && output->u.output.type == MAPRED_OUTPUT_FILE)
-					{
-						switch (output->u.output.mode)
-						{
-							case MAPRED_OUTPUT_MODE_NONE:
-								/* check if the file exists */
-								if (access(output->u.output.desc, F_OK) == 0)
-								{
-									mapred_obj_error(output, "file '%s' already exists",
-													 output->u.output.desc);
-									XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-								}
-								/* Fallthrough */
-
-							case MAPRED_OUTPUT_MODE_REPLACE:
-								outfile = fopen(output->u.output.desc, "wb");
-								break;
-
-							case MAPRED_OUTPUT_MODE_APPEND:
-								outfile = fopen(output->u.output.desc, "ab");
-								break;
-
-							default:
-								XASSERT(false);
-						}
-
-						if (!outfile)
-						{
-							mapred_obj_error(output, "could not open file '%s' for write",
-											 output->u.output.desc);
-							XRAISE(MAPRED_PARSE_ERROR, "Object creation Failure");
-						}
-					}
-					else
-					{
-						outfile = stdout;
-					}
-
-					/* 
-					 * Enable notices for user queries since they may contain 
-					 * debugging info. 
-					 */
-					PQsetNoticeReceiver(conn, print_notice_handler, NULL);
-					result = PQexec(conn, buffer->buffer);
-					PQsetNoticeReceiver(conn, ignore_notice_handler, NULL);
-					switch (PQresultStatus(result))
-					{
-						/* Output is STDOUT or FILE */
-						case  PGRES_TUPLES_OK:
-						{
-							PQprintOpt options;
-							memset(&options, 0, sizeof(options));
-
-							/* 
-							 * Formating:
-							 *   STDOUT = fancy formating
-							 *   FILE   = plain formating
-							 */
-							if (outfile == stdout)
-							{
-								options.header = true;
-								options.align  = true;
-								options.fieldSep  = "|";
-							}
-							else if (output->u.output.delimiter)
-							{
-								options.fieldSep = output->u.output.delimiter;
-							}
-							else
-							{
-								/* "\t" is our default delimiter */
-								options.fieldSep  = "\t";
-							}
-						
-							PQprint(outfile, result, &options);
-							break;
-						}
-						
-						/* OUTPUT is a table */
-						case PGRES_COMMAND_OK:
-							fprintf(stderr, "DONE\n");
-							break;
-
-						/* An error of some kind */
-						default:
-							XRAISE(MAPRED_SQL_ERROR, "Execution Failure");
-					}
-					PQclear(result);
-					result = NULL;
-
-					if (NULL != outfile && outfile != stdout)
-					{
-						fclose(outfile);
-						outfile = stdout;
-					}
-				}
-			}
-		}
-	}
-	XFINALLY
-	{
-		if (result)
-			PQclear(result);
-					
-		if (NULL != outfile && outfile != stdout)
-		{
-			fclose(outfile);
-			outfile = stdout;
-		}
-
-		if (buffer)
-			mapred_free(buffer);
-	}
-	XTRY_END;
-}
-
-
-
-
-boolean mapred_create_object(PGconn *conn, mapred_document_t *doc, 
-							 mapred_object_t *obj)
-{
-	mapred_clist_t *clist    = NULL;
-	mapred_plist_t *plist    = NULL;
-	mapred_plist_t *plist2   = NULL;
-	const char     *ckind    = NULL;
-	buffer_t       *buffer   = NULL;
-	buffer_t       *qbuffer  = NULL;
-	PGresult       *result   = NULL;
-
-	/* If the object was created in a prior pass, then do nothing */
-	if (obj->created)
-		return true;
-
-	/* Otherwise attempt to create the object */
-	XTRY
-	{
-		/* allocates 1024 bytes, extending by 1024 bytes if we run out */
-		buffer = makebuffer(1024, 1024);
-
-		switch (obj->kind)
-		{
-			case MAPRED_INPUT:
-				XASSERT(obj->name);
-
-				switch (obj->u.input.type)
-				{
-					case MAPRED_INPUT_TABLE:
-						/* Nothing to actually create */
-						obj->created = true;
-						break;  
-
-					case MAPRED_INPUT_FILE:
-					case MAPRED_INPUT_GPFDIST:
-						XASSERT(obj->u.input.files);
-
-						/* Allocate and produce buffer */
-						bufcat(&buffer, "CREATE EXTERNAL TABLE ");
-						bufcat(&buffer, doc->prefix);
-						bufcat(&buffer, obj->name);
-						bufcat(&buffer, "(");
-						for (plist = obj->u.input.columns; 
-							 plist; 
-							 plist = plist->next)
-						{
-							bufcat(&buffer, plist->name);
-							bufcat(&buffer, " ");
-							bufcat(&buffer, plist->type);
-							if (plist->next)
-								bufcat(&buffer, ", ");
-						}
-						bufcat(&buffer, ")\n");
-						bufcat(&buffer, "  LOCATION(");
-						for (clist = obj->u.input.files; 
-							 clist; 
-							 clist = clist->next)
-						{
-							char *domain_port, *path, *p = NULL;
-
-							if (obj->u.input.type == MAPRED_INPUT_GPFDIST)
-								bufcat(&buffer, "'gpfdist://");
-							else
-								bufcat(&buffer, "'file://");
-
-							/*
-							 * The general syntax of a URL is    scheme://domain:port/path?query_string#fragment_id
-							 * clist->value should contain just           domain:port/path?query_string#fragment_id
-							 */
-							p = strchr(clist->value, '/');
-							if (p == NULL)
-							{
-								mapred_obj_error(obj, "Failed to find '/' indicating start of path (%s)",
-												 clist->value);
-								XRAISE(MAPRED_PARSE_ERROR,
-									   "Invalid INPUT source specification");
-							}
-							if (p == clist->value)
-							{
-								mapred_obj_error(obj, "Missing domain and port before '/' indicating start of path (%s)",
-												 clist->value);
-								XRAISE(MAPRED_PARSE_ERROR,
-									   "Invalid INPUT source specification");
-							}
-							domain_port = clist->value;
-							path        = p+1;
-
-							/* 
-							 * Overwrite the / separating the domain:port from the path 
-							 * with a nul and move back one byte to check for a trailing ':'.
-							 * We put the / back in when copying into the destination buffer.
-							 */
-							*p-- = '\0';
-
-							if (strlen(path) < 1)
-							{
-								mapred_obj_error(obj, "Missing path after '/' (%s)",
-												 clist->value);
-								XRAISE(MAPRED_PARSE_ERROR,
-									   "Invalid INPUT source specification");
-							}
-
-							/*
-							 * We allow a trailing ':'  (e.g. host:/filepath) 
-							 * but we must not copy it into the external table url.
-							 */
-							if (*p == ':')
-								*p = '\0';
-
-							if (strlen(domain_port) < 1)
-							{
-								mapred_obj_error(obj, "Missing host before '/' (%s)",
-												 clist->value);
-								XRAISE(MAPRED_PARSE_ERROR,
-									   "Invalid INPUT source specification");
-							}
-
-							bufcat(&buffer, domain_port);
-							bufcat(&buffer, "/");
-							bufcat(&buffer, path);
-							if (clist->next)
-								bufcat(&buffer, "',\n           ");
-						}
-						bufcat(&buffer, "')\n");
-						if (obj->u.input.format == MAPRED_FORMAT_CSV)
-							bufcat(&buffer, "  FORMAT 'CSV'");
-						else
-							bufcat(&buffer, "  FORMAT 'TEXT'");
-						if (obj->u.input.delimiter || 
-							obj->u.input.escape    || 
-							obj->u.input.quote     || 
-							obj->u.input.null)
-						{
-							bufcat(&buffer, " ( ");
-							if (obj->u.input.delimiter)
-							{
-								bufcat(&buffer, "DELIMITER '");
-								bufcat(&buffer, obj->u.input.delimiter);
-								bufcat(&buffer, "' ");
-							}
-							if (obj->u.input.escape)
-							{
-								bufcat(&buffer, "ESCAPE '");
-								bufcat(&buffer, obj->u.input.escape);
-								bufcat(&buffer, "' ");
-							}
-							if (obj->u.input.quote)
-							{
-								bufcat(&buffer, "QUOTE '");
-								bufcat(&buffer, obj->u.input.quote);
-								bufcat(&buffer, "' ");
-							}
-							if (obj->u.input.null)
-							{
-								bufcat(&buffer, "NULL '");
-								bufcat(&buffer, obj->u.input.null);
-								bufcat(&buffer, "' ");
-							}
-							bufcat(&buffer, ")");
-						}
-						
-						if (obj->u.input.error_limit > 0)
-						{
-							char intbuf[11];
-							snprintf(intbuf, 11, "%d", 
-									 obj->u.input.error_limit);
-
-							bufcat(&buffer, "\n  SEGMENT REJECT LIMIT ");
-							bufcat(&buffer, intbuf);
-						}
-
-						bufcat(&buffer, ";\n\n");
-						break;
-
-					case MAPRED_INPUT_EXEC:
-						XASSERT(obj->u.input.desc);
-
-						bufcat(&buffer, "CREATE EXTERNAL WEB TABLE ");
-						bufcat(&buffer, doc->prefix);
-						bufcat(&buffer, obj->name);
-						bufcat(&buffer, "(");
-						for (plist = obj->u.input.columns; 
-							 plist; 
-							 plist = plist->next)
-						{
-							bufcat(&buffer, plist->name);
-							bufcat(&buffer, " ");
-							bufcat(&buffer, plist->type);
-							if (plist->next)
-								bufcat(&buffer, ", ");
-						}
-						bufcat(&buffer, ")\n");
-						bufcat(&buffer, "EXECUTE '");
-						bufcat(&buffer, obj->u.input.desc);
-						bufcat(&buffer, "'\n");
-						if (obj->u.input.format == MAPRED_FORMAT_CSV)
-							bufcat(&buffer, "  FORMAT 'CSV'");
-						else
-							bufcat(&buffer, "  FORMAT 'TEXT'");
-						if (obj->u.input.delimiter || 
-							obj->u.input.quote     || 
-							obj->u.input.null)
-						{
-							bufcat(&buffer, " ( ");
-							if (obj->u.input.delimiter)
-							{
-								bufcat(&buffer, "DELIMITER '");
-								bufcat(&buffer, obj->u.input.delimiter);
-								bufcat(&buffer, "' ");
-							}
-							if (obj->u.input.quote)
-							{
-								bufcat(&buffer, "QUOTE '");
-								bufcat(&buffer, obj->u.input.quote);
-								bufcat(&buffer, "' ");
-							}
-							if (obj->u.input.null)
-							{
-								bufcat(&buffer, "NULL '");
-								bufcat(&buffer, obj->u.input.null);
-								bufcat(&buffer, "' ");
-							}
-							bufcat(&buffer, ")");
-						}
-
-						if (obj->u.input.error_limit > 0)
-						{
-							char intbuf[11];
-							snprintf(intbuf, 11, "%d", 
-									 obj->u.input.error_limit);
-
-							bufcat(&buffer, "\n  SEGMENT REJECT LIMIT ");
-							bufcat(&buffer, intbuf);
-						}
-						bufcat(&buffer, ";\n\n");
-						break;
-
-					case MAPRED_INPUT_QUERY:
-						XASSERT(obj->u.input.desc);
-
-						/* 
-						 *  CREATE TEMPORARY VIEW <name> AS 
-						 *  <desc>;
-						 */
-						bufcat(&buffer, "CREATE TEMPORARY VIEW ");
-						bufcat(&buffer, obj->name);
-						bufcat(&buffer, " AS\n");
-						bufcat(&buffer, obj->u.input.desc);
-						bufcat(&buffer, ";\n\n");
-						break;
-
-					case MAPRED_INPUT_NONE:
-					default:
-						XASSERT(false);
-				}
-				if (global_print_flag || global_debug_flag)
-					printf("-- INPUT %s\n", obj->name);
-				break;
-
-			case MAPRED_OUTPUT:
-				/* 
-				 * Outputs have no backend objects created directly.
-				 * For output tables we may issue a create table as
-				 * select, but that occurs at run-time.
-				 */
-				obj->created = true;
-				mapred_setup_columns(conn, obj);
-				break;
-
-				/*
-				 * The function types have different defaults and generate
-				 * slightly different error messages, but basically do the
-				 * same thing.  
-				 */
-			case MAPRED_MAPPER:
-			case MAPRED_TRANSITION:
-			case MAPRED_COMBINER:
-			case MAPRED_FINALIZER:
-				ckind = mapred_kind_name[obj->kind];
-
-				XASSERT(obj->name);
-
-				/*
-				 * 'kind' specific initialization accomplished above, now handle
-				 * the generic function creation.
-				 */
-				if (global_print_flag || global_debug_flag)
-					printf("-- %s %s\n", ckind, obj->name);
-
-				/* 
-				 * Nothing to do if we already looked up the function in the
-				 * catalog.
-				 */
-				if (obj->internal)
-				{
-					obj->created = true;
-					break;
-				}
-
-				/* Non-internal functions should have these defined */
-				XASSERT(obj->u.function.body);
-				XASSERT(obj->u.function.language);
-
-				mapred_setup_columns(conn, obj);
-				XASSERT(obj->u.function.parameters);
-				XASSERT(obj->u.function.rtype.name);
-				XASSERT(NULL == obj->u.function.internal_returns);
-
-				/* 
-				 * fill in the buffer:
-				 *
-				 *    CREATE FUNCTION <name>(<parameters>)
-				 *    RETURNS [SETOF] <rtype> LANGUAGE <lang> AS
-				 *    $$
-				 *    <body>
-				 *    $$ [STRICT] [IMMUTABLE];
-				 *     
-				 */
-				bufcat(&buffer, "CREATE FUNCTION ");
-				bufcat(&buffer, doc->prefix);
-				bufcat(&buffer, obj->name);
-				bufcat(&buffer, "(");
-
-				/* Handle parameter list */
-				for (plist = obj->u.function.parameters; 
-					 plist; 
-					 plist = plist->next)
-				{
-					bufcat(&buffer, plist->name);
-					bufcat(&buffer, " ");
-					bufcat(&buffer, plist->type);
-					if (plist->next)
-						bufcat(&buffer, ", ");
-				}
-
-				/* Handle Return clause */
-				bufcat(&buffer, ")\nRETURNS ");
-				if (obj->u.function.mode == MAPRED_MODE_MULTI)
-					bufcat(&buffer, "SETOF ");
-				bufcat(&buffer, obj->u.function.rtype.name);
-
-				/* 
-				 * Handle LANGUAGE clause, every langauge but 'C' and 'SQL'
-				 * has 'pl' prefixing it
-				 */
-				if (!strcasecmp("C", obj->u.function.language) ||
-					!strcasecmp("SQL", obj->u.function.language) ||
-					!strncasecmp("PL", obj->u.function.language, 2))
-				{
-					bufcat(&buffer, " LANGUAGE ");
-					bufcat(&buffer, obj->u.function.language);
-				}
-				else
-				{
-					bufcat(&buffer, " LANGUAGE pl");
-					bufcat(&buffer, obj->u.function.language);
-				}
-			
-				/* python only has an untrusted form */
-				if (!strcasecmp("python", obj->u.function.language))
-					bufcat(&buffer, "u");
-
-				
-				bufcat(&buffer, " AS ");
-
-				/* 
-				 * Handle procedural language specific formatting for the
-				 * function definition.
-				 *
-				 * C language functions are defined using the two parameter
-				 * form:  AS "library", "function".
-				 *
-				 * Perl functions append the yaml file line number via a
-				 *  #line declaration.
-				 *
-				 * Python functions try to append the yaml file line number
-				 * by inserting a bunch of newlines.  (only works for runtime
-				 * errors, not compiletime errors).
-				 */
-				if (!strcasecmp("C", obj->u.function.language))
-				{
-					bufcat(&buffer, "$$");
-					bufcat(&buffer, obj->u.function.library);
-					bufcat(&buffer, "$$, $$");
-					bufcat(&buffer, obj->u.function.body);
-					bufcat(&buffer, "$$");
-				}
-				else if (!strncasecmp("plperl", obj->u.function.language, 6) ||
-						 !strncasecmp("perl",   obj->u.function.language, 4))
-				{
-					char lineno[10];
-					snprintf(lineno, sizeof(lineno), "%d", obj->u.function.lineno);
-					bufcat(&buffer, "$$\n#line ");
-					bufcat(&buffer, lineno);
-					bufcat(&buffer, "\n");
-					bufcat(&buffer, obj->u.function.body);
-					if (buffer->buffer[buffer->position-1] != '\n')
-						bufcat(&buffer, "\n");
-					bufcat(&buffer, "$$");
-				}
-				else if (!strncasecmp("plpython", obj->u.function.language, 8) ||
-						 !strncasecmp("python",   obj->u.function.language, 6))
-				{
-					/*
-					 * Python very stuborn about not letting you manually 
-					 * adjust line number.  So instead we take the stupid route
-					 * and just insert N newlines. 
-					*/
-					int i;
-					bufcat(&buffer, "$$\n");
-					for (i = 1; i < obj->u.function.lineno-2; i++)
-						bufcat(&buffer, "\n");
-					bufcat(&buffer, obj->u.function.body);
-					if (buffer->buffer[buffer->position-1] != '\n')
-						bufcat(&buffer, "\n");
-					bufcat(&buffer, "$$");					
-				}
-				else 
-				{
-					/* Some generic other language, take our best guess */
-					bufcat(&buffer, "$$");
-					bufcat(&buffer, obj->u.function.body);
-					bufcat(&buffer, "$$");
-				}
-
-				/* Handle options */
-				if (obj->u.function.flags & mapred_function_strict)
-					bufcat(&buffer, " STRICT");
-				if (obj->u.function.flags & mapred_function_immutable)
-					bufcat(&buffer, " IMMUTABLE");
-				
-				/* All done */
-				bufcat(&buffer, ";\n\n");
-				break;
-			
-
-			case MAPRED_REDUCER:
-			{
-				mapred_object_t *transition = obj->u.reducer.transition.object;
-				mapred_object_t *combiner   = obj->u.reducer.combiner.object;
-				mapred_object_t *finalizer  = obj->u.reducer.finalizer.object;
-				char *state;
-
-				XASSERT(obj->name);
-				XASSERT(transition);
-				XASSERT(transition->name);
-			
-				/* 
-				 * If the reducer depends on an object that hasn't be created
-				 * then return false, it will be resolved during a second pass
-				 */
-				if ((transition && !transition->created) ||
-					(combiner   && !combiner->created)   ||
-					(finalizer  && !finalizer->created))
-				{
-					if (global_print_flag && global_debug_flag)
-						printf("-- defering REDUCE %s\n", obj->name);
-					break;
-				}
-				if (global_print_flag || global_debug_flag)
-					printf("-- REDUCE %s\n", obj->name);
-
-				/* Now, set things up to create the thing */
-				mapred_setup_columns(conn, obj);
-				plist = transition->u.function.parameters;
-				XASSERT(plist);          /* state */
-				XASSERT(plist->next);    /* parameters */
-
-				if (obj->u.reducer.ordering)
-					bufcat(&buffer, "CREATE ORDERED AGGREGATE ");
-				else
-					bufcat(&buffer, "CREATE AGGREGATE ");
-				bufcat(&buffer, doc->prefix);
-				bufcat(&buffer, obj->name);
-				bufcat(&buffer, " (");
-
-				/* 
-				 * Get the state type, and write out the aggregate parameters 
-				 * based on the parameter list of the transition function.
-				 */
-				plist = transition->u.function.parameters;
-				state = plist->type;
-				for (plist = plist->next; plist; plist = plist->next)
-				{
-					bufcat(&buffer, plist->type);
-					if (plist->next)
-						bufcat(&buffer, ", ");
-				}
-				bufcat(&buffer, ") (\n");
-				bufcat(&buffer, "  stype = ");
-				bufcat(&buffer, state);
-				if (obj->u.reducer.initialize)
-				{
-					bufcat(&buffer, ",\n  initcond = '");
-					bufcat(&buffer, obj->u.reducer.initialize);
-					bufcat(&buffer, "'");
-				}
-				bufcat(&buffer, ",\n  sfunc = ");
-				if (!transition->internal)
-					bufcat(&buffer, doc->prefix);
-				bufcat(&buffer, transition->name);
-				if (combiner)
-				{
-					bufcat(&buffer, ",\n  prefunc = ");
-					if (!combiner->internal)
-						bufcat(&buffer, doc->prefix);
-					bufcat(&buffer, combiner->name);
-				}
-
-				/*
-				 * To handle set returning finalizers the finalizer is pushed
-				 * into the task definition rather than being placed in the
-				 * uda where it belongs.
-				 */
-				/*
-				 if (obj->u.reducer.finalizer.name)
-				 {
-				    bufcat(&buffer, ",\n  finalfunc = ");
-				    bufcat(&buffer, obj->u.reducer.finalizer.name);
-				 }
-				*/
-
-				bufcat(&buffer, "\n);\n\n");
-				break;
-			}
-
-			case MAPRED_TASK:
-			case MAPRED_EXECUTION:
-			{
-				mapred_object_t *input    = obj->u.task.input.object;
-				mapred_object_t *mapper   = obj->u.task.mapper.object;
-				mapred_object_t *reducer  = obj->u.task.reducer.object;
-				mapred_plist_t  *columns  = NULL;
-				mapred_plist_t  *ingrouping = NULL;
-				mapred_plist_t  *newitem  = NULL;
-				mapred_plist_t  *grouping = NULL;
-				mapred_plist_t  *last     = NULL;
-				mapred_plist_t  *scan     = NULL;
-				buffer_t        *swap;
-
-				if (!obj->u.task.execute)
-					XASSERT(obj->name);
-				XASSERT(obj->u.task.input.name);
-
-				if (!qbuffer)
-					qbuffer = makebuffer(1024, 1024);
-				else
-					bufreset(qbuffer);
-				
-				/* 
-				 * If the task depends on an object that hasn't be created then
-				 * return false, it will be resolved during a second pass
-				 */
-				if ((input   && !input->created)  ||
-					(mapper  && !mapper->created) ||
-					(reducer && !reducer->created))
-				{
-					if (global_print_flag && global_debug_flag)
-					{
-						if (obj->u.task.execute)
-							printf("-- defering EXECUTION\n");
-						else
-							printf("-- defering TASK %s\n", obj->name);
-					}
-					break;
-				}
-
-				if (global_print_flag || global_debug_flag)
-				{
-					if (obj->u.task.execute)
-						printf("-- EXECUTION\n");
-					else
-						printf("-- TASK %s\n", obj->name);
-				}
-
-				/* 
-				 * 1) Handle the INPUT, two cases:
-				 *   1a) There is no MAP/REDUCE:  "SELECT * FROM <input>"
-				 *   1b) There is a MAP and/or REDUCE:  "<input>"
-				 */
-				mapred_setup_columns(conn, obj);
-				if (!obj->u.task.mapper.name && !obj->u.task.reducer.name)
-				{
-					/* Allocate the buffer for the input. */
-					if (input->u.input.type == MAPRED_INPUT_TABLE)
-					{
-						bufcat(&qbuffer, "SELECT * FROM ");
-						bufcat(&qbuffer, input->u.input.desc);
-					}
-					else
-					{
-						bufcat(&qbuffer, "SELECT * FROM ");
-						bufcat(&qbuffer, input->name);
-					}
-				}
-				else
-				{
-					/* Input is just the name or description of the input */
-					if (input->u.input.type == MAPRED_INPUT_TABLE)
-						bufcat(&qbuffer, input->u.input.desc);
-					else
-						bufcat(&qbuffer, input->name);
-				}
-
-				/* 
-				 * How we get the columns depends a bit on the input.
-				 * Is the input actually an "MAPRED_INPUT" object, or is it
-				 * a "MAPRED_TASK" object?
-				 */
-				switch (input->kind)
-				{
-					case MAPRED_INPUT:
-						columns = input->u.input.columns;
-						break;
-
-					case MAPRED_TASK:
-						columns    = input->u.task.returns;
-						ingrouping = input->u.task.grouping;
-					
-						if (!columns)
-						{
-							mapred_obj_error(obj, "Unable to determine return "
-											 "columns for TASK '%s'",
-											 obj->u.task.input.name);
-							XRAISE(MAPRED_PARSE_INTERNAL, NULL);
-						}
-						break;
-
-					default:
-						mapred_obj_error(obj, "SOURCE '%s' is not an INPUT or "
-										 "TASK object",
-										 obj->u.task.input.name);
-						XRAISE(MAPRED_PARSE_ERROR, "Object creation Error");
-						break;
-				}
-				XASSERT(columns);
-				
-				/*
-				 * 2) Handle the MAPPER, two cases
-				 *  2a) The Mapper returns an generated ADT that needs extraction
-				 *           "SELECT key(m), ... 
-				 *            FROM (SELECT <map(...) as m FROM <input>) mapsubq
-				 *  2b) The Mapper returns a single column:
-				 *           "SELECT <map>(...) FROM <input>"
-				 */
-				XASSERT(mapper || !obj->u.task.mapper.name);
-				if (mapper)
-				{
-					plist = mapper->u.function.returns;
-					plist2 = mapper->u.function.internal_returns;
-					XASSERT(plist);
-
-					if (plist->next)
-					{ /* 2a */
-						bufcat(&buffer, "SELECT ");
-						for (; plist; plist = plist->next )
-						{
-							if( obj->internal )


<TRUNCATED>


[04/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/include/Makefile
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/include/Makefile b/src/bin/gpmapreduce/yaml-0.1.1/include/Makefile
deleted file mode 100644
index 53a92bb..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/include/Makefile
+++ /dev/null
@@ -1,415 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# include/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/yaml
-pkglibdir = $(libdir)/yaml
-pkgincludedir = $(includedir)/yaml
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i386-apple-darwin9.4.0
-host_triplet = i386-apple-darwin9.4.0
-subdir = include
-DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(includedir)"
-nobase_includeHEADERS_INSTALL = $(install_sh_DATA)
-HEADERS = $(nobase_include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run automake-1.9
-AWK = awk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DOXYGEN = false
-DOXYGEN_FALSE = 
-DOXYGEN_TRUE = #
-ECHO = /bin/echo
-ECHO_C = \c
-ECHO_N = 
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-F77 = gfortran
-FFLAGS = -g -O2
-GREP = /usr/bin/grep
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run makeinfo
-OBJEXT = o
-PACKAGE = yaml
-PACKAGE_BUGREPORT = http://pyyaml.org/newticket?component=libyaml
-PACKAGE_NAME = yaml
-PACKAGE_STRING = yaml 0.1.1
-PACKAGE_TARNAME = yaml
-PACKAGE_VERSION = 0.1.1
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 0.1.1
-YAML_LT_AGE = 0
-YAML_LT_CURRENT = 1
-YAML_LT_RELEASE = 0
-YAML_LT_REVISION = 0
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = gfortran
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i386-apple-darwin9.4.0
-build_alias = 
-build_cpu = i386
-build_os = darwin9.4.0
-build_vendor = apple
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = i386-apple-darwin9.4.0
-host_alias = 
-host_cpu = i386
-host_os = darwin9.4.0
-host_vendor = apple
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(install_sh) -d
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-INCLUDES = yaml.h
-DOXYGEN_CFG = $(top_srcdir)/doc/doxygen.cfg
-nobase_include_HEADERS = $(INCLUDES)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  include/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  include/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-nobase_includeHEADERS: $(nobase_include_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
-	@$(am__vpath_adj_setup) \
-	list='$(nobase_include_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  $(am__vpath_adj) \
-	  echo " $(nobase_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \
-	  $(nobase_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \
-	done
-
-uninstall-nobase_includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@$(am__vpath_adj_setup) \
-	list='$(nobase_include_HEADERS)'; for p in $$list; do \
-	  $(am__vpath_adj) \
-	  echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(includedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-local distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-nobase_includeHEADERS
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-nobase_includeHEADERS
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool ctags dist-hook distclean distclean-generic \
-	distclean-libtool distclean-local distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man \
-	install-nobase_includeHEADERS install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-nobase_includeHEADERS
-
-
-#html: $(INCLUDES) $(DOXYGEN_CFG)
-#	PACKAGE=$(PACKAGE) VERSION=$(VERSION) top_srcdir=$(top_srcdir) top_builddir=$(top_builddir) doxygen $(DOXYGEN_CFG)
-
-distclean-local:
-	-rm -rf $(top_builddir)/doc/html
-
-dist-hook: html
-	cp -a $(top_builddir)/doc/html $(top_distdir)/doc
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:


[02/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/api.Plo
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/api.Plo b/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/api.Plo
deleted file mode 100644
index e3acc69..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/api.Plo
+++ /dev/null
@@ -1,95 +0,0 @@
-api.lo api.o: api.c yaml_private.h ../config.h ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/machine/limits.h \
-  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
-  /usr/include/sys/syslimits.h
-
-yaml_private.h:
-
-../config.h:
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/sys/syslimits.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/dumper.Plo
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/dumper.Plo b/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/dumper.Plo
deleted file mode 100644
index ef4b2c5..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/dumper.Plo
+++ /dev/null
@@ -1,95 +0,0 @@
-dumper.lo dumper.o: dumper.c yaml_private.h ../config.h ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/machine/limits.h \
-  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
-  /usr/include/sys/syslimits.h
-
-yaml_private.h:
-
-../config.h:
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/sys/syslimits.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/emitter.Plo
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/emitter.Plo b/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/emitter.Plo
deleted file mode 100644
index 2b335e3..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/emitter.Plo
+++ /dev/null
@@ -1,96 +0,0 @@
-emitter.lo emitter.o: emitter.c yaml_private.h ../config.h \
-  ../include/yaml.h /usr/include/stdlib.h /usr/include/available.h \
-  /usr/include/_types.h /usr/include/sys/_types.h \
-  /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
-  /usr/include/i386/_types.h /usr/include/sys/wait.h \
-  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
-  /usr/include/machine/signal.h /usr/include/i386/signal.h \
-  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
-  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
-  /usr/include/sys/resource.h /usr/include/machine/endian.h \
-  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
-  /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/machine/limits.h \
-  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
-  /usr/include/sys/syslimits.h
-
-yaml_private.h:
-
-../config.h:
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/sys/syslimits.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/loader.Plo
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/loader.Plo b/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/loader.Plo
deleted file mode 100644
index 75fddfc..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/loader.Plo
+++ /dev/null
@@ -1,95 +0,0 @@
-loader.lo loader.o: loader.c yaml_private.h ../config.h ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/machine/limits.h \
-  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
-  /usr/include/sys/syslimits.h
-
-yaml_private.h:
-
-../config.h:
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/sys/syslimits.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/parser.Plo
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/parser.Plo b/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/parser.Plo
deleted file mode 100644
index 40c92dd..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/parser.Plo
+++ /dev/null
@@ -1,95 +0,0 @@
-parser.lo parser.o: parser.c yaml_private.h ../config.h ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/machine/limits.h \
-  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
-  /usr/include/sys/syslimits.h
-
-yaml_private.h:
-
-../config.h:
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/sys/syslimits.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/reader.Plo
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/reader.Plo b/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/reader.Plo
deleted file mode 100644
index 88190d2..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/reader.Plo
+++ /dev/null
@@ -1,95 +0,0 @@
-reader.lo reader.o: reader.c yaml_private.h ../config.h ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/machine/limits.h \
-  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
-  /usr/include/sys/syslimits.h
-
-yaml_private.h:
-
-../config.h:
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/sys/syslimits.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/scanner.Plo
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/scanner.Plo b/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/scanner.Plo
deleted file mode 100644
index 6477168..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/scanner.Plo
+++ /dev/null
@@ -1,96 +0,0 @@
-scanner.lo scanner.o: scanner.c yaml_private.h ../config.h \
-  ../include/yaml.h /usr/include/stdlib.h /usr/include/available.h \
-  /usr/include/_types.h /usr/include/sys/_types.h \
-  /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
-  /usr/include/i386/_types.h /usr/include/sys/wait.h \
-  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
-  /usr/include/machine/signal.h /usr/include/i386/signal.h \
-  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
-  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
-  /usr/include/sys/resource.h /usr/include/machine/endian.h \
-  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
-  /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/machine/limits.h \
-  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
-  /usr/include/sys/syslimits.h
-
-yaml_private.h:
-
-../config.h:
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/sys/syslimits.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/writer.Plo
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/writer.Plo b/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/writer.Plo
deleted file mode 100644
index 376630e..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/src/.deps/writer.Plo
+++ /dev/null
@@ -1,95 +0,0 @@
-writer.lo writer.o: writer.c yaml_private.h ../config.h ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h \
-  /usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/machine/limits.h \
-  /usr/include/i386/limits.h /usr/include/i386/_limits.h \
-  /usr/include/sys/syslimits.h
-
-yaml_private.h:
-
-../config.h:
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/limits.h:
-
-/usr/lib/gcc/i686-apple-darwin9/4.0.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/machine/limits.h:
-
-/usr/include/i386/limits.h:
-
-/usr/include/i386/_limits.h:
-
-/usr/include/sys/syslimits.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/src/Makefile
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/src/Makefile b/src/bin/gpmapreduce/yaml-0.1.1/src/Makefile
deleted file mode 100644
index 48d2d6b..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/src/Makefile
+++ /dev/null
@@ -1,470 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# src/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/yaml
-pkglibdir = $(libdir)/yaml
-pkgincludedir = $(includedir)/yaml
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i386-apple-darwin9.4.0
-host_triplet = i386-apple-darwin9.4.0
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libyaml_la_LIBADD =
-am_libyaml_la_OBJECTS = api.lo reader.lo scanner.lo parser.lo \
-	loader.lo writer.lo emitter.lo dumper.lo
-libyaml_la_OBJECTS = $(am_libyaml_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libyaml_la_SOURCES)
-DIST_SOURCES = $(libyaml_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run automake-1.9
-AWK = awk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DOXYGEN = false
-DOXYGEN_FALSE = 
-DOXYGEN_TRUE = #
-ECHO = /bin/echo
-ECHO_C = \c
-ECHO_N = 
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-F77 = gfortran
-FFLAGS = -g -O2
-GREP = /usr/bin/grep
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run makeinfo
-OBJEXT = o
-PACKAGE = yaml
-PACKAGE_BUGREPORT = http://pyyaml.org/newticket?component=libyaml
-PACKAGE_NAME = yaml
-PACKAGE_STRING = yaml 0.1.1
-PACKAGE_TARNAME = yaml
-PACKAGE_VERSION = 0.1.1
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 0.1.1
-YAML_LT_AGE = 0
-YAML_LT_CURRENT = 1
-YAML_LT_RELEASE = 0
-YAML_LT_REVISION = 0
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = gfortran
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i386-apple-darwin9.4.0
-build_alias = 
-build_cpu = i386
-build_os = darwin9.4.0
-build_vendor = apple
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = i386-apple-darwin9.4.0
-host_alias = 
-host_cpu = i386
-host_os = darwin9.4.0
-host_vendor = apple
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(install_sh) -d
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-AM_CPPFLAGS = -I$(top_srcdir)/include
-lib_LTLIBRARIES = libyaml.la
-libyaml_la_SOURCES = yaml_private.h api.c reader.c scanner.c parser.c loader.c writer.c emitter.c dumper.c
-libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libyaml.la: $(libyaml_la_OBJECTS) $(libyaml_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libyaml_la_LDFLAGS) $(libyaml_la_OBJECTS) $(libyaml_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/api.Plo
-include ./$(DEPDIR)/dumper.Plo
-include ./$(DEPDIR)/emitter.Plo
-include ./$(DEPDIR)/loader.Plo
-include ./$(DEPDIR)/parser.Plo
-include ./$(DEPDIR)/reader.Plo
-include ./$(DEPDIR)/scanner.Plo
-include ./$(DEPDIR)/writer.Plo
-
-.c.o:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c $<
-
-.c.obj:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-libLTLIBRARIES
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-deconstructor-alt.Po
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-deconstructor-alt.Po b/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-deconstructor-alt.Po
deleted file mode 100644
index 5911967..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-deconstructor-alt.Po
+++ /dev/null
@@ -1,71 +0,0 @@
-example-deconstructor-alt.o example-deconstructor-alt.o:  \
- example-deconstructor-alt.c ../include/yaml.h /usr/include/stdlib.h \
-  /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-deconstructor.Po
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-deconstructor.Po b/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-deconstructor.Po
deleted file mode 100644
index 5bb7d45..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-deconstructor.Po
+++ /dev/null
@@ -1,71 +0,0 @@
-example-deconstructor.o example-deconstructor.o: example-deconstructor.c \
-  ../include/yaml.h /usr/include/stdlib.h /usr/include/available.h \
-  /usr/include/_types.h /usr/include/sys/_types.h \
-  /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
-  /usr/include/i386/_types.h /usr/include/sys/wait.h \
-  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
-  /usr/include/machine/signal.h /usr/include/i386/signal.h \
-  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
-  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
-  /usr/include/sys/resource.h /usr/include/machine/endian.h \
-  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
-  /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-reformatter-alt.Po
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-reformatter-alt.Po b/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-reformatter-alt.Po
deleted file mode 100644
index be2a19c..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-reformatter-alt.Po
+++ /dev/null
@@ -1,71 +0,0 @@
-example-reformatter-alt.o example-reformatter-alt.o:  \
- example-reformatter-alt.c ../include/yaml.h /usr/include/stdlib.h \
-  /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-reformatter.Po
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-reformatter.Po b/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-reformatter.Po
deleted file mode 100644
index 8e586be..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/example-reformatter.Po
+++ /dev/null
@@ -1,71 +0,0 @@
-example-reformatter.o example-reformatter.o: example-reformatter.c \
-  ../include/yaml.h /usr/include/stdlib.h /usr/include/available.h \
-  /usr/include/_types.h /usr/include/sys/_types.h \
-  /usr/include/sys/cdefs.h /usr/include/machine/_types.h \
-  /usr/include/i386/_types.h /usr/include/sys/wait.h \
-  /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
-  /usr/include/machine/signal.h /usr/include/i386/signal.h \
-  /usr/include/i386/_structs.h /usr/include/sys/_structs.h \
-  /usr/include/machine/_structs.h /usr/include/mach/i386/_structs.h \
-  /usr/include/sys/resource.h /usr/include/machine/endian.h \
-  /usr/include/i386/endian.h /usr/include/sys/_endian.h \
-  /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-dumper.Po
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-dumper.Po b/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-dumper.Po
deleted file mode 100644
index 51ffd2e..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-dumper.Po
+++ /dev/null
@@ -1,72 +0,0 @@
-run-dumper.o run-dumper.o: run-dumper.c ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-emitter.Po
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-emitter.Po b/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-emitter.Po
deleted file mode 100644
index f8828da..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-emitter.Po
+++ /dev/null
@@ -1,72 +0,0 @@
-run-emitter.o run-emitter.o: run-emitter.c ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-loader.Po
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-loader.Po b/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-loader.Po
deleted file mode 100644
index ecbf6ef..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-loader.Po
+++ /dev/null
@@ -1,72 +0,0 @@
-run-loader.o run-loader.o: run-loader.c ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-parser.Po
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-parser.Po b/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-parser.Po
deleted file mode 100644
index b5b9ba2..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-parser.Po
+++ /dev/null
@@ -1,72 +0,0 @@
-run-parser.o run-parser.o: run-parser.c ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-scanner.Po
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-scanner.Po b/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-scanner.Po
deleted file mode 100644
index b421d8a..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/tests/.deps/run-scanner.Po
+++ /dev/null
@@ -1,72 +0,0 @@
-run-scanner.o run-scanner.o: run-scanner.c ../include/yaml.h \
-  /usr/include/stdlib.h /usr/include/available.h /usr/include/_types.h \
-  /usr/include/sys/_types.h /usr/include/sys/cdefs.h \
-  /usr/include/machine/_types.h /usr/include/i386/_types.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.h \
-  /usr/include/machine/endian.h /usr/include/i386/endian.h \
-  /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
-  /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
-  /usr/include/machine/types.h /usr/include/i386/types.h \
-  /usr/include/stdio.h /usr/include/string.h /usr/include/assert.h
-
-../include/yaml.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/available.h:
-
-/usr/include/_types.h:
-
-/usr/include/sys/_types.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/machine/_types.h:
-
-/usr/include/i386/_types.h:
-
-/usr/include/sys/wait.h:
-
-/usr/include/sys/signal.h:
-
-/usr/include/sys/appleapiopts.h:
-
-/usr/include/machine/signal.h:
-
-/usr/include/i386/signal.h:
-
-/usr/include/i386/_structs.h:
-
-/usr/include/sys/_structs.h:
-
-/usr/include/machine/_structs.h:
-
-/usr/include/mach/i386/_structs.h:
-
-/usr/include/sys/resource.h:
-
-/usr/include/machine/endian.h:
-
-/usr/include/i386/endian.h:
-
-/usr/include/sys/_endian.h:
-
-/usr/include/libkern/_OSByteOrder.h:
-
-/usr/include/libkern/i386/_OSByteOrder.h:
-
-/usr/include/alloca.h:
-
-/usr/include/machine/types.h:
-
-/usr/include/i386/types.h:
-
-/usr/include/stdio.h:
-
-/usr/include/string.h:
-
-/usr/include/assert.h:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/tests/Makefile
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/tests/Makefile b/src/bin/gpmapreduce/yaml-0.1.1/tests/Makefile
deleted file mode 100644
index 4d93c65..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/tests/Makefile
+++ /dev/null
@@ -1,608 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# tests/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/yaml
-pkglibdir = $(libdir)/yaml
-pkgincludedir = $(includedir)/yaml
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i386-apple-darwin9.4.0
-host_triplet = i386-apple-darwin9.4.0
-check_PROGRAMS = test-version$(EXEEXT) test-reader$(EXEEXT)
-noinst_PROGRAMS = run-scanner$(EXEEXT) run-parser$(EXEEXT) \
-	run-loader$(EXEEXT) run-emitter$(EXEEXT) run-dumper$(EXEEXT) \
-	example-reformatter$(EXEEXT) example-reformatter-alt$(EXEEXT) \
-	example-deconstructor$(EXEEXT) \
-	example-deconstructor-alt$(EXEEXT)
-subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-example_deconstructor_SOURCES = example-deconstructor.c
-example_deconstructor_OBJECTS = example-deconstructor.$(OBJEXT)
-example_deconstructor_LDADD = $(LDADD)
-example_deconstructor_DEPENDENCIES = $(top_builddir)/src/libyaml.la
-example_deconstructor_alt_SOURCES = example-deconstructor-alt.c
-example_deconstructor_alt_OBJECTS =  \
-	example-deconstructor-alt.$(OBJEXT)
-example_deconstructor_alt_LDADD = $(LDADD)
-example_deconstructor_alt_DEPENDENCIES =  \
-	$(top_builddir)/src/libyaml.la
-example_reformatter_SOURCES = example-reformatter.c
-example_reformatter_OBJECTS = example-reformatter.$(OBJEXT)
-example_reformatter_LDADD = $(LDADD)
-example_reformatter_DEPENDENCIES = $(top_builddir)/src/libyaml.la
-example_reformatter_alt_SOURCES = example-reformatter-alt.c
-example_reformatter_alt_OBJECTS = example-reformatter-alt.$(OBJEXT)
-example_reformatter_alt_LDADD = $(LDADD)
-example_reformatter_alt_DEPENDENCIES = $(top_builddir)/src/libyaml.la
-run_dumper_SOURCES = run-dumper.c
-run_dumper_OBJECTS = run-dumper.$(OBJEXT)
-run_dumper_LDADD = $(LDADD)
-run_dumper_DEPENDENCIES = $(top_builddir)/src/libyaml.la
-run_emitter_SOURCES = run-emitter.c
-run_emitter_OBJECTS = run-emitter.$(OBJEXT)
-run_emitter_LDADD = $(LDADD)
-run_emitter_DEPENDENCIES = $(top_builddir)/src/libyaml.la
-run_loader_SOURCES = run-loader.c
-run_loader_OBJECTS = run-loader.$(OBJEXT)
-run_loader_LDADD = $(LDADD)
-run_loader_DEPENDENCIES = $(top_builddir)/src/libyaml.la
-run_parser_SOURCES = run-parser.c
-run_parser_OBJECTS = run-parser.$(OBJEXT)
-run_parser_LDADD = $(LDADD)
-run_parser_DEPENDENCIES = $(top_builddir)/src/libyaml.la
-run_scanner_SOURCES = run-scanner.c
-run_scanner_OBJECTS = run-scanner.$(OBJEXT)
-run_scanner_LDADD = $(LDADD)
-run_scanner_DEPENDENCIES = $(top_builddir)/src/libyaml.la
-test_reader_SOURCES = test-reader.c
-test_reader_OBJECTS = test-reader.$(OBJEXT)
-test_reader_LDADD = $(LDADD)
-test_reader_DEPENDENCIES = $(top_builddir)/src/libyaml.la
-test_version_SOURCES = test-version.c
-test_version_OBJECTS = test-version.$(OBJEXT)
-test_version_LDADD = $(LDADD)
-test_version_DEPENDENCIES = $(top_builddir)/src/libyaml.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = example-deconstructor.c example-deconstructor-alt.c \
-	example-reformatter.c example-reformatter-alt.c run-dumper.c \
-	run-emitter.c run-loader.c run-parser.c run-scanner.c \
-	test-reader.c test-version.c
-DIST_SOURCES = example-deconstructor.c example-deconstructor-alt.c \
-	example-reformatter.c example-reformatter-alt.c run-dumper.c \
-	run-emitter.c run-loader.c run-parser.c run-scanner.c \
-	test-reader.c test-version.c
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run automake-1.9
-AWK = awk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DOXYGEN = false
-DOXYGEN_FALSE = 
-DOXYGEN_TRUE = #
-ECHO = /bin/echo
-ECHO_C = \c
-ECHO_N = 
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-F77 = gfortran
-FFLAGS = -g -O2
-GREP = /usr/bin/grep
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run makeinfo
-OBJEXT = o
-PACKAGE = yaml
-PACKAGE_BUGREPORT = http://pyyaml.org/newticket?component=libyaml
-PACKAGE_NAME = yaml
-PACKAGE_STRING = yaml 0.1.1
-PACKAGE_TARNAME = yaml
-PACKAGE_VERSION = 0.1.1
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 0.1.1
-YAML_LT_AGE = 0
-YAML_LT_CURRENT = 1
-YAML_LT_RELEASE = 0
-YAML_LT_REVISION = 0
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = gfortran
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i386-apple-darwin9.4.0
-build_alias = 
-build_cpu = i386
-build_os = darwin9.4.0
-build_vendor = apple
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = i386-apple-darwin9.4.0
-host_alias = 
-host_cpu = i386
-host_os = darwin9.4.0
-host_vendor = apple
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(install_sh) -d
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-AM_CPPFLAGS = -I$(top_srcdir)/include
-#AM_CFLAGS = -Wno-pointer-sign
-LDADD = $(top_builddir)/src/libyaml.la
-TESTS = test-version test-reader
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  tests/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  tests/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-example-deconstructor$(EXEEXT): $(example_deconstructor_OBJECTS) $(example_deconstructor_DEPENDENCIES) 
-	@rm -f example-deconstructor$(EXEEXT)
-	$(LINK) $(example_deconstructor_LDFLAGS) $(example_deconstructor_OBJECTS) $(example_deconstructor_LDADD) $(LIBS)
-example-deconstructor-alt$(EXEEXT): $(example_deconstructor_alt_OBJECTS) $(example_deconstructor_alt_DEPENDENCIES) 
-	@rm -f example-deconstructor-alt$(EXEEXT)
-	$(LINK) $(example_deconstructor_alt_LDFLAGS) $(example_deconstructor_alt_OBJECTS) $(example_deconstructor_alt_LDADD) $(LIBS)
-example-reformatter$(EXEEXT): $(example_reformatter_OBJECTS) $(example_reformatter_DEPENDENCIES) 
-	@rm -f example-reformatter$(EXEEXT)
-	$(LINK) $(example_reformatter_LDFLAGS) $(example_reformatter_OBJECTS) $(example_reformatter_LDADD) $(LIBS)
-example-reformatter-alt$(EXEEXT): $(example_reformatter_alt_OBJECTS) $(example_reformatter_alt_DEPENDENCIES) 
-	@rm -f example-reformatter-alt$(EXEEXT)
-	$(LINK) $(example_reformatter_alt_LDFLAGS) $(example_reformatter_alt_OBJECTS) $(example_reformatter_alt_LDADD) $(LIBS)
-run-dumper$(EXEEXT): $(run_dumper_OBJECTS) $(run_dumper_DEPENDENCIES) 
-	@rm -f run-dumper$(EXEEXT)
-	$(LINK) $(run_dumper_LDFLAGS) $(run_dumper_OBJECTS) $(run_dumper_LDADD) $(LIBS)
-run-emitter$(EXEEXT): $(run_emitter_OBJECTS) $(run_emitter_DEPENDENCIES) 
-	@rm -f run-emitter$(EXEEXT)
-	$(LINK) $(run_emitter_LDFLAGS) $(run_emitter_OBJECTS) $(run_emitter_LDADD) $(LIBS)
-run-loader$(EXEEXT): $(run_loader_OBJECTS) $(run_loader_DEPENDENCIES) 
-	@rm -f run-loader$(EXEEXT)
-	$(LINK) $(run_loader_LDFLAGS) $(run_loader_OBJECTS) $(run_loader_LDADD) $(LIBS)
-run-parser$(EXEEXT): $(run_parser_OBJECTS) $(run_parser_DEPENDENCIES) 
-	@rm -f run-parser$(EXEEXT)
-	$(LINK) $(run_parser_LDFLAGS) $(run_parser_OBJECTS) $(run_parser_LDADD) $(LIBS)
-run-scanner$(EXEEXT): $(run_scanner_OBJECTS) $(run_scanner_DEPENDENCIES) 
-	@rm -f run-scanner$(EXEEXT)
-	$(LINK) $(run_scanner_LDFLAGS) $(run_scanner_OBJECTS) $(run_scanner_LDADD) $(LIBS)
-test-reader$(EXEEXT): $(test_reader_OBJECTS) $(test_reader_DEPENDENCIES) 
-	@rm -f test-reader$(EXEEXT)
-	$(LINK) $(test_reader_LDFLAGS) $(test_reader_OBJECTS) $(test_reader_LDADD) $(LIBS)
-test-version$(EXEEXT): $(test_version_OBJECTS) $(test_version_DEPENDENCIES) 
-	@rm -f test-version$(EXEEXT)
-	$(LINK) $(test_version_LDFLAGS) $(test_version_OBJECTS) $(test_version_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/example-deconstructor-alt.Po
-include ./$(DEPDIR)/example-deconstructor.Po
-include ./$(DEPDIR)/example-reformatter-alt.Po
-include ./$(DEPDIR)/example-reformatter.Po
-include ./$(DEPDIR)/run-dumper.Po
-include ./$(DEPDIR)/run-emitter.Po
-include ./$(DEPDIR)/run-loader.Po
-include ./$(DEPDIR)/run-parser.Po
-include ./$(DEPDIR)/run-scanner.Po
-include ./$(DEPDIR)/test-reader.Po
-include ./$(DEPDIR)/test-version.Po
-
-.c.o:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c $<
-
-.c.obj:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		echo "XPASS: $$tst"; \
-	      ;; \
-	      *) \
-		echo "PASS: $$tst"; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
-		xfail=`expr $$xfail + 1`; \
-		echo "XFAIL: $$tst"; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		echo "FAIL: $$tst"; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      echo "SKIP: $$tst"; \
-	    fi; \
-	  done; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
-	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
-	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  echo "$$dashes"; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
-	clean-noinstPROGRAMS mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool \
-	clean-noinstPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/test/regress/input/mapred.source
----------------------------------------------------------------------
diff --git a/src/test/regress/input/mapred.source b/src/test/regress/input/mapred.source
deleted file mode 100644
index c2b2c9f..0000000
--- a/src/test/regress/input/mapred.source
+++ /dev/null
@@ -1,235 +0,0 @@
---
--- map/reduce tests
---
--- Some notes: the PATH variable doesn't necessarily work correctly in
--- the regression context, so use the "gpwhich" token to get the full
--- path from your environment (see gpstringsubs for more details).  And
--- to make this work correctly with gpsourcify, you need to add your
--- gpwhich token to gptokencheck.
-
--- start_matchsubs
--- m|mapreduce_\d+_run|
--- s|mapreduce_\d+_run|mapreduce_PID_run|
--- end_matchsubs
-
---
--- This test makes use of plperlu
---
--- start_ignore
-
-create language plperlu;
-create language plpythonu;
-
--- Take a look at the installed languages, plperl and plpython should be in the list.
---  + pg_pltemplate contains the list of languages that can be simply installed
---  + pl_language contains the list of languages that are actually installed
-select * from pg_pltemplate;
-select lanname, lanispl, lanpltrusted from pg_language;
-
--- Check enviornment variables that should have been set by greenplum_path.sh
---
--- 1) We need to check these on all segments and on the master.
--- 2) We do this via external table rather than perl/python in case it is part
---    of the cause of a mis-installed plperl/plpython.
--- 3) It is normal for the master to have a slightly different enviornment from
---    the segments (but perhaps not desirable?)
---
-CREATE EXTERNAL WEB TABLE env_segment(var text, value text) 
-EXECUTE 'env | grep "^[^=]*=[^=]*$"' format 'text' (delimiter '=');
-CREATE EXTERNAL WEB TABLE env_master(var text, value text) 
-EXECUTE 'env | grep "^[^=]*=[^=]*$"' on master format 'text' (delimiter '=');
-CREATE VIEW env AS
-  SELECT gp_execution_segment(), * FROM env_segment
-  UNION ALL
-  SELECT gp_execution_segment(), * FROM env_master;
-
-SELECT * FROM env WHERE var in (
-	   'GPHOME', 
-	   'DYLD_LIBRARY_PATH', 
-	   'LD_LIBRARY_PATH', 
-	   'PATH'
-) ORDER BY var, gp_execution_segment;
-
--- end_ignore
-
---
--- Some checks to verify what versions of perl/python we have.
--- If everything has been configured correctly this should be constant
--- across all our installations.
---
--- All of these checks should return a single row because it should produce
--- a constant across all segments and the master.
---
--- The current expected version is 2.6.2
---
-CREATE OR REPLACE FUNCTION python_version() returns text as $$
-import sys
-return sys.version_info
-$$ language plpythonu;
-
-SELECT python_version() FROM env GROUP BY python_version;
-
---
--- Same check for perl version
---
--- Expected version is perl 5.008xxx
---
-CREATE OR REPLACE FUNCTION perl_version() returns text as $$
-return "Perl $]"
-$$ language plperlu;
-
--- ignore
-SELECT perl_version() FROM env GROUP BY perl_version;
-
-
---
--- The following two checks need to be put into big ignore blocks
--- because paths can be of differing lengths
---
--- start_ignore
-
-CREATE OR REPLACE FUNCTION python_path() returns text as $$
-import sys
-return sys.path[0]
-$$ language plpythonu;
-
-SELECT python_path() FROM env GROUP BY python_path;
-
-CREATE OR REPLACE FUNCTION perl_path() returns text as $$
-return join(':', @INC)
-$$ language plperlu;
-
-SELECT perl_path() FROM env GROUP BY perl_path;
-
--- end_ignore
-
---
--- Create a harness to run shell commands and output stderr and stdout
---
-CREATE OR REPLACE FUNCTION execute(cmd text) returns text as $$
-import subprocess
-p = subprocess.Popen(cmd, shell=True, 
-                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-r = p.communicate()
-header = "---------------------\n"
-return header + r[0]
-$$ LANGUAGE plpythonu;
-
---
--- Create a harness to run mapreduce jobs on the correct host/port
---
-CREATE OR REPLACE FUNCTION mapreduce(file text) returns setof text as $$
-import subprocess
-
-rv = plpy.execute("select hostname, port, user as user, " +
-   " current_database() as db from gp_segment_configuration where content=-1")
-
-cmd = ['@gpwhich_gpmapreduce@',
-       '--host=%s' % rv[0]['hostname'],
-       '--port=%s' % rv[0]['port'],
-       '--file=%s' % file,
-       rv[0]['db'], rv[0]['user'] ]
-p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-r = p.communicate()
-header = "---------------------"
-err = '\nSTDERR> '.join(('STDERR> ' + r[1]).split('\n')).replace('\t', '   ')
-out = 'STDOUT>\n' + r[0].replace('\t', ', ')
-return [header, err, out]
-$$ LANGUAGE plpythonu;
-
-CREATE OR REPLACE FUNCTION mapreduce(file text, keys text) returns setof text as $$
-import subprocess
-
-rv = plpy.execute("select hostname, port, user as user, " +
-   " current_database() as db from gp_segment_configuration where content=-1")
-
-cmd = ['@gpwhich_gpmapreduce@',
-       '--host=%s' % rv[0]['hostname'],
-       '--port=%s' % rv[0]['port'],
-       '--file=%s' % file,
-       rv[0]['db'], rv[0]['user'] ]
-for key in keys.split(';'):
-  cmd.append('--key=%s' % key)
-p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-r = p.communicate()
-header = "---------------------"
-err = '\nSTDERR> '.join(('STDERR> ' + r[1]).split('\n')).replace('\t', '   ')
-out = 'STDOUT>\n' + r[0].replace('\t', ', ')
-return [header, err, out]
-$$ LANGUAGE plpythonu;
-
---
--- CHECK 1) make sure plperlu is really installed:
---
--- Note: if not, you might need to 'export PG_LANG=true' and reconfigure/rebuild
---
-SELECT lanname, lanispl, lanpltrusted FROM pg_language WHERE lanname = 'plperlu';
-
---
--- Since many of these tests will end up having variable length output depending
--- on local paths we want to disable the "----" lines from psql so that our diffs
--- look reasonable.
---
--- The default is "aligned" if that ever changes then we need to change how we restore
--- it at the end of the test
-\pset format
-\pset format unaligned
-
---
--- Check 2) Find gpmapreduce and print the help file
---
--- ignore
-select execute( '@gpwhich_gpmapreduce@ --help' );
-
---
--- TEST 1) complain about missing file
---
-SELECT mapreduce('nosuchfile') ORDER BY 1;
-
-
---
--- TEST 2) Tests reading and sorting an input file;
---
-SELECT mapreduce('@abs_srcdir@/yml/sort.yml') ORDER BY 1;
-
-
---
--- TEST 3) Tests a basic map function and parameter passing
---
-SELECT mapreduce('@abs_srcdir@/yml/grep.yml', 'key=an') ORDER BY 1;
-
---
--- Test 4) Tests producing multiple columns
---
-SELECT mapreduce('@abs_srcdir@/yml/grep2.yml', 'key=an') ORDER BY 1;
-
---
--- Test 5) Tests a basic reduce function
---
-SELECT mapreduce('@abs_srcdir@/yml/agebracket.yml') ORDER BY 1;
-
---
--- Test 6) File Output tests
---
-SELECT execute('rm @abs_builddir@/results/fileout_*.out') ORDER BY 1;
-
-SELECT mapreduce('@abs_srcdir@/yml/fileout.yml') ORDER BY 1;
-SELECT execute('cat @abs_builddir@/results/fileout_none.out') ORDER BY 1;
-SELECT execute('cat @abs_builddir@/results/fileout_replace.out') ORDER BY 1;
-SELECT execute('cat @abs_builddir@/results/fileout_append.out') ORDER BY 1;
-
-SELECT mapreduce('@abs_srcdir@/yml/fileout.yml') ORDER BY 1;
-SELECT execute('cat @abs_builddir@/results/fileout_none.out') ORDER BY 1;
-SELECT execute('cat @abs_builddir@/results/fileout_replace.out') ORDER BY 1;
-SELECT execute('cat @abs_builddir@/results/fileout_append.out') ORDER BY 1;
-
-
--- 
--- Test 7) Perl syntax error lineno reporting
---
-SELECT mapreduce('@abs_srcdir@/yml/perlerror.yml') ORDER BY 1;
-
---
--- Cleanup) Restore normal formatting options
---
-\pset format aligned

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/test/regress/known_good_schedule
----------------------------------------------------------------------
diff --git a/src/test/regress/known_good_schedule b/src/test/regress/known_good_schedule
index aefdf79..2c1a5bd 100755
--- a/src/test/regress/known_good_schedule
+++ b/src/test/regress/known_good_schedule
@@ -172,7 +172,6 @@ ignore: notin
 ignore: with_clause
 ignore: eagerfree
 ignore: toast
-ignore: mapred
 ignore: gpparams
 ignore: tidycat
 ignore: tidycat2

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/test/regress/maketestschedule.py
----------------------------------------------------------------------
diff --git a/src/test/regress/maketestschedule.py b/src/test/regress/maketestschedule.py
index 8f884b0..1dc30d0 100755
--- a/src/test/regress/maketestschedule.py
+++ b/src/test/regress/maketestschedule.py
@@ -111,7 +111,7 @@ class EstimatedDurations:
                 ("tpch500GB", 0.72), ("partition", 75.95), ("appendonly", 47.16), ("aocs", 42.76),
                 ("gp_hashagg", 0.50), ("gp_dqa", 1.29), ("gpic", 28.78), ("gpic_bigtup", 7.08),
                 ("filter", 0.47), ("gpctas", 2.18), ("gpdist", 6.81), ("matrix", 0.35),
-                ("gpdtm_plpgsql", 52.83), ("notin", 1.21), ("toast", 0.95), ("mapred", 1.75),
+                ("gpdtm_plpgsql", 52.83), ("notin", 1.21), ("toast", 0.95),
                 ("gpparams", 1.10), ("upg2", 6.71), ("alter_distribution_policy", 44.76), ("ereport", 4.82),
                 ("gp_numeric_agg", 2.81), ("foreign_data", 1.51), ("gp_toolkit", 0.06),
                 ("column_compression", 5.5))



[03/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/libtool
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/libtool b/src/bin/gpmapreduce/yaml-0.1.1/libtool
deleted file mode 100755
index 55ef5c0..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/libtool
+++ /dev/null
@@ -1,7830 +0,0 @@
-#! /bin/sh
-
-# libtoolT - Provide generalized library-building support services.
-# Generated automatically by  (GNU yaml 0.1.1)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <go...@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED="/usr/bin/sed"
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="/usr/bin/sed -e 1s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# The names of the tagged configurations supported by this script.
-available_tags=" CXX F77"
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host maple:
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=yes
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
-
-# Whether or not to optimize for fast installation.
-fast_install=needless
-
-# The host system.
-host_alias=
-host=i386-apple-darwin9.4.0
-host_os=darwin9.4.0
-
-# The build system.
-build_alias=
-build=i386-apple-darwin9.4.0
-build_os=darwin9.4.0
-
-# An echo program that does not interpret backslashes.
-echo="/bin/echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# LTCC compiler flags.
-LTCFLAGS="-g -O2"
-
-# A language-specific compiler.
-CC="gcc"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# An ERE matcher.
-EGREP="/usr/bin/grep -E"
-
-# The linker used to build libraries.
-LD="/usr/libexec/gcc/i686-apple-darwin9/4.0.1/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -p"
-
-# A symbol stripping program
-STRIP="strip"
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="dlltool"
-
-# Used on cygwin: object dumper.
-OBJDUMP="objdump"
-
-# Used on cygwin: assembler.
-AS="as"
-
-# The name of the directory that contains temporary libtool files.
-objdir=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fno-common -DPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=196608
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=unknown
-
-# Whether dlopen of programs is supported.
-dlopen_self=unknown
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=""
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=""
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=""
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=darwin
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec="\${libname}\${release}\${versuffix}\$shared_ext \${libname}\${release}\${major}\$shared_ext \${libname}\$shared_ext"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${major}\$shared_ext"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring"
-archive_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[    ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs\$compiler_flags"
-module_expsym_cmds="sed -e \\\"s,#.*,,\\\" -e \\\"s,^[    ]*,,\\\" -e \\\"s,^\\\\(..*\\\\),_&,\\\" < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag  -o \$lib -bundle \$libobjs \$deplibs\$compiler_flags~nmedit -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-
-# Commands to strip libraries.
-old_striplib=""
-striplib="strip -x"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=""
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=""
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=""
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag="\${wl}-flat_namespace \${wl}-undefined \${wl}suppress"
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=""
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([BCDEGRST][BCDEGRST]*\\)[ 	][ 	]*_\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 _\\2 \\2/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=
-
-# This is the shared library path variable.
-shlibpath_var=DYLD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=yes
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=no
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec=""
-
-# If ld is used when linking, flag to hardcode $libdir into
-# a binary during linking. This must work even if $libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=""
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=yes
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH DYLD_LIBRARY_PATH  GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=yes
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /lib/i686-apple-darwin9/4.0.1/ /lib/ /usr/lib/i686-apple-darwin9/4.0.1/ /usr/lib/ /usr/lib/gcc/i686-apple-darwin9/4.0.1/ /usr/lib/gcc/i686-apple-darwin9/4.0.1/ /usr/lib/gcc/i686-apple-darwin9/4.0.1/../../../../i686-apple-darwin9/lib/i686-apple-darwin9/4.0.1/ /usr/lib/gcc/i686-apple-darwin9/4.0.1/../../../../i686-apple-darwin9/lib/ /usr/lib/gcc/i686-apple-darwin9/4.0.1/../../../i686-apple-darwin9/4.0.1/ /usr/lib/gcc/i686-apple-darwin9/4.0.1/../../../  /lib /usr/lib /usr/local/lib"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/usr/local/lib /lib /usr/lib"
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-# ### END LIBTOOL CONFIG
-
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <go...@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-4"
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
-  setopt NO_GLOB_SUBST
-fi
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  SP2NL='tr \040 \012'
-  NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  SP2NL='tr \100 \n'
-  NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-duplicate_deps=no
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-	# Failing that, at least try and use $RANDOM to avoid a race
-	my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-	save_mktempdir_umask=`umask`
-	umask 0077
-	$mkdir "$my_tmpdir"
-	umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || {
-        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
-	exit $EXIT_FAILURE
-      }
-    fi
-
-    $echo "X$my_tmpdir" | $Xsed
-}
-
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-
-    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
-    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
-    fi
-}
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-    my_status=""
-
-    $show "${rm}r $my_gentop"
-    $run ${rm}r "$my_gentop"
-    $show "$mkdir $my_gentop"
-    $run $mkdir "$my_gentop"
-    my_status=$?
-    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-      exit $my_status
-    fi
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
-
-      $show "${rm}r $my_xdir"
-      $run ${rm}r "$my_xdir"
-      $show "$mkdir $my_xdir"
-      $run $mkdir "$my_xdir"
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
-	exit $exit_status
-      fi
-      case $host in
-      *-darwin*)
-	$show "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	if test -z "$run"; then
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
-	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-	  if test -n "$darwin_arches"; then 
-	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      lipo -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    ${rm}r unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd "$darwin_orig_dir"
- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	fi # $run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-        ;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-    func_extract_archives_result="$my_oldobjs"
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-disable_libs=no
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $?
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $?
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $?
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag)
-    prevopt="--tag"
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-case $disable_libs in
-no) 
-  ;;
-shared)
-  build_libtool_libs=no
-  build_old_libs=yes
-  ;;
-static)
-  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-  ;;
-esac
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, and some SunOS ksh mistreat backslash-escaping
-      # in scan sets (worked around with variable expansion),
-      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
-      # at all, so we specify them separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    test "X$libobj" != "X$qlibobj" \
-	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
-	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo "$srcfile" > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	exit_status=$?
-	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $exit_status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    notinst_path= # paths that contain not-installed libtool libraries
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	darwin_framework|darwin_framework_skip)
-	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework|-arch|-isysroot)
-	case " $CC " in
-	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
-		prev=darwin_framework_skip ;;
-	  *) compiler_flags="$compiler_flags $arg"
-	     prev=darwin_framework ;;
-	esac
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    absdir="$dir"
-	    notinst_path="$notinst_path $dir"
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      -model)
-	compile_command="$compile_command $arg"
-	compiler_flags="$compiler_flags $arg"
-	finalize_command="$finalize_command $arg"
-	prev=xcompiler
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m* pass through architecture-specific compiler args for GCC
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -pg pass through profiling flag for GCC
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
-
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      exit_status=$?
-      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $exit_status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    valid_a_lib=no
-	    case $deplibs_check_method in
-	      match_pattern*)
-		set dummy $deplibs_check_method
-	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-		if eval $echo \"$deplib\" 2>/dev/null \
-		    | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		  valid_a_lib=yes
-		fi
-		;;
-	      pass_all)
-		valid_a_lib=yes
-		;;
-            esac
-	    if test "$valid_a_lib" != yes; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $absdir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes ; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null |
-                      $EGREP ": [^:]* bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f 

<TRUNCATED>


[17/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
HAWQ-100. Code Cleanup: gpmapreduce.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/4e392375
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/4e392375
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/4e392375

Branch: refs/heads/master
Commit: 4e392375e59d1cc8ce7a5fe2130c0d418ceaf011
Parents: 04c0f28
Author: rlei <rl...@pivotal.io>
Authored: Wed Nov 4 18:08:11 2015 +0800
Committer: rlei <rl...@pivotal.io>
Committed: Thu Nov 5 10:54:04 2015 +0800

----------------------------------------------------------------------
 src/all_src_files.txt                           |    12 -
 src/bin/gpmapreduce/.gitignore                  |     1 -
 src/bin/gpmapreduce/Makefile                    |    86 -
 src/bin/gpmapreduce/include/except.h            |   238 -
 src/bin/gpmapreduce/include/mapred.h            |   282 -
 src/bin/gpmapreduce/include/mapred_errors.h     |    32 -
 src/bin/gpmapreduce/include/parser.h            |   138 -
 src/bin/gpmapreduce/src/.gitignore              |     3 -
 src/bin/gpmapreduce/src/gettext.h               |   270 -
 src/bin/gpmapreduce/src/main.c                  |   567 -
 src/bin/gpmapreduce/src/mapred.c                |  4041 ----
 src/bin/gpmapreduce/src/parse.c                 |  2147 --
 src/bin/gpmapreduce/src/yaml_parse.y            |  1066 -
 src/bin/gpmapreduce/src/yaml_private.h          |   635 -
 src/bin/gpmapreduce/src/yaml_scan.l             |   138 -
 src/bin/gpmapreduce/test/Makefile               |   100 -
 src/bin/gpmapreduce/test/bin/fixup.pl           |   176 -
 src/bin/gpmapreduce/test/bin/mrdiff.pl          |   146 -
 .../gpmapreduce/test/data/ProductionJobs.txt    |    68 -
 src/bin/gpmapreduce/test/data/access_log        |   155 -
 src/bin/gpmapreduce/test/data/access_log2       |   150 -
 src/bin/gpmapreduce/test/data/email/email1.txt  |    23 -
 src/bin/gpmapreduce/test/data/email/email2.txt  |    40 -
 src/bin/gpmapreduce/test/data/email/spam1.txt   |    50 -
 src/bin/gpmapreduce/test/data/email/spam2.txt   |    55 -
 src/bin/gpmapreduce/test/data/raw.txt           |  1408 --
 src/bin/gpmapreduce/test/data/smalldoc.txt      |     5 -
 src/bin/gpmapreduce/test/data/www.small.dat     |   417 -
 src/bin/gpmapreduce/test/data/xml.dat           |     8 -
 src/bin/gpmapreduce/test/expected/DEFAULT.err   |     8 -
 src/bin/gpmapreduce/test/expected/DEFAULT.out   |     0
 .../test/expected/access_frequency.1            |    88 -
 .../test/expected/access_frequency.err          |     9 -
 .../test/expected/access_frequency.out          |     0
 src/bin/gpmapreduce/test/expected/bad.err       |   333 -
 src/bin/gpmapreduce/test/expected/bad.out       |     0
 src/bin/gpmapreduce/test/expected/badflow.err   |    24 -
 src/bin/gpmapreduce/test/expected/badflow.out   |     0
 src/bin/gpmapreduce/test/expected/badplperl.err |    18 -
 src/bin/gpmapreduce/test/expected/badplperl.out |     0
 .../gpmapreduce/test/expected/badplpython.err   |    21 -
 .../gpmapreduce/test/expected/badplpython.out   |     0
 src/bin/gpmapreduce/test/expected/badref.err    |    51 -
 src/bin/gpmapreduce/test/expected/badref.out    |     0
 src/bin/gpmapreduce/test/expected/builtin_1.1   |    26 -
 src/bin/gpmapreduce/test/expected/builtin_1.2   |    26 -
 src/bin/gpmapreduce/test/expected/builtin_1.3   |    26 -
 src/bin/gpmapreduce/test/expected/builtin_1.4   |    26 -
 src/bin/gpmapreduce/test/expected/builtin_1.5   |    26 -
 src/bin/gpmapreduce/test/expected/builtin_1.6   |    26 -
 src/bin/gpmapreduce/test/expected/builtin_1.err |    14 -
 .../test/expected/builtin_1.init.out            |     5 -
 src/bin/gpmapreduce/test/expected/builtin_1.out |     0
 .../test/expected/builtin_function.err          |    11 -
 .../test/expected/builtin_function.out          |   125 -
 .../test/expected/builtin_reducer.err           |    22 -
 .../test/expected/builtin_reducer.out           |    82 -
 src/bin/gpmapreduce/test/expected/c_function.1  |    26 -
 src/bin/gpmapreduce/test/expected/c_function.2  |    26 -
 src/bin/gpmapreduce/test/expected/c_function.3  |    26 -
 src/bin/gpmapreduce/test/expected/c_function.4  |    26 -
 .../gpmapreduce/test/expected/c_function.err    |    12 -
 .../gpmapreduce/test/expected/c_function.out    |     0
 src/bin/gpmapreduce/test/expected/columns.1     |     5 -
 src/bin/gpmapreduce/test/expected/columns.err   |    10 -
 src/bin/gpmapreduce/test/expected/columns.out   |     0
 src/bin/gpmapreduce/test/expected/graph.1       |    20 -
 src/bin/gpmapreduce/test/expected/graph.2       |   308 -
 src/bin/gpmapreduce/test/expected/graph.3       |   417 -
 src/bin/gpmapreduce/test/expected/graph.err     |    11 -
 src/bin/gpmapreduce/test/expected/graph.out     |     0
 src/bin/gpmapreduce/test/expected/grep.1        |     4 -
 src/bin/gpmapreduce/test/expected/grep.err      |     9 -
 src/bin/gpmapreduce/test/expected/grep.out      |     0
 src/bin/gpmapreduce/test/expected/grep_raw.err  |     9 -
 src/bin/gpmapreduce/test/expected/grep_raw.out  |    13 -
 src/bin/gpmapreduce/test/expected/input.1       |   417 -
 src/bin/gpmapreduce/test/expected/input.2       |   417 -
 src/bin/gpmapreduce/test/expected/input.3       |   417 -
 src/bin/gpmapreduce/test/expected/input.4       |   834 -
 .../gpmapreduce/test/expected/input.done.out    |    10 -
 src/bin/gpmapreduce/test/expected/input.err     |    14 -
 .../gpmapreduce/test/expected/input.init.out    |     5 -
 src/bin/gpmapreduce/test/expected/input.out     |     0
 src/bin/gpmapreduce/test/expected/join.1        | 12012 ----------
 src/bin/gpmapreduce/test/expected/join.err      |     9 -
 src/bin/gpmapreduce/test/expected/join.out      |     0
 src/bin/gpmapreduce/test/expected/kmeans.err    |     8 -
 src/bin/gpmapreduce/test/expected/kmeans.out    |     0
 .../gpmapreduce/test/expected/kmeans_done.out   |   711 -
 .../test/expected/member_kw.done.out            |    15 -
 src/bin/gpmapreduce/test/expected/member_kw.err |    16 -
 .../test/expected/member_kw.init.out            |     5 -
 src/bin/gpmapreduce/test/expected/member_kw.out |     0
 src/bin/gpmapreduce/test/expected/mode.err      |    12 -
 src/bin/gpmapreduce/test/expected/mode.out      |    62 -
 src/bin/gpmapreduce/test/expected/network.1     |    14 -
 src/bin/gpmapreduce/test/expected/network.err   |     9 -
 src/bin/gpmapreduce/test/expected/network.out   |     0
 src/bin/gpmapreduce/test/expected/ordering.1    |    75 -
 src/bin/gpmapreduce/test/expected/ordering.2    |    75 -
 src/bin/gpmapreduce/test/expected/ordering.err  |    10 -
 src/bin/gpmapreduce/test/expected/ordering.out  |     0
 src/bin/gpmapreduce/test/expected/oreilly.1     |     9 -
 src/bin/gpmapreduce/test/expected/oreilly.err   |    11 -
 src/bin/gpmapreduce/test/expected/oreilly.out   |     0
 .../test/expected/overwrite_retval_multiple.1   |     6 -
 .../expected/overwrite_retval_multiple.done.out |     3 -
 .../test/expected/overwrite_retval_multiple.err |     9 -
 .../expected/overwrite_retval_multiple.init.out |    13 -
 .../test/expected/overwrite_retval_multiple.out |     0
 .../test/expected/overwrite_retval_single.1     |     6 -
 .../expected/overwrite_retval_single.done.out   |     3 -
 .../test/expected/overwrite_retval_single.err   |     9 -
 .../expected/overwrite_retval_single.init.out   |    13 -
 .../test/expected/overwrite_retval_single.out   |     0
 .../test/expected/overwrite_retval_table.1      |     6 -
 .../expected/overwrite_retval_table.done.out    |     3 -
 .../test/expected/overwrite_retval_table.err    |     9 -
 .../expected/overwrite_retval_table.init.out    |    13 -
 .../test/expected/overwrite_retval_table.out    |     0
 src/bin/gpmapreduce/test/expected/pagerank.1    |    20 -
 src/bin/gpmapreduce/test/expected/pagerank.err  |     9 -
 src/bin/gpmapreduce/test/expected/pagerank.out  |     0
 src/bin/gpmapreduce/test/expected/sort.1        |   305 -
 src/bin/gpmapreduce/test/expected/sort.err      |     9 -
 src/bin/gpmapreduce/test/expected/sort.out      |     0
 .../gpmapreduce/test/expected/unload.done.out   |     1 -
 src/bin/gpmapreduce/test/expected/unload.err    |     9 -
 .../gpmapreduce/test/expected/unload.init.out   |     1 -
 src/bin/gpmapreduce/test/expected/unload.out    |     5 -
 src/bin/gpmapreduce/test/expected/wordcount.1   |   151 -
 src/bin/gpmapreduce/test/expected/wordcount.err |     9 -
 src/bin/gpmapreduce/test/expected/wordcount.out |     0
 src/bin/gpmapreduce/test/expected/xml.1         |     8 -
 src/bin/gpmapreduce/test/expected/xml.err       |     9 -
 src/bin/gpmapreduce/test/expected/xml.out       |     0
 .../test/input/access_frequency.yml.in          |    41 -
 src/bin/gpmapreduce/test/input/bad.yml.in       |   936 -
 src/bin/gpmapreduce/test/input/badflow.yml.in   |    95 -
 src/bin/gpmapreduce/test/input/badplperl.yml.in |    33 -
 .../gpmapreduce/test/input/badplpython.yml.in   |    37 -
 src/bin/gpmapreduce/test/input/badref.yml.in    |   155 -
 src/bin/gpmapreduce/test/input/builtin_1.yml.in |   156 -
 .../gpmapreduce/test/input/c_function.yml.in    |   182 -
 src/bin/gpmapreduce/test/input/columns.yml.in   |    76 -
 src/bin/gpmapreduce/test/input/graph.yml.in     |    99 -
 src/bin/gpmapreduce/test/input/grep.yml.in      |    37 -
 src/bin/gpmapreduce/test/input/grep_raw.yml.in  |    24 -
 src/bin/gpmapreduce/test/input/input.yml.in     |    74 -
 src/bin/gpmapreduce/test/input/join.yml.in      |    94 -
 src/bin/gpmapreduce/test/input/member_kw.yml.in |   195 -
 src/bin/gpmapreduce/test/input/mode.yml.in      |    72 -
 src/bin/gpmapreduce/test/input/network.yml.in   |    42 -
 src/bin/gpmapreduce/test/input/ordering.yml.in  |    60 -
 src/bin/gpmapreduce/test/input/oreilly.yml.in   |   229 -
 .../test/input/overwrite_retval_multiple.yml.in |    47 -
 .../test/input/overwrite_retval_single.yml.in   |    47 -
 .../test/input/overwrite_retval_table.yml.in    |    47 -
 src/bin/gpmapreduce/test/input/pagerank.yml.in  |    41 -
 src/bin/gpmapreduce/test/input/sort.yml.in      |    19 -
 src/bin/gpmapreduce/test/input/unload.yml.in    |    45 -
 src/bin/gpmapreduce/test/input/wordcount.yml.in |    99 -
 src/bin/gpmapreduce/test/input/xml.yml.in       |    47 -
 src/bin/gpmapreduce/test/lib/Makefile           |     6 -
 src/bin/gpmapreduce/test/lib/gpmrdemo.c         |   348 -
 src/bin/gpmapreduce/test/output/badplperl.err   |    10 -
 src/bin/gpmapreduce/test/output/badplperl.out   |     0
 src/bin/gpmapreduce/test/sql/builtin_1_init.sql |     8 -
 src/bin/gpmapreduce/test/sql/input_done.sql     |     6 -
 src/bin/gpmapreduce/test/sql/input_init.sql     |     5 -
 src/bin/gpmapreduce/test/sql/kmeans_done.sql    |     3 -
 src/bin/gpmapreduce/test/sql/member_kw_done.sql |     8 -
 src/bin/gpmapreduce/test/sql/member_kw_init.sql |    10 -
 .../test/sql/overwrite_retval_multiple_done.sql |     5 -
 .../test/sql/overwrite_retval_multiple_init.sql |    19 -
 .../test/sql/overwrite_retval_single_done.sql   |     5 -
 .../test/sql/overwrite_retval_single_init.sql   |    19 -
 .../test/sql/overwrite_retval_table_done.sql    |     5 -
 .../test/sql/overwrite_retval_table_init.sql    |    18 -
 src/bin/gpmapreduce/test/sql/unload_done.sql    |     1 -
 src/bin/gpmapreduce/test/sql/unload_init.sql    |    11 -
 src/bin/gpmapreduce/test/yml/kmeans.yml         |    62 -
 src/bin/gpmapreduce/yaml-0.1.1/Makefile         |   632 -
 src/bin/gpmapreduce/yaml-0.1.1/configure        | 21200 -----------------
 src/bin/gpmapreduce/yaml-0.1.1/include/Makefile |   415 -
 src/bin/gpmapreduce/yaml-0.1.1/libtool          |  7830 ------
 .../gpmapreduce/yaml-0.1.1/src/.deps/api.Plo    |    95 -
 .../gpmapreduce/yaml-0.1.1/src/.deps/dumper.Plo |    95 -
 .../yaml-0.1.1/src/.deps/emitter.Plo            |    96 -
 .../gpmapreduce/yaml-0.1.1/src/.deps/loader.Plo |    95 -
 .../gpmapreduce/yaml-0.1.1/src/.deps/parser.Plo |    95 -
 .../gpmapreduce/yaml-0.1.1/src/.deps/reader.Plo |    95 -
 .../yaml-0.1.1/src/.deps/scanner.Plo            |    96 -
 .../gpmapreduce/yaml-0.1.1/src/.deps/writer.Plo |    95 -
 src/bin/gpmapreduce/yaml-0.1.1/src/Makefile     |   470 -
 .../tests/.deps/example-deconstructor-alt.Po    |    71 -
 .../tests/.deps/example-deconstructor.Po        |    71 -
 .../tests/.deps/example-reformatter-alt.Po      |    71 -
 .../tests/.deps/example-reformatter.Po          |    71 -
 .../yaml-0.1.1/tests/.deps/run-dumper.Po        |    72 -
 .../yaml-0.1.1/tests/.deps/run-emitter.Po       |    72 -
 .../yaml-0.1.1/tests/.deps/run-loader.Po        |    72 -
 .../yaml-0.1.1/tests/.deps/run-parser.Po        |    72 -
 .../yaml-0.1.1/tests/.deps/run-scanner.Po       |    72 -
 src/bin/gpmapreduce/yaml-0.1.1/tests/Makefile   |   608 -
 src/test/regress/input/mapred.source            |   235 -
 src/test/regress/known_good_schedule            |     1 -
 src/test/regress/maketestschedule.py            |     2 +-
 src/test/regress/output/mapred.source           |   507 -
 src/test/regress/pg_regress.c                   |     4 -
 src/test/regress/sql/.gitignore                 |     1 -
 src/tools/pgindent/typedefs.list                |    21 -
 tools/demo/gpmapreduce/1_grep.yml               |    34 -
 tools/demo/gpmapreduce/2_wordcount.yml          |    30 -
 tools/demo/gpmapreduce/README                   |   131 -
 tools/demo/gpmapreduce/data/access_log          |    27 -
 tools/demo/gpmapreduce/data/access_log2         |    20 -
 tools/demo/gpmapreduce/data/whitepaper.txt      |   448 -
 tools/doc/gpmapreduce_help                      |   144 -
 220 files changed, 1 insertion(+), 67885 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/all_src_files.txt
----------------------------------------------------------------------
diff --git a/src/all_src_files.txt b/src/all_src_files.txt
index 983c772..0fd04bf 100644
--- a/src/all_src_files.txt
+++ b/src/all_src_files.txt
@@ -1452,18 +1452,6 @@ bin/gpfusion/common.h
 bin/gpfusion/gpbridgeapi.c
 bin/gpfusion/gpdbwritableformatter.c
 bin/gpfusion/pxf.c
-bin/gpmapreduce/include/except.h
-bin/gpmapreduce/include/mapred.h
-bin/gpmapreduce/include/mapred_errors.h
-bin/gpmapreduce/include/parser.h
-bin/gpmapreduce/src/gettext.h
-bin/gpmapreduce/src/main.c
-bin/gpmapreduce/src/mapred.c
-bin/gpmapreduce/src/parse.c
-bin/gpmapreduce/src/yaml_parse.y
-bin/gpmapreduce/src/yaml_private.h
-bin/gpmapreduce/src/yaml_scan.l
-bin/gpmapreduce/test/lib/gpmrdemo.c
 bin/gpupgrade/gpmodcatversion.c
 bin/gpupgrade/gpviewcp.c
 bin/initdb/initdb.c

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/.gitignore
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/.gitignore b/src/bin/gpmapreduce/.gitignore
deleted file mode 100644
index 80a90c3..0000000
--- a/src/bin/gpmapreduce/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gpmapreduce

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/Makefile
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/Makefile b/src/bin/gpmapreduce/Makefile
deleted file mode 100644
index 0a38347..0000000
--- a/src/bin/gpmapreduce/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-
-subdir = src/bin/gpmapreduce
-top_builddir = ../../..
-include $(top_builddir)/src/Makefile.global
-
-BLD_OS := $(shell uname -s)
-BLD_OS_VER := $(shell uname -r)
-ifneq "$(findstring $(BLD_OS)-$(BLD_OS_VER),SunOS-5.8 SunOS-5.9)" ""
-BLD_CPPFLAGS_SOLARIS_OLD_VERSIONS=-D_REENTRANT
-endif
-
-ifdef srcdir
-INCDIR= $(srcdir)/include
-SRCDIR= $(srcdir)/src
-BUILDDIR= ./src
-else
-INCDIR= include
-SRCDIR= src
-BUILDDIR= src
-endif
-
-ifneq ($(PORTNAME), win32)
-override CFLAGS += $(PTHREAD_CFLAGS) -pthread
-endif
-
-override CPPFLAGS += $(BLD_CPPFLAGS_SOLARIS_OLD_VERSIONS) -DFRONTEND -I$(SRCDIR) -I$(INCDIR) -I$(libpq_srcdir)
-override LDFLAGS  += -lyaml
-
-FILES     = main.o mapred.o parse.o yaml_scan.o yaml_parse.o 
-GENFILES  = yaml_parse.h yaml_parse.c yaml_scan.c yaml_scan.h
-
-OBJS      = $(addprefix $(BUILDDIR)/, $(FILES))
-GENOBJS   = $(addprefix $(SRCDIR)/, $(GENFILES))
-
-FLEXFLAGS = -i
-BISONFLAGS = -d
-
-all: submake-libpq gpmapreduce
-
-gpmapreduce: $(OBJS) $(libpq_builddir)/libpq.a
-	$(CC) $(CFLAGS) $(OBJS) $(libpq_pgport) $(LDFLAGS) $(LIBS) -o $@$(X)
-
-internal:
-	rm -f $(SRCDIR)/mapred.o $(SRCDIR)/main.o
-	$(MAKE) CFLAGS="-DINTERNAL_BUILD $(CFLAGS)" all
-
-check:
-	$(MAKE) -C test
-
-$(SRCDIR)/yaml_scan.c: $(SRCDIR)/yaml_parse.h $(SRCDIR)/yaml_scan.l
-ifdef FLEX
-	cd $(SRCDIR) ; \
-	$(FLEX) $(FLEXFLAGS) yaml_scan.l
-else
-	@$(missing) flex $< $@
-endif
-
-$(SRCDIR)/yaml_parse.h: $(SRCDIR)/yaml_parse.c
-$(SRCDIR)/yaml_parse.c: $(SRCDIR)/yaml_parse.y
-ifdef BISON
-	@cd $(SRCDIR) ; \
-	$(BISON) $(BISONFLAGS) yaml_parse.y
-else
-	@$(missing) bison $< $@
-endif
-
-install: all installdirs
-	$(INSTALL_PROGRAM) gpmapreduce$(X) '$(DESTDIR)$(bindir)/gpmapreduce$(X)'
-
-installdirs:
-	$(MKDIR_P) '$(DESTDIR)$(bindir)'
-
-uninstall:
-	rm -f '$(DESTDIR)$(bindir)/gpmapreduce$(X)'
-
-clean distclean maintainer-clean:
-	rm -f gpmapreduce$(X) $(OBJS) $(GENOBJS)
-
-# Other dependencies
-$(SRCDIR)/yaml_parse.c  : $(INCDIR)/parser.h $(INCDIR)/mapred.h
-$(SRCDIR)/yaml_scan.c   : $(INCDIR)/parser.h $(INCDIR)/mapred.h
-$(BUILDDIR)/parse.o       : $(SRCDIR)/yaml_parse.h
-$(BUILDDIR)/parse.o       : $(INCDIR)/parser.h $(INCDIR)/mapred.h
-$(BUILDDIR)/mapred.o      : $(INCDIR)/parser.h $(INCDIR)/mapred.h
-$(BUILDDIR)/main.o        : $(INCDIR)/mapred.h
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/include/except.h
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/include/except.h b/src/bin/gpmapreduce/include/except.h
deleted file mode 100644
index 6640171..0000000
--- a/src/bin/gpmapreduce/include/except.h
+++ /dev/null
@@ -1,238 +0,0 @@
-
-#ifndef EXCEPT_H
-#define EXECPT_H
-
-#ifndef SETJMP_H
-#include <setjmp.h>
-#endif
-
-#ifndef STDIO_H
-#include <stdio.h>
-#endif
-
-/* 
- * except.h - A very simplistic exception handling framework 
- *
- * This exception system makes use of a global linked list of exception
- * frames and thus is not threadsafe!
- *
- * It's also probably not safe to nest try blocks within a single function.
- *
- * Usage:
- *
- * // in main.c
- * ALLOW_EXCEPTIONS;
- *
- * int main(...) {...}
- * 
- * // elsewhere
- * void myfunction(...)
- * {
- *    ...
- *
- *	  XTRY 
- *    {
- *      ...
- *      some_other_function(...)
- *      ...
- *    }
- *    XCATCH(errcode)
- *    {
- *      // handle an expected exception code
- *      printf(xframe.exception);
- *	  }
- *    XCATCH_ANY
- *    {
- *      XRERAISE()
- *    }
- *	  XFINALLY
- *    {
- *      ...
- *    }
- *    XTRY_END;
- *    
- *    ...
- * }
- *
- * void some_other_function(...)
- * {
- *    ...
- *    XRAISE(errcode, "errmsg");
- * }
- *
- */
-
-typedef struct xframe_ xframe_t;
-struct xframe_ 
-{
-	jmp_buf             jumper;
-    xframe_t           *next;
-	volatile int        errcode;
-	volatile void      *exception;
-	volatile int        state;
-	volatile char      *file;
-	volatile int        lineno;
-};
-#define XFRAME_BASE    0x00000000
-#define XFRAME_HANDLED 0x00000001
-#define XFRAME_ANY     0x00000002
-#define XFRAME_FINAL   0x00000004
-
-/* The global exception frame */
-extern xframe_t *global_exception_frame;
-
-/* Declare this someplace global in main.c */
-#define ALLOW_EXCEPTIONS						\
-	xframe_t *global_exception_frame = NULL
-
-/* we use MAX INT for the finnally errcode */
-#define ERRCODE_FOR_FINALLY_BLOCK 2147483647
-#define ERRCODE_FOR_EXIT_BLOCK    2147483646
-#define ERRCODE_FOR_ANY_BLOCK     2147483645
-#define ASSERTION_FAILURE         2147483644
-
-#define XRAISE(ecode, v)												\
-	do {																\
-		if (!global_exception_frame) {									\
-			fprintf(stderr, "Error: (%d) Unhandled Exception\n",		\
-					ecode);												\
-			fprintf(stderr, "Raised from %s at line %d\n",				\
-					__FILE__, __LINE__);								\
-			exit(1);													\
-		}																\
-		global_exception_frame->state = XFRAME_BASE;					\
-		global_exception_frame->errcode = ecode;						\
-		global_exception_frame->exception = (void *) v;					\
-		global_exception_frame->file   = (char*) __FILE__;				\
-		global_exception_frame->lineno = __LINE__;						\
-		longjmp(global_exception_frame->jumper, ecode);					\
-	} while(0)
-
-/* 
- * Note that if the final frame hasn't been executed then we long 
- * jump back to the finaly block.  Before we do this we set the
- * frame state to FRAME_FINAL to ensure that the FRAME_HANDLED flag
- * is cleared, this is better than setting to FRAME_BASE only when
- * there isn't a final block defined. 
- */
-#define XRERAISE()														\
-	do {																\
-		if (!xframe.errcode) {											\
-			fprintf(stderr, "Error: Can't reraise null exception");		\
-			fprintf(stderr, "Raised from %s at line %d\n",				\
-					xframe.file, xframe.lineno);						\
-			exit(1);													\
-		}																\
-		if (!(xframe.state & XFRAME_FINAL)) {							\
-			xframe.state = XFRAME_FINAL;								\
-			longjmp(xframe.jumper, ERRCODE_FOR_FINALLY_BLOCK);			\
-		}																\
-		global_exception_frame = xframe.next;							\
-		if (!global_exception_frame) {									\
-			fprintf(stderr, "Error: (%d) Unhandled Exception\n",		\
-					xframe.errcode);									\
-			fprintf(stderr, "Raised from %s:%d\n",						\
-					xframe.file, xframe.lineno);						\
-			fprintf(stderr, "Current frame at %s:%d\n",					\
-					__FILE__, __LINE__);								\
-			exit(1);													\
-		}																\
-		global_exception_frame->state     = XFRAME_BASE;				\
-		global_exception_frame->errcode   = xframe.errcode;				\
-		global_exception_frame->exception = xframe.exception;			\
-		global_exception_frame->file      = xframe.file;				\
-		global_exception_frame->lineno    = xframe.lineno;				\
-		longjmp(global_exception_frame->jumper, xframe.errcode);		\
-	} while(0)
-
-/* 
- * A simple built in assertion macro
- */
-#define XASSERT(x)								                        \
-	do {																\
-		if (!(x))														\
-		{																\
-			if (!global_exception_frame)								\
-			{															\
-				fprintf(stderr, "Error: Assertion failure at %s:%d\n",	\
-						__FILE__, __LINE__);							\
-				fprintf(stderr, "No exception recovery stack found\n");	\
-			}															\
-			else														\
-			{															\
-				XRAISE(ASSERTION_FAILURE, NULL);						\
-			}															\
-		}																\
-	} while(0)
-
-#define XTRY									               		    \
-	do {																\
-		xframe_t xframe;												\
-		xframe.errcode   = 0;											\
-		xframe.exception = NULL;										\
-		xframe.next      = global_exception_frame;						\
-		xframe.state     = XFRAME_BASE;									\
-		global_exception_frame = &xframe;								\
-		switch (setjmp(xframe.jumper))									\
-		{																\
-			case 0:
-
-#define XCATCH(x)													    \
- 	        longjmp(xframe.jumper, ERRCODE_FOR_EXIT_BLOCK);			    \
-	        case x:											            \
-			xframe.state |= XFRAME_HANDLED;
-
-#define XCATCH_ANY											            \
- 	        longjmp(xframe.jumper, ERRCODE_FOR_EXIT_BLOCK);	            \
-	        case ERRCODE_FOR_ANY_BLOCK:							        \
-			xframe.state |= XFRAME_HANDLED;
-
-#define XFINALLY													    \
- 	        longjmp(xframe.jumper, ERRCODE_FOR_EXIT_BLOCK);			    \
-	        case ERRCODE_FOR_FINALLY_BLOCK:					            \
-			global_exception_frame = xframe.next;						\
-			xframe.state |= XFRAME_FINAL;
-
-/*
- * XTRY_END
- *
- * 1) If we fell through, or got called directly mark the 'any' block
- *    as hit since some CATCH statement must have been hit (or there
- *    are none and it doesn't matter.
- *
- * 2) If we hit the default block then try to call the ANY block,
- *    if it doesn't exist we'll just fall right back here again.
- *
- * 3) If we haven't hit the FINALLY block yet, do so now, if none
- *    we will fall back into the default case.
- * 
- * 4) Once both ANY and FINALLY blocks have been dealt with we just
- *    need to clean up a bit.  Pop the exception frame off the stack
- *    and if the exception wasn't handled then we have to reraise it.
- */
-#define XTRY_END													    \
-	        case ERRCODE_FOR_EXIT_BLOCK:					            \
-	        xframe.state |= XFRAME_ANY;								    \
-	        default:									                \
-			if (!(xframe.state & XFRAME_ANY))					  	    \
-			{														    \
-				xframe.state |= XFRAME_ANY;							    \
-				longjmp(xframe.jumper, ERRCODE_FOR_ANY_BLOCK);		    \
-			}														    \
-	        if (!(xframe.state & XFRAME_FINAL))					  	    \
-			{														    \
-				xframe.state |= XFRAME_FINAL;						    \
-				longjmp(xframe.jumper, ERRCODE_FOR_FINALLY_BLOCK);	    \
-			}														    \
-			break;												 	    \
-		}												 		        \
-		global_exception_frame = xframe.next;						    \
-		if (!(xframe.state & XFRAME_HANDLED) && xframe.errcode)		    \
-			XRERAISE();												    \
-	} while (0)
-
-
-#endif
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/include/mapred.h
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/include/mapred.h b/src/bin/gpmapreduce/include/mapred.h
deleted file mode 100644
index 063d72d..0000000
--- a/src/bin/gpmapreduce/include/mapred.h
+++ /dev/null
@@ -1,282 +0,0 @@
-#ifndef MAPRED_H
-#define MAPRED_H
-
-#ifndef YAML_H
-#include <yaml.h>
-#endif
-
-#ifndef LIBPQ_FE_H
-#include <libpq-fe.h>
-#endif
-
-#ifndef true
-#define true  1
-#endif
-#ifndef false
-#define false 0
-#endif
-#ifndef boolean
-#define boolean int
-#endif
-
-typedef enum {
-	ERROR_NONE = 0,          /* No error */
-	ERROR_WARNING,           /* Warning message */
-	ERROR_PARSE_FAILURE,     /* YAML parse failure */
-	ERROR_UNEXPECTED_EVENT,  /* YAML parse failure */
-	ERROR_UNEXPECTED_EOS,    /* YAML parse failure */
-	ERROR_OBJECT_MISMATCH,   /* User .yml document problem */
-	ERROR_UNKNOWN_KEY,       /* User .yml document problem */
-	ERROR_BAD_VALUE,         /* User .yml document problem */
-	ERROR_MEMORY,            /* Memory allocation failure */
-	ERROR_IMPOSSIBLE,        /* Internal assertion failure */
-} mapred_error_t;
-
-
-typedef struct mapred_object_ mapred_object_t;
-typedef struct mapred_clist_  mapred_clist_t;
-typedef struct mapred_plist_  mapred_plist_t;
-typedef struct mapred_olist_  mapred_olist_t;
-
-/* Various Enumerations */
-typedef enum {
-	MAPRED_NO_KIND      = 0,
-	MAPRED_DOCUMENT     = 1,
-	MAPRED_INPUT        = 2,
-	MAPRED_OUTPUT       = 3,
-	MAPRED_MAPPER       = 4,
-	MAPRED_TRANSITION   = 5,
-	MAPRED_COMBINER     = 6,
-	MAPRED_FINALIZER    = 7,
-	MAPRED_REDUCER      = 8,
-	MAPRED_TASK         = 9,
-	MAPRED_EXECUTION    = 10,
-	MAPRED_ADT          = 11        /* internal use only */
-} mapred_kind_t;
-#define MAPRED_MAXKIND    11
-
-extern const char *mapred_kind_name[];
-extern const char *default_parameter_names[MAPRED_MAXKIND+1][2];
-extern const char *default_return_names[MAPRED_MAXKIND+1][2];
-
-typedef enum {
-	MAPRED_MODE_NONE = 0,
-	MAPRED_MODE_SINGLE,
-	MAPRED_MODE_MULTI,
-	MAPRED_MODE_ACCUMULATED,        /* not implemented */
-	MAPRED_MODE_WINDOWED,           /* not implemented */
-	MAPRED_MODE_INVALID
-} mapred_mode_t;
-
-typedef enum {
-	MAPRED_INPUT_NONE = 0,
-	MAPRED_INPUT_FILE,
-	MAPRED_INPUT_GPFDIST,
-	MAPRED_INPUT_TABLE,
-	MAPRED_INPUT_QUERY,
-	MAPRED_INPUT_EXEC,
-	MAPRED_INPUT_INVALID
-} mapred_input_kind_t;
-
-typedef enum {
-	MAPRED_OUTPUT_NONE = 0,
-	MAPRED_OUTPUT_FILE,
-	MAPRED_OUTPUT_TABLE,
-	MAPRED_OUTPUT_INVALID
-} mapred_output_kind_t;
-
-typedef enum {
-	MAPRED_FORMAT_NONE = 0,
-	MAPRED_FORMAT_TEXT,
-	MAPRED_FORMAT_CSV,
-	MAPRED_FORMAT_INVALID
-} mapred_format_t;
-
-typedef enum {
-	MAPRED_OUTPUT_MODE_NONE = 0,
-	MAPRED_OUTPUT_MODE_REPLACE,
-	MAPRED_OUTPUT_MODE_APPEND,
-	MAPRED_OUTPUT_MODE_INVALID
-} mapred_output_mode_t;
-
-
-
-/*
- * Many objects in the map-reduce schema reference other objects by name.
- * During the parse we store these with just the name and later we hook
- * up all the references.
- */
-typedef struct mapred_reference_ {
-	char                 *name;
-    mapred_object_t      *object;
-} mapred_reference_t;
-
-/* character list */
-struct mapred_clist_ {
-	char                 *value;
-	mapred_clist_t       *next;
-};
-
-/* parameter list */
-struct mapred_plist_ {
-	char                 *name;
-	char                 *type;
-	mapred_plist_t       *next;
-};
-
-/* object list */
-struct mapred_olist_ {
-	mapred_object_t      *object;
-	mapred_olist_t       *next;
-};
-
-/* Object types */
-typedef struct {
-	mapred_input_kind_t    type;
-	char                  *desc;
-	mapred_clist_t        *files;
-	mapred_plist_t        *columns;
-	mapred_format_t        format;
-	char                  *delimiter;
-	char                  *encoding;
-	char                  *null;
-	char                  *quote;
-	char                  *escape;
-	int                    error_limit;
-} mapred_input_t;
-
-typedef struct {
-	mapred_output_kind_t   type;
-	char                  *desc;
-	mapred_output_mode_t   mode;
-	mapred_format_t        format;
-	char                  *delimiter;
-	char                  *encoding;
-} mapred_output_t;
-
-typedef struct {
-	char                *body;
-	char                *language;
-	char                *library;
-	mapred_plist_t      *parameters;
-	mapred_plist_t      *returns;
-	mapred_plist_t      *internal_returns;
-	mapred_reference_t   rtype;
-	mapred_mode_t        mode;
-	int                  flags;
-#define mapred_function_strict    0x00000001
-#define mapred_function_immutable 0x00000002
-#define mapred_function_unordered 0x00000004
-	int                  lineno;
-} mapred_function_t;
-
-/* Mappers, Transitions, Combiners, and Finalizers are all just functions */
-typedef mapred_function_t mapred_mapper_t;
-typedef mapred_function_t mapred_transition_t;
-typedef mapred_function_t mapred_combiner_t;
-typedef mapred_function_t mapred_finalizer_t;
-
-typedef struct {
-	mapred_reference_t   transition;
-	mapred_reference_t   combiner;
-	mapred_reference_t   finalizer;
-	char                *initialize;
-	mapred_plist_t      *parameters;     /* points into transition plist */
-	mapred_plist_t      *returns;
-	mapred_clist_t      *keys;
-	mapred_clist_t      *ordering;
-} mapred_reducer_t;
-
-typedef struct {
-	mapred_reference_t  input;
-	mapred_reference_t  mapper;
-	mapred_reference_t  reducer;
-	mapred_reference_t  output;
-	boolean             execute;
-	int                 flags;
-#define mapred_task_resolving   0x00000001
-#define mapred_task_resolved    0x00000002
-
-	/* calculated parameters, setup during resolve_dependencies */
-
-	mapred_plist_t     *parameters;     /* points into input plist */
-	mapred_plist_t     *grouping;
-	mapred_plist_t     *returns;	
-} mapred_task_t;
-
-
-/* 
- * Whenever a function returns more than a single column an abstract
- * data type will be transparently created.
- */
-typedef struct {
-	mapred_plist_t     *returns;
-} mapred_adt_t;
-
-typedef struct 
-{
-	char   *buffer;
-	size_t  bufsize;
-	size_t  position;
-	size_t  grow;
-} buffer_t;
-
-typedef struct {
-	char           *version;
-	char           *database;
-	char           *user;
-	char           *host;
-	int             port;
-	mapred_olist_t *objects;
-	mapred_olist_t *execute;
-	int             flags;
-#define mapred_document_defines  0x00000001
-#define mapred_document_executes 0x00000002
-#define mapred_document_error    0x10000000
-	int             id;
-	char           *prefix;
-	buffer_t       *errors;
-} mapred_document_t;
-
-/* Union of all mapred object types */
-struct mapred_object_ {
-	mapred_kind_t           kind;
-	char                   *name;
-	int                     line;
-	boolean                 created;
-	boolean                 internal;
-	union {
-		mapred_document_t   document;
-		mapred_input_t      input;
-		mapred_output_t     output;
-		mapred_function_t   function;
-		mapred_reducer_t    reducer;
-		mapred_task_t       task;
-		mapred_adt_t        adt;
-	} u;
-};
-
-/* Functions */
-void mapred_run_document(PGconn *conn, mapred_document_t *doc);
-mapred_olist_t* mapred_parse_file(FILE *file);
-mapred_olist_t* mapred_parse_string(unsigned char *yaml);
-
-void mapred_dump_yaml(mapred_object_t *obj);
-
-void mapred_destroy_object(mapred_object_t **obj);
-void mapred_destroy_olist(mapred_olist_t **olist);
-void mapred_destroy_plist(mapred_plist_t **plisth);
-void mapred_destroy_clist(mapred_clist_t **clist);
-
-/* Global variables, defined in main.c */
-extern int global_verbose_flag;
-extern int global_debug_flag;
-extern int global_print_flag;
-extern int global_explain_flag;
-extern mapred_plist_t *global_plist;
-
-/* Flags set in global_explain_flag */
-#define global_explain 0x00000001
-#define global_analyze 0x00000002
-
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/include/mapred_errors.h
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/include/mapred_errors.h b/src/bin/gpmapreduce/include/mapred_errors.h
deleted file mode 100644
index 1a77e99..0000000
--- a/src/bin/gpmapreduce/include/mapred_errors.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#ifndef MAPRED_ERRORS_H
-#define MAPRED_ERRORS_H
-
-/* Error codes used by the mapreduce driver. */
-
-
-/* Trying to raise this would cause weird things to happen, don't do it. */
-#define NO_ERROR  0
-
-/* Internal errors */
-#define MAPRED_PARSE_INTERNAL      1    
-#define MEMORY_ERROR               2
-#define VERSION_ERROR              3
-#define CONNECTION_ERROR           4
-
-/* User errors */
-#define MAPRED_PARSE_ERROR       100
-
-/* Other errors */
-#define MAPRED_SQL_ERROR         200
-
-/* Signals */
-#define USER_INTERUPT          10000   /* SIGINT */
-
-
-struct mapred_parser_;
-struct mapred_object_;
-int       mapred_parse_error(struct mapred_parser_ *parser, char *fmt, ...);
-int         mapred_obj_error(struct mapred_object_ *obj, char *fmt, ...);
-
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/include/parser.h
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/include/parser.h b/src/bin/gpmapreduce/include/parser.h
deleted file mode 100644
index 87e7532..0000000
--- a/src/bin/gpmapreduce/include/parser.h
+++ /dev/null
@@ -1,138 +0,0 @@
-#ifndef PARSER_H
-#define PARSER_H
-
-#ifndef MAPRED_H
-#include <mapred.h>
-#endif
-#ifndef YAML_H
-#include <yaml.h>
-#endif
-
-
-typedef enum {
-	STATE_BOOTSTRAP = 0, 
-	STATE_YAML_PARSE,
-	STATE_SCALAR_LEX,
-	STATE_DONE,
-} mapred_parser_state_t;
-
-typedef enum {
-	CONTEXT_NONE = 0,
-	CONTEXT_HASH_KEY,
-	CONTEXT_HASH_VALUE,
-	CONTEXT_LIST,
-} mapred_parser_context_t;
-
-/*
- * Current max context depth = 7
- *   -DOCUMENT HASH:
- *     - DEFINE LIST:
- *       - ITEM HASH:
- *         - ATTR HASH:
- *           - VALUE LIST
- *             - KEY/VALUE hash
- *               - extra level to promote good error messages
- */
-#define MAX_CONTEXT_DEPTH 7
-
-typedef struct mapred_parser_ {
-	mapred_parser_state_t     state;
-	mapred_parser_context_t   context[MAX_CONTEXT_DEPTH];
-	int                       frame;
-	yaml_event_t              event;
-	yaml_parser_t            *yparser;
-	mapred_olist_t           *doclist;
-	mapred_object_t          *current_doc;
-	mapred_object_t          *current_obj;
-	int                       doc_number;
-
-#if USE_FLEX_REENTRANT
-	void                     *yscanner;
-	void                     *yscan_buffer;
-#endif
-} mapred_parser_t;
-
-/*
- * A couple flex options that would be nice, but aren't supported by the
- * ancient flex on the build machines.
- */
-#define USE_FLEX_HFILE     0
-#define USE_FLEX_REENTRANT 0
-
-#if USE_FLEX_REENTRANT
-# define YY_DECL \
-	int yaml_scalar_yylex (yyscan_t yyscanner, mapred_parser_t *parser)
-#else
-# define YY_DECL \
-	int yaml_scalar_yylex (mapred_parser_t *parser)
-#endif
-YY_DECL;
-struct yy_buffer_state* yaml_scalar_yy_scan_string (const char *yy_str);
-
-/* Why bison doesn't put this in the header file I do not know... */
-int yaml_yyparse(mapred_parser_t *parser);
-
-/* Given a yaml parser return a list of parsed documents */
-mapred_olist_t* mapred_parse_yaml(yaml_parser_t *parser);
-
-/* object functions */
-void parser_begin_document(mapred_parser_t *parser);
-void   parser_begin_define(mapred_parser_t *parser);
-void  parser_begin_execute(mapred_parser_t *parser);
-
-void   parser_add_document(mapred_parser_t *parser);
-void     parser_add_object(mapred_parser_t *parser, mapred_kind_t kind);
-void        parser_add_run(mapred_parser_t *parser);
-
-/* list functions */
-void      parser_begin_files(mapred_parser_t *parser);
-void    parser_begin_gpfdist(mapred_parser_t *parser);
-void    parser_begin_columns(mapred_parser_t *parser);
-void parser_begin_parameters(mapred_parser_t *parser);
-void    parser_begin_returns(mapred_parser_t *parser);
-void       parser_begin_keys(mapred_parser_t *parser);
-void   parser_begin_ordering(mapred_parser_t *parser);
-
-void       parser_add_file(mapred_parser_t *parser, char *value);
-void     parser_add_column(mapred_parser_t *parser, char *value);
-void  parser_add_parameter(mapred_parser_t *parser, char *value);
-void     parser_add_return(mapred_parser_t *parser, char *value);
-void        parser_add_key(mapred_parser_t *parser, char *value);
-void   parser_add_ordering(mapred_parser_t *parser, char *value);
-
-/* scalar functions */
-void    parser_set_version(mapred_parser_t *parser, char *value);
-void   parser_set_database(mapred_parser_t *parser, char *value);
-void       parser_set_user(mapred_parser_t *parser, char *value);
-void       parser_set_host(mapred_parser_t *parser, char *value);
-void       parser_set_port(mapred_parser_t *parser, char *value);
-void       parser_set_name(mapred_parser_t *parser, char *value);
-void      parser_set_table(mapred_parser_t *parser, char *value);
-void      parser_set_query(mapred_parser_t *parser, char *value);
-void    parser_set_gpfdist(mapred_parser_t *parser, char *value);
-void       parser_set_exec(mapred_parser_t *parser, char *value);
-void     parser_set_format(mapred_parser_t *parser, char *value);
-void       parser_set_null(mapred_parser_t *parser, char *value);
-void      parser_set_quote(mapred_parser_t *parser, char *value);
-void  parser_set_delimiter(mapred_parser_t *parser, char *value);
-void     parser_set_escape(mapred_parser_t *parser, char *value);
-void   parser_set_encoding(mapred_parser_t *parser, char *value);
-void parser_set_error_limit(mapred_parser_t *parser, char *value);
-void       parser_set_mode(mapred_parser_t *parser, char *value);
-void       parser_set_file(mapred_parser_t *parser, char *value);
-void parser_set_transition(mapred_parser_t *parser, char *value);
-void   parser_set_combiner(mapred_parser_t *parser, char *value);
-void  parser_set_finalizer(mapred_parser_t *parser, char *value);
-void parser_set_initialize(mapred_parser_t *parser, char *value);
-void   parser_set_language(mapred_parser_t *parser, char *value);
-void   parser_set_function(mapred_parser_t *parser, char *value);
-void    parser_set_library(mapred_parser_t *parser, char *value);
-void   parser_set_optimize(mapred_parser_t *parser, char *value);
-void     parser_set_source(mapred_parser_t *parser, char *value);
-void     parser_set_target(mapred_parser_t *parser, char *value);
-void     parser_set_mapper(mapred_parser_t *parser, char *value);
-void    parser_set_reducer(mapred_parser_t *parser, char *value);
-
-
-
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/src/.gitignore
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/src/.gitignore b/src/bin/gpmapreduce/src/.gitignore
deleted file mode 100644
index 6d8ebd7..0000000
--- a/src/bin/gpmapreduce/src/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-yaml_parse.c
-yaml_parse.h
-yaml_scan.c

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/src/gettext.h
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/src/gettext.h b/src/bin/gpmapreduce/src/gettext.h
deleted file mode 100644
index a2e87a3..0000000
--- a/src/bin/gpmapreduce/src/gettext.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifndef _LIBGETTEXT_H
-#define _LIBGETTEXT_H 1
-
-/* NLS can be disabled through the configure --disable-nls option.  */
-#if ENABLE_NLS
-
-/* Get declarations of GNU message catalog functions.  */
-# include <libintl.h>
-
-/* You can set the DEFAULT_TEXT_DOMAIN macro to specify the domain used by
-   the gettext() and ngettext() macros.  This is an alternative to calling
-   textdomain(), and is useful for libraries.  */
-# ifdef DEFAULT_TEXT_DOMAIN
-#  undef gettext
-#  define gettext(Msgid) \
-     dgettext (DEFAULT_TEXT_DOMAIN, Msgid)
-#  undef ngettext
-#  define ngettext(Msgid1, Msgid2, N) \
-     dngettext (DEFAULT_TEXT_DOMAIN, Msgid1, Msgid2, N)
-# endif
-
-#else
-
-/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
-   chokes if dcgettext is defined as a macro.  So include it now, to make
-   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
-   as well because people using "gettext.h" will not include <libintl.h>,
-   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
-   is OK.  */
-#if defined(__sun)
-# include <locale.h>
-#endif
-
-/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
-   <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
-   it now, to make later inclusions of <libintl.h> a NOP.  */
-#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
-# include <cstdlib>
-# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
-#  include <libintl.h>
-# endif
-#endif
-
-/* Disabled NLS.
-   The casts to 'const char *' serve the purpose of producing warnings
-   for invalid uses of the value returned from these functions.
-   On pre-ANSI systems without 'const', the config.h file is supposed to
-   contain "#define const".  */
-# define gettext(Msgid) ((const char *) (Msgid))
-# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
-# define dcgettext(Domainname, Msgid, Category) \
-    ((void) (Category), dgettext (Domainname, Msgid))
-# define ngettext(Msgid1, Msgid2, N) \
-    ((N) == 1 \
-     ? ((void) (Msgid2), (const char *) (Msgid1)) \
-     : ((void) (Msgid1), (const char *) (Msgid2)))
-# define dngettext(Domainname, Msgid1, Msgid2, N) \
-    ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
-# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
-    ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
-# define textdomain(Domainname) ((const char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) \
-    ((void) (Domainname), (const char *) (Dirname))
-# define bind_textdomain_codeset(Domainname, Codeset) \
-    ((void) (Domainname), (const char *) (Codeset))
-
-#endif
-
-/* A pseudo function call that serves as a marker for the automated
-   extraction of messages, but does not call gettext().  The run-time
-   translation is done at a different place in the code.
-   The argument, String, should be a literal string.  Concatenated strings
-   and other string expressions won't work.
-   The macro's expansion is not parenthesized, so that it is suitable as
-   initializer for static 'char[]' or 'const char[]' variables.  */
-#define gettext_noop(String) String
-
-/* The separator between msgctxt and msgid in a .mo file.  */
-#define GETTEXT_CONTEXT_GLUE "\004"
-
-/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
-   MSGID.  MSGCTXT and MSGID must be string literals.  MSGCTXT should be
-   short and rarely need to change.
-   The letter 'p' stands for 'particular' or 'special'.  */
-#ifdef DEFAULT_TEXT_DOMAIN
-# define pgettext(Msgctxt, Msgid) \
-   pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
-#else
-# define pgettext(Msgctxt, Msgid) \
-   pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
-#endif
-#define dpgettext(Domainname, Msgctxt, Msgid) \
-  pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
-#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \
-  pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category)
-#ifdef DEFAULT_TEXT_DOMAIN
-# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
-   npgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
-#else
-# define npgettext(Msgctxt, Msgid, MsgidPlural, N) \
-   npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
-#endif
-#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
-  npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES)
-#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \
-  npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category)
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-pgettext_aux (const char *domain,
-	      const char *msg_ctxt_id, const char *msgid,
-	      int category)
-{
-  const char *translation = dcgettext (domain, msg_ctxt_id, category);
-  if (translation == msg_ctxt_id)
-    return msgid;
-  else
-    return translation;
-}
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-npgettext_aux (const char *domain,
-	       const char *msg_ctxt_id, const char *msgid,
-	       const char *msgid_plural, unsigned long int n,
-	       int category)
-{
-  const char *translation =
-    dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
-  if (translation == msg_ctxt_id || translation == msgid_plural)
-    return (n == 1 ? msgid : msgid_plural);
-  else
-    return translation;
-}
-
-/* The same thing extended for non-constant arguments.  Here MSGCTXT and MSGID
-   can be arbitrary expressions.  But for string literals these macros are
-   less efficient than those above.  */
-
-#include <string.h>
-
-#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
-  (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
-   /* || __STDC_VERSION__ >= 199901L */ )
-
-#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-#include <stdlib.h>
-#endif
-
-#define pgettext_expr(Msgctxt, Msgid) \
-  dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES)
-#define dpgettext_expr(Domainname, Msgctxt, Msgid) \
-  dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES)
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-dcpgettext_expr (const char *domain,
-		 const char *msgctxt, const char *msgid,
-		 int category)
-{
-  size_t msgctxt_len = strlen (msgctxt) + 1;
-  size_t msgid_len = strlen (msgid) + 1;
-  const char *translation;
-#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-  char msg_ctxt_id[msgctxt_len + msgid_len];
-#else
-  char buf[1024];
-  char *msg_ctxt_id =
-    (msgctxt_len + msgid_len <= sizeof (buf)
-     ? buf
-     : (char *) malloc (msgctxt_len + msgid_len));
-  if (msg_ctxt_id != NULL)
-#endif
-    {
-      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
-      msg_ctxt_id[msgctxt_len - 1] = '\004';
-      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
-      translation = dcgettext (domain, msg_ctxt_id, category);
-#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-      if (msg_ctxt_id != buf)
-	free (msg_ctxt_id);
-#endif
-      if (translation != msg_ctxt_id)
-	return translation;
-    }
-  return msgid;
-}
-
-#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \
-  dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
-#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \
-  dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES)
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static const char *
-dcnpgettext_expr (const char *domain,
-		  const char *msgctxt, const char *msgid,
-		  const char *msgid_plural, unsigned long int n,
-		  int category)
-{
-  size_t msgctxt_len = strlen (msgctxt) + 1;
-  size_t msgid_len = strlen (msgid) + 1;
-  const char *translation;
-#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-  char msg_ctxt_id[msgctxt_len + msgid_len];
-#else
-  char buf[1024];
-  char *msg_ctxt_id =
-    (msgctxt_len + msgid_len <= sizeof (buf)
-     ? buf
-     : (char *) malloc (msgctxt_len + msgid_len));
-  if (msg_ctxt_id != NULL)
-#endif
-    {
-      memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
-      msg_ctxt_id[msgctxt_len - 1] = '\004';
-      memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
-      translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
-#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-      if (msg_ctxt_id != buf)
-	free (msg_ctxt_id);
-#endif
-      if (!(translation == msg_ctxt_id || translation == msgid_plural))
-	return translation;
-    }
-  return (n == 1 ? msgid : msgid_plural);
-}
-
-#endif /* _LIBGETTEXT_H */

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/src/main.c
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/src/main.c b/src/bin/gpmapreduce/src/main.c
deleted file mode 100644
index 832027b..0000000
--- a/src/bin/gpmapreduce/src/main.c
+++ /dev/null
@@ -1,567 +0,0 @@
-#include <postgres_fe.h>
-#include <libpq-fe.h>
-
-#include <mapred.h>
-#include <mapred_errors.h>
-#include <except.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <getopt_long.h>
-#include <termios.h>
-#include <signal.h>
-
-ALLOW_EXCEPTIONS;
-
-static char  VERSION[] = 
-	"Greenplum Map/Reduce Driver 1.00b2";
-
-static char *wordchars = 
-	"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_";
-
-/* Initialize global variables */
-int             global_print_flag   = 0;
-int             global_debug_flag   = 0;
-int             global_verbose_flag = 0;
-int             global_explain_flag = 0;
-mapred_plist_t *global_plist        = NULL;
-
-/* libPQ cancel context */
-static PGcancel *volatile cancelConn = NULL;
-
-
-void usage(char *procname, boolean full);
-void showVersion(char *procname);
-int  main(int argc, char *argv[]);
-void read_password(char *p, size_t len);
-void check_version(PGconn *conn);
-
-static void sigint_handler(SIGNAL_ARGS);
-
-/* usage() - print usage information */
-void usage(char *procname, boolean full)
-{
-	if (full)
-	{
-		showVersion(procname);
-		printf("\nUsage:\n  ");
-	}
-
-	printf("%s [options] -f file.yml [dbname [username]]\n", procname);
-
-	if (full)
-	{
-		printf(
-			"\n"
-			"General options:\n"
-			"  -? | --help                   show this help, then exit\n"
-			"  -V | --version                show version information, then exit\n"
-			"  -v | --verbose                verbose output\n"
-			"  -x | --explain                do not run jobs, but produce explain plans\n"
-			"  -X | --explain-analyze        run jobs and produce explain-analyze plans\n"
-			"  -k | --key <name>=<value>     sets a yaml variable\n"
-			"\n"
-			"Connection options:\n"
-			"  -h | --host <hostname>        database server host or socket directory\n"
-			"  -p | --port <port>            database server port\n"
-			"  -U | --username <username>    database user name\n"
-			"  -W | --password               prompt for password\n"
-			);
-	}
-}
-
-void showVersion(char *procname)
-{
-	printf("%s - %s\n", procname, VERSION);
-}
-
-int main (int argc, char *argv[])
-{
-	volatile int       errcode = 0;
-	int                c;
-	char              *procname = argv[0];
-	int                forceprompt = false;
-	int                needpass = false;
-	char              *filename = NULL;
-	char              *username = NULL;
-	char              *database = NULL;
-	char              *hostname = NULL;
-	char              *port     = NULL;
-	mapred_olist_t    *documents;
-	mapred_olist_t    *doc_item;
-	FILE              *file;
-
-	/* The long_options structure */
-	static struct option long_options[] = {
-		{"help",     no_argument,       0, '?'},
-		{"version",  no_argument,       0, 'V'},
-		{"verbose",  no_argument,       0, 'v'},
-		{"password", no_argument,       0, 'W'},
-		{"explain",  no_argument,       0, 'x'},
-		{"explain-analyze", no_argument, 0, 'X'},
-
-		{"username", required_argument, 0, 'U'},
-		{"host",     required_argument, 0, 'h'},
-		{"port",     required_argument, 0, 'p'},
-		{"file",     required_argument, 0, 'f'},
-		{"key",      required_argument, 0, 'k'},
-#ifdef INTERNAL_BUILD
-		{"print",    no_argument,       0, 'P'},
-		{"debug",    no_argument,       0, 'D'},
-#endif
-		{0, 0, 0, 0}
-	};
-
-#ifdef INTERNAL_BUILD
-	static char* short_options = "VvWxXU:h:p:f:k:?PD";
-#else
-	static char* short_options = "VvWxXU:h:p:f:k:?";
-#endif
-
-	while (1)
-	{
-		int option_index = 0;
-		c = getopt_long(argc, argv, short_options, long_options, 
-						&option_index);
-		if (c == -1)
-			break; /* done processing options */
-		switch (c)
-		{
-			case '?':  /* --help */
-				
-				/* Actual help option given */
-				if (strcmp(argv[optind - 1], "-?") == 0 || 
-					strcmp(argv[optind - 1], "--help") == 0)
-				{
-					usage(procname, true);
-					exit(0);
-				}
-				
-				/* unknown option reported by getopt */
-				fprintf(stderr, "Try \"%s --help\" for usage information.\n",
-						procname);
-				exit(1);
-				
-			case 'V':  /* --version */
-				showVersion(procname);
-				exit(0);
-
-			case 'v':  /* --verbose */
-				global_verbose_flag = true;
-				break;
-
-			case 'x': /* --explain */
-				global_explain_flag |= global_explain;
-				break;
-
-			case 'X': /* --explain-analyze */
-				global_explain_flag |= global_explain | global_analyze;
-				break;
-
-#ifdef INTERNAL_BUILD
-			case 'P':  /* --print (INTERNAL_BUILD only) */
-				global_print_flag = 1;
-				break;
-
-			case 'D':  /* --debug (INTERNAL_BUILD only) */
-				global_debug_flag = 1;
-				break;
-#endif
-
-			case 'W':  /* --password */
-				forceprompt = true;
-				break;
-     
-			case 'U':  /* --username */
-				username = optarg;
-				break;
-     
-			case 'h':  /* --host */
-				hostname = optarg;
-				break;
-     
-			case 'p':  /* --port */
-				port = optarg;
-				break;
-
-			case 'f':  /* --file */
-				filename = optarg;
-				break;
-     
-			case 'k':  /* --key */
-			{
-				mapred_plist_t *newitem;
-				char *name = optarg;
-				char *value = NULL;
-				char *eq = strchr(name, '=');
-
-				/* 
-				 * either --key value      : sets parameter named "key"
-				 * or     --key name=value : sets parameter named "name"
-				 */
-				if (eq)
-				{
-					eq[0] = '\0';
-					value = eq+1;
-					
-					/* make sure parameter is a valid name */
-					if (strspn(name, wordchars) != strlen(name))
-					{
-						fprintf(stderr, "bad parameter --key %s\n", name);
-						exit(1);
-					}
-				}
-				else
-				{
-					value = name;
-					name = "key";
-				}
-
-				/* Add the parameter to the global parameter list */
-				newitem = malloc(sizeof(mapred_plist_t));
-				newitem->name  = name;
-				newitem->type  = value;
-				newitem->next  = global_plist;
-				global_plist   = newitem;
-			}
-			break;
-
-			default:  /* not feasible */
-				fprintf(stderr, "Error processing options\n");
-				exit(1);
-		}
-	}
-
-	/* open the file */
-	if (!filename)
-	{
-		usage(procname, false);
-		exit(1);
-	}
-
-	file = fopen(filename, "rb");
-	if (!file) 
-	{
-		fprintf(stderr, "Error: Could not open file '%s'\n", filename);
-		exit(1);
-	}
-
-	/*
-	 * Handle additional arguments as would psql:
-	 *   - First argument is database
-	 *   - Second argument is username, if not specified via -U
-	 *   - All other arguments generate warnings
-	 */
-	if (optind < argc && !database)
-		database = argv[optind++];
-	if (optind < argc && !username)
-		username = argv[optind++];
-	while (optind < argc)
-	{
-		fprintf(stderr, "%s: warning: extra command-line argument \"%s\" ignored\n",
-				procname, argv[optind++]);
-	}
-
-	if (global_verbose_flag)
-	{
-		mapred_plist_t *param = global_plist;
-		while (param)
-		{
-			fprintf(stderr, "- Parameter: %s=%s\n", 
-					param->name, param->type);
-			param = param->next;
-		}
-		fprintf(stderr, "- Parsing '%s':\n", filename);
-	}
-	documents = NULL;
-	XTRY
-	{
-		documents = mapred_parse_file(file);
-	}
-	XCATCH(ASSERTION_FAILURE)
-	{
-		fprintf(stderr, "Assertion failure at %s:%d\n",
-				xframe.file, xframe.lineno);	
-		exit(1);
-	}
-	XCATCH_ANY
-	{
-		if (global_verbose_flag)
-			fprintf(stderr, "  - ");
-		if (xframe.exception)
-			fprintf(stderr, "Error: %s\n", (char *) xframe.exception);
-		else
-			fprintf(stderr, "Unknown Error (%d) at %s:%d\n", 
-					xframe.errcode, xframe.file, xframe.lineno);
-		exit(1);
-	}
-	XTRY_END;
-
-	/* Do something interesting with documents */
-	for (doc_item = documents; doc_item; doc_item = doc_item->next)
-	{
-		PGconn   *conn = NULL;
-		char      pwdbuf[100];
-		char      portbuf[11];  /* max int size should be 10 digits */
-		char     *user, *db, *host, *pwd, *pqport, *options, *tty;
-
-		XTRY
-		{
-			mapred_document_t *doc = &doc_item->object->u.document;
-
-			if (global_verbose_flag)
-			{
-				fprintf(stderr, "- Executing Document %d:\n", doc->id);
-			}
-
-			if (port)
-			{
-				pqport = port;
-			}
-			else if (doc->port > 0)
-			{
-				snprintf(portbuf, sizeof(portbuf), "%d", doc->port);
-				pqport = portbuf;
-			}
-			else
-			{
-				pqport = NULL;
-			}
-			if (database)
-				db = database;
-			else
-				db = doc->database;
-			if (username)
-				user = username;
-			else
-				user = doc->user;
-			if (hostname)
-				host = hostname;
-			else
-				host = doc->host;
-
-			options = NULL;
-			tty     = NULL;
-			pwd     = NULL;
-
-			if (forceprompt)
-			{
-				read_password(pwdbuf, sizeof(pwdbuf));
-				pwd = pwdbuf;
-			}
-
-			do {
-				conn = PQsetdbLogin(host, pqport, options, tty, db, user, pwd);
-
-				needpass = false;
-				if (PQstatus(conn) == CONNECTION_BAD &&
-					!strcmp(PQerrorMessage(conn), PQnoPasswordSupplied))
-				{
-					PQfinish(conn);
-
-					read_password(pwdbuf, sizeof(pwdbuf));
-					pwd = pwdbuf;
-					needpass = true;
-				}
-			} while (needpass);
-
-			if (PQstatus(conn) == CONNECTION_BAD)
-			{
-				XRAISE(CONNECTION_ERROR, PQerrorMessage(conn));
-			}
-			else
-			{
-				if (global_verbose_flag)
-				{
-					fprintf(stderr, "  - Connected Established:\n");
-					fprintf(stderr, "    HOST: %s\n", 
-							PQhost(conn) ? PQhost(conn) : "localhost");
-					fprintf(stderr, "    PORT: %s\n", PQport(conn));
-					fprintf(stderr, "    USER: %s/%s\n", PQuser(conn), PQdb(conn));
-				}
-				check_version(conn);
-				
-				/* Prepare to receive interupts */
-				cancelConn = PQgetCancel(conn);
-
-				if (signal(SIGINT, sigint_handler) == SIG_IGN)
-					signal(SIGINT, SIG_IGN);
-				if (signal(SIGHUP, sigint_handler) == SIG_IGN)
-					signal(SIGHUP, SIG_IGN);
-				if (signal(SIGTERM, sigint_handler) == SIG_IGN)
-					signal(SIGTERM, SIG_IGN);
-
-				mapred_run_document(conn, doc);
-
-			}
-		}
-		XCATCH(ASSERTION_FAILURE)
-		{
-			fprintf(stderr, "Assertion failure at %s:%d\n",
-					xframe.file, xframe.lineno);	
-			errcode = 1;
-		}
-		XCATCH(USER_INTERUPT)
-		{
-			if (global_verbose_flag)
-				fprintf(stderr, "  - ");			
-			fprintf(stderr, "Job Cancelled: User Interrupt");
-			exit(2); /* exit immediately */
-		}
-		XCATCH_ANY
-		{
-			if (global_verbose_flag)
-				fprintf(stderr, "  - ");
-			if (xframe.exception)
-				fprintf(stderr, "Error: %s\n", (char *) xframe.exception);
-			else
-				fprintf(stderr, "Unknown Error (%d) at %s:%d\n", 
-						xframe.errcode, xframe.file, xframe.lineno);
-			errcode = 1;
-		}
-		XFINALLY
-		{
-			/* Ignore signals until we exit */
-			signal(SIGINT, SIG_IGN);
-			signal(SIGHUP, SIG_IGN);
-			signal(SIGTERM, SIG_IGN);
-
-			PQfreeCancel(cancelConn);
-			cancelConn = NULL;
-			PQfinish(conn);
-		}
-		XTRY_END;
-	}
-	
-	/* Cleanup */
-	mapred_destroy_olist(&documents);
-	fclose(file);
-
-	return errcode;
-}
-
-
-
-
-void read_password(char *p, size_t len)
-{
-    struct termios t_orig, t;
-    FILE *termin, *termout;
-
-    termin  = fopen("/dev/tty", "r");
-    termout = fopen("/dev/tty", "w");
-    if (!termin || !termout) 
-    {
-        if (termin)
-			fclose(termin);
-        if (termout)
-            fclose(termout);
-        termin = stdin;
-        termout = stdout;
-    }
-
-    tcgetattr(fileno(termin), &t);
-    t_orig = t;
-    t.c_lflag &= ~ECHO;
-    tcsetattr(fileno(termin), TCSAFLUSH, &t);
-	
-    fputs("Password> ", termout);
-    fflush(termout);
-
-    if (fgets(p, len, termin) == NULL)
-        p[0] = '\0';
-    
-    /* If that didn't get the whole input suck the rest off */
-    len = strlen(p);
-    if (len > 0)
-    {
-        if (p[len-1] == '\n')
-            p[len-1] = '\0';
-        else
-        {
-            char c[25];
-            do {
-                if (fgets(c, sizeof(c), termin) == NULL)
-                    break;
-                len = strlen(c);
-            } while (len > 0 && c[len-1] != '\n');
-        }
-    }
-
-    tcsetattr(fileno(termin), TCSAFLUSH, &t_orig);
-    fputs("\n", termout);
-    fflush(termout);
-
-    if (termin != stdin)
-    {
-        fclose(termin);
-        fclose(termout);
-    }
-}
-
-
-void check_version(PGconn *conn)
-{
-	PGresult *result;
-
-	result = PQexec(conn, "select (regexp_matches(version(), "
-					"E'\\\\(Greenplum Database ([^)]+)\\\\)'))[1]");
-
-	if (PQresultStatus(result) == PGRES_TUPLES_OK && PQntuples(result) == 1)
-	{
-		char *version = PQgetvalue(result, 0, 0);
-
-		if (global_verbose_flag)
-			fprintf(stderr, "    VERSION: %s\n", version);
-
-		/* Determine if this version is approved for mapreduce usage */
-		if (strncmp(version, "main", 4) != 0)
-		{
-			/* Get major and minor release, patch level is ignored */
-			char *dot   = NULL;
-			int   major = strtol(version, &dot, 10);
-			int   minor = strtol(dot+1, NULL, 10);
-			if (major < 3 || (major == 3 && minor < 2))
-			{
-				char buf[100];
-				snprintf(buf, sizeof(buf), 
-						 "Unsupported backend version: %s", version);
-				XRAISE(VERSION_ERROR, buf);	
-			}
-		}
-	}
-	else
-	{
-		fprintf(stderr, "%s", PQerrorMessage(conn));
-		XRAISE(MAPRED_SQL_ERROR, "Unable to determine Greenplum version\n");
-	}
-
-	PQclear(result);
-}
-
-
-/* 
- * sigint_handler() -  Interupt handler to cancel active queries 
- */
-static void sigint_handler(SIGNAL_ARGS)
-{
-	char errbuf[256];
-
-	/* Once we accept an interupt it's best to simply disable the handler */
-	signal(SIGINT, SIG_IGN);
-	signal(SIGHUP, SIG_IGN);
-	signal(SIGTERM, SIG_IGN);
-
-	if (cancelConn != NULL)
-	{
-		if (PQcancel(cancelConn, errbuf, sizeof(errbuf)))
-			fprintf(stderr, "Cancel request sent\n");
-		else
-		{
-			fprintf(stderr, "Could not send cancel request: ");
-			fprintf(stderr, "%s", errbuf);
-		}
-	}
-
-	XRAISE(USER_INTERUPT, "SIGINT");
-}


[05/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/configure
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/configure b/src/bin/gpmapreduce/yaml-0.1.1/configure
deleted file mode 100755
index 66e7082..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/configure
+++ /dev/null
@@ -1,21200 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yaml 0.1.1.
-#
-# Report bugs to <http://pyyaml.org/newticket?component=libyaml>.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-       echo_test_string=`eval $cmd` &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='yaml'
-PACKAGE_TARNAME='yaml'
-PACKAGE_VERSION='0.1.1'
-PACKAGE_STRING='yaml 0.1.1'
-PACKAGE_BUGREPORT='http://pyyaml.org/newticket?component=libyaml'
-
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-YAML_LT_RELEASE
-YAML_LT_CURRENT
-YAML_LT_REVISION
-YAML_LT_AGE
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-CPP
-LN_S
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-GREP
-EGREP
-ECHO
-AR
-RANLIB
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-CXXCPP
-F77
-FFLAGS
-ac_ct_F77
-LIBTOOL
-DOXYGEN
-DOXYGEN_TRUE
-DOXYGEN_FALSE
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-F77
-FFLAGS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures yaml 0.1.1 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/yaml]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of yaml 0.1.1:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-tags[=TAGS]      include additional configurations [automatic]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <http://pyyaml.org/newticket?component=libyaml>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-yaml configure 0.1.1
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by yaml $as_me 0.1.1, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-ac_aux_dir=
-for ac_dir in config "$srcdir"/config; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-am__api_version="1.9"
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='yaml'
- VERSION='0.1.1'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-# Define macro variables for the package version numbers.
-
-cat >>confdefs.h <<\_ACEOF
-#define YAML_VERSION_MAJOR 0
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define YAML_VERSION_MINOR 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define YAML_VERSION_PATCH 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define YAML_VERSION_STRING "0.1.1"
-_ACEOF
-
-
-# Define substitutions for the libtool version numbers.
-YAML_LT_RELEASE=0
-YAML_LT_CURRENT=1
-YAML_LT_REVISION=0
-YAML_LT_AGE=0
-
-
-
-
-
-# Note: in order to update checks, run `autoscan` and look through "configure.scan".
-
-# Checks for programs.
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5


<TRUNCATED>


[14/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/src/yaml_parse.y
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/src/yaml_parse.y b/src/bin/gpmapreduce/src/yaml_parse.y
deleted file mode 100644
index c1ceb27..0000000
--- a/src/bin/gpmapreduce/src/yaml_parse.y
+++ /dev/null
@@ -1,1066 +0,0 @@
-%output="yaml_parse.c"
-%name-prefix="yaml_yy"
-%pure-parser                             /* Because global variables are bad */
-%error-verbose                           /* A little extra debugging info */
-
-%{
-  #include <yaml_parse.h>
-  #include <yaml.h>
-  #include <parser.h>
-
-/*
- * Ancient flex versions, like the ones on our build machines don't support
- * flex .h file generation.
- */
-#if USE_FLEX_HFILE
-# include <yaml_scan.h>
-#endif
-
-  #include <stdio.h>
-
-  int  yaml_yylex(YYSTYPE *lvalp, mapred_parser_t *parser);
-  void yaml_yyerror(mapred_parser_t *parser, char const *);
-%}
-%parse-param {mapred_parser_t *parser}   /* So we can pass it to the lexer */
-%lex-param   {mapred_parser_t *parser}
-
-%union {
-  int                    keyword;
-  char                  *token;
-}
-
-/* Keyword tokens - be sure to keep in sync with keyword rules below */
-%token <keyword>
-  _COLUMNS_     _CONSOLIDATE_
-  _DATABASE_    _DEFINE_      _DELIMITER_
-  _ENCODING_    _ERROR_LIMIT_ _ESCAPE_      _EXEC_        _EXECUTE_
-  _FILE_        _FINALIZE_    _FORMAT_      _FUNCTION_
-  _GPFDIST_
-  _HOST_
-  _INITIALIZE_  _INPUT_
-  _KEYS_
-  _LANGUAGE_    _LIBRARY_
-  _MAP_         _MODE_
-  _NAME_        _NULL_
-  _OPTIMIZE_    _ORDERING_    _OUTPUT_
-  _PARAMETERS_  _PORT_ 
-  _QUERY_       _QUOTE_
-  _REDUCE_      _RETURNS_     _RUN_
-  _SOURCE_
-  _TABLE_       _TARGET_      _TASK_        _TRANSITION_ 
-  _USER_
-  _VERSION_
-
-
- /* Non-keyword scalar tokens */
-%token <token> _INTEGER_
-%token <token> _VERSION_STRING_
-%token <token> _ID_
-%token <token> _STRING_
-%type  <token>        scalar
-
-/* YAML State tokens */
-%token START_STREAM   END_STREAM
-%token START_DOCUMENT END_DOCUMENT
-%token START_LIST     END_LIST
-%token START_MAP      END_MAP
-
-/* and the special "ERROR" token */
-%token ERROR
-
-%% /* Grammar rules and actions follow */
-
-
-stream:
-    START_STREAM 
-    document_list 
-    END_STREAM       
-    { 
-      if (parser->current_doc &&
-		  parser->current_doc->u.document.flags & mapred_document_error)
-	  {
-		  YYABORT;  /* If we found an error, return error */
-	  }
-	}
-    ;
-
-/* 
- * For error recovery we often need all the keywords except 'foo', to help
- * facilitate this I break the keywords into logical groupings.
- */
-doc_keywords:
-    _DATABASE_|_DEFINE_|_EXECUTE_|_HOST_|_PORT_|_USER_|_VERSION_ 
-    ;
-
-obj_keywords:
-    def_keywords|exec_keywords
-    ;
-
-def_keywords:
-    _CONSOLIDATE_|_FINALIZE_|_INPUT_|_MAP_|_OUTPUT_|_REDUCE_|
-    _TASK_|_TRANSITION_ 
-    ;
-
-exec_keywords:
-    _RUN_
-    ;
-
-func_keywords:
-    _FUNCTION_|_LANGUAGE_|_OPTIMIZE_|_PARAMETERS_|_RETURNS_|_MODE_|_LIBRARY_
-    ;
-
-io_keywords:
-    _COLUMNS_|_DELIMITER_|_ENCODING_|_ERROR_LIMIT_|_ESCAPE_|_EXEC_|
-    _FILE_|_FORMAT_|_GPFDIST_|_NULL_|_QUERY_|_QUOTE_|_TABLE_
-    ;
-
-misc_keywords:
-    _INITIALIZE_|_KEYS_|_ORDERING_|_SOURCE_|_TARGET_
-    ;
-
-keyword:
-    _NAME_|doc_keywords|obj_keywords|func_keywords|io_keywords|misc_keywords ;
-
-document_list: 
-    | document_list document
-    ;
-
-document:  
-    START_DOCUMENT                 { parser_begin_document(parser); }
-    document_contents
-    END_DOCUMENT
-    | error END_DOCUMENT
-	;
-
-document_contents:
-    START_MAP doc_item_list END_MAP
-
-    | valid_yaml_list
-      { yaml_yyerror(parser, "Greenplum MapReduce document must begin with a YAML MAPPING"); }
-    | scalar
-      { yaml_yyerror(parser, "Greenplum MapReduce document must begin with a YAML MAPPING"); }
-    ;
-
-doc_item_list:
-    doc_item
-    | doc_item_list doc_item
-    ;
-
-doc_item:
-    _VERSION_     doc_version  
-    | _DATABASE_  doc_database
-    | _USER_      doc_user
-    | _HOST_      doc_host
-    | _PORT_      doc_port
-    | _DEFINE_    doc_define
-    | _EXECUTE_   doc_execute
-
-	| _NAME_           { yaml_yyerror(parser, "Invalid Document Attribute"); } valid_yaml
-	| obj_keywords     { yaml_yyerror(parser, "Invalid Document Attribute"); } valid_yaml
-	| func_keywords    { yaml_yyerror(parser, "Invalid Document Attribute"); } valid_yaml
-	| io_keywords      { yaml_yyerror(parser, "Invalid Document Attribute"); } valid_yaml
-	| misc_keywords    { yaml_yyerror(parser, "Invalid Document Attribute"); } valid_yaml
-	| scalar           { yaml_yyerror(parser, "Invalid Document Attribute"); } valid_yaml
-	| valid_yaml_list  { yaml_yyerror(parser, "Invalid Document Attribute"); } valid_yaml
-	| valid_yaml_map   { yaml_yyerror(parser, "Invalid Document Attribute"); } valid_yaml
-    ;
-
-doc_version:
-    _VERSION_STRING_              { parser_set_version(parser, $1); }
-
-    | valid_yaml_list             { yaml_yyerror(parser, "VERSION must be a scalar value"); }
-    | valid_yaml_map              { yaml_yyerror(parser, "VERSION must be a scalar value"); }
-    | _STRING_                    { yaml_yyerror(parser, "Invalid VERSION format"); }
-    | _INTEGER_                   { yaml_yyerror(parser, "Invalid VERSION format"); }
-    | _ID_                        { yaml_yyerror(parser, "Invalid VERSION format"); }
-    | error                       { yaml_yyerror(parser, "Invalid VERSION format"); }
-    ;
-
-doc_database:
-      _ID_                        { parser_set_database(parser, $1); }
-
-    | valid_yaml_list             { yaml_yyerror(parser, "DATABASE must be a scalar value"); }
-    | valid_yaml_map              { yaml_yyerror(parser, "DATABASE must be a scalar value"); }
-    | _STRING_                    { yaml_yyerror(parser, "Invalid DATABASE format"); }
-    | _INTEGER_                   { yaml_yyerror(parser, "Invalid DATABASE format"); }
-    | _VERSION_STRING_            { yaml_yyerror(parser, "Invalid DATABASE format"); }
-    | error                       { yaml_yyerror(parser, "Invalid DATABASE format"); }
-    ;
-
-doc_user:
-      _ID_                        { parser_set_user(parser, $1); }
-
-    | valid_yaml_list             { yaml_yyerror(parser, "USER must be a scalar value"); }
-    | valid_yaml_map              { yaml_yyerror(parser, "USER must be a scalar value"); }
-    | _STRING_                    { yaml_yyerror(parser, "Invalid USER format"); }
-    | _INTEGER_                   { yaml_yyerror(parser, "Invalid USER format"); }
-    | _VERSION_STRING_            { yaml_yyerror(parser, "Invalid USER format"); }
-    | error                       { yaml_yyerror(parser, "Invalid USER format"); }
-    ;
-
-doc_host:
-      scalar                      { parser_set_host(parser, $1); }
-
-    | valid_yaml_list             { yaml_yyerror(parser, "HOST must be a scalar value"); }
-    | valid_yaml_map              { yaml_yyerror(parser, "HOST must be a scalar value"); }
-    | error                       { yaml_yyerror(parser, "Invalid HOST format"); }
-    ;
-
-doc_port:
-      _INTEGER_                   { parser_set_port(parser, $1); }
-
-    | valid_yaml_list             { yaml_yyerror(parser, "PORT must be an integer value"); }
-    | valid_yaml_map              { yaml_yyerror(parser, "PORT must be an integer value"); }
-    | _ID_                        { yaml_yyerror(parser, "PORT must be an integer value"); }
-    | _STRING_                    { yaml_yyerror(parser, "PORT must be an integer value"); }
-    | _VERSION_STRING_            { yaml_yyerror(parser, "PORT must be an integer value"); }
-    | error                       { yaml_yyerror(parser, "PORT must be an integer value"); }
-    ;
-
-doc_define:
-      START_LIST                  { parser_begin_define(parser); }
-      define_list  
-      END_LIST
-
-    | scalar                      { yaml_yyerror(parser, "DEFINE must be a YAML LIST"); }
-    | keyword                     { yaml_yyerror(parser, "DEFINE must be a YAML LIST"); }
-    | valid_yaml_map              { yaml_yyerror(parser, "DEFINE must be a YAML LIST"); }
-
-doc_execute:
-      START_LIST                  { parser_begin_execute(parser); }
-      execute_list
-      END_LIST
-
-    | scalar                      { yaml_yyerror(parser, "EXECUTE must be a YAML LIST"); }
-    | keyword                     { yaml_yyerror(parser, "EXECUTE must be a YAML LIST"); }
-    | valid_yaml_map              { yaml_yyerror(parser, "EXECUTE must be a YAML LIST"); }
-
-   
-execute_list:
-    /* empty */
-    | execute_list  
-      START_MAP 
-      execute_item 
-      END_MAP 
-
-    | valid_yaml_list             { yaml_yyerror(parser, "List element found in EXECUTE"); }
-    | scalar 
-      {
-		  char buffer[128];
-		  snprintf(buffer, sizeof(buffer), "Scalar value '%s' found in EXECUTE", $1);
-		  yaml_yyerror(parser, buffer);
-	  }
-    ;
-
-execute_item:
-        _RUN_        { parser_add_run(parser); }       
-        run_map
-
-      | _NAME_           { yaml_yyerror(parser, "Invalid EXECUTE Attribute"); } valid_yaml
-      | def_keywords     { yaml_yyerror(parser, "Invalid EXECUTE Attribute"); } valid_yaml
-	  | func_keywords    { yaml_yyerror(parser, "Invalid EXECUTE Attribute"); } valid_yaml
-	  | io_keywords      { yaml_yyerror(parser, "Invalid EXECUTE Attribute"); } valid_yaml
-	  | misc_keywords    { yaml_yyerror(parser, "Invalid EXECUTE Attribute"); } valid_yaml
-	  | valid_yaml_list  { yaml_yyerror(parser, "YAML LIST element found in EXECUTE"); } valid_yaml
-  	  | valid_yaml_map   { yaml_yyerror(parser, "YAML MAPPING element found in EXECUTE"); } valid_yaml
-	  | scalar          
-        {
-			char buffer[128];
-			snprintf(buffer, sizeof(buffer), "'%s' is not a valid EXECUTE element", $1);
-			yaml_yyerror(parser, buffer); 
-		} 
-        valid_yaml
-      ;
-
-define_list:
-      /* empty */
-      | define_list     
-        START_MAP 
-        define_item
-  	    more_define_items           /* errors if there actually is something */
-        END_MAP
-
-      | valid_yaml_list             { yaml_yyerror(parser, "List element found in DEFINE"); }
-      | scalar 
-        {
-			char buffer[128];
-			snprintf(buffer, sizeof(buffer), "Scalar value '%s' found in DEFINE", $1);
-			yaml_yyerror(parser, buffer);
-		}
-      ;
-
-more_define_items:
-       /* only good second item is one that doesn't exist */
-	  | keyword    { yaml_yyerror(parser, "Multiple objects in one list element"); } valid_yaml
-	    more_define_items
-      | valid_yaml { yaml_yyerror(parser, "Multiple objects in one list element"); } valid_yaml
-	    more_define_items
-
-
-define_item:
-        _INPUT_      { parser_add_object(parser, MAPRED_INPUT); }       input_map
-      | _OUTPUT_     { parser_add_object(parser, MAPRED_OUTPUT); }      output_map
-      | _REDUCE_     { parser_add_object(parser, MAPRED_REDUCER); }     reduce_map 
-      | _MAP_        { parser_add_object(parser, MAPRED_MAPPER); }      function_map
-      | _TRANSITION_ { parser_add_object(parser, MAPRED_TRANSITION); }  function_map
-      | _CONSOLIDATE_ { parser_add_object(parser, MAPRED_COMBINER); }   function_map
-      | _FINALIZE_   { parser_add_object(parser, MAPRED_FINALIZER); }   function_map
-      | _TASK_       { parser_add_object(parser, MAPRED_TASK); }        task_map
-
-
-	  | _NAME_          { yaml_yyerror(parser, "Invalid DEFINE Attribute"); } valid_yaml
-	  | exec_keywords   { yaml_yyerror(parser, "Invalid DEFINE Attribute"); } valid_yaml
-      | func_keywords   { yaml_yyerror(parser, "Invalid DEFINE Attribute"); } valid_yaml
-      | io_keywords     { yaml_yyerror(parser, "Invalid DEFINE Attribute"); } valid_yaml
-      | misc_keywords   { yaml_yyerror(parser, "Invalid DEFINE Attribute"); } valid_yaml
-  	  | valid_yaml_list { yaml_yyerror(parser, "YAML LIST element found in DEFINE"); } valid_yaml
-  	  | valid_yaml_map  { yaml_yyerror(parser, "YAML MAPPING element found in DEFINE"); } valid_yaml
-	  | scalar
-        {
-			char buffer[128];
-			snprintf(buffer, sizeof(buffer), "'%s' is not a valid DEFINE element", $1);
-			yaml_yyerror(parser, buffer); 
-		} valid_yaml
-      ;
-
-input_map:
-      START_MAP input_item_map END_MAP
-
-	  | valid_yaml_list  { yaml_yyerror(parser, "INPUT must contain a YAML MAPPING"); }
-      | scalar           { yaml_yyerror(parser, "INPUT must contain a YAML MAPPING"); }
-      ;
-
-output_map:       
-      START_MAP output_item_map END_MAP 
-
-	  | valid_yaml_list  { yaml_yyerror(parser, "OUTPUT must contain a YAML MAPPING"); }
-      | scalar           { yaml_yyerror(parser, "OUTPUT must contain a YAML MAPPING"); }
-	  ;
-
-reduce_map:       
-      START_MAP reduce_item_map END_MAP
-
-	  | valid_yaml_list  { yaml_yyerror(parser, "REDUCE must contain a YAML MAPPING"); }
-      | scalar           { yaml_yyerror(parser, "REDUCE must contain a YAML MAPPING"); }
-	  ;
-
-function_map:     
-      START_MAP function_item_map END_MAP
-
-	  /* FIXME: error should refer to MAP/TRANSITION/... not FUNCTION */
-	  | valid_yaml_list  { yaml_yyerror(parser, "FUNCTION must contain a YAML MAPPING"); }
-      | scalar           { yaml_yyerror(parser, "FUNCTION must contain a YAML MAPPING"); }
-	  ;
-
-task_map:         
-       START_MAP task_item_map END_MAP
-
-	  | valid_yaml_list  { yaml_yyerror(parser, "TASK must contain a YAML MAPPING"); }
-      | scalar           { yaml_yyerror(parser, "TASK must contain a YAML MAPPING"); }
-	  ;
-
-run_map:
-        START_MAP run_item_map END_MAP
-
-	  | valid_yaml_list  { yaml_yyerror(parser, "RUN must contain a YAML MAPPING"); }
-      | scalar           { yaml_yyerror(parser, "RUN must contain a YAML MAPPING"); }
-	  ;
-
-
-input_item_map:       input_item | input_item_map    input_item ;
-output_item_map:     output_item | output_item_map   output_item ;
-reduce_item_map:     reduce_item | reduce_item_map   reduce_item ;
-function_item_map: function_item | function_item_map function_item ;
-task_item_map:         task_item | task_item_map     task_item ;
-run_item_map:           run_item | run_item_map      run_item ;
-
-input_item:
-        _NAME_      obj_name
-      | _COLUMNS_               { parser_begin_columns(parser); }     column_list
-      | _FILE_                  { parser_begin_files(parser); }       file_list
-      | _GPFDIST_               { parser_begin_gpfdist(parser); }     file_list
-      | _TABLE_     io_table
-      | _QUERY_     input_query
-      | _EXEC_      input_exec
-      | _FORMAT_    io_format
-      | _DELIMITER_ scalar      { parser_set_delimiter(parser, $2); }
-      | _NULL_      scalar      { parser_set_null(parser, $2); }
-      | _QUOTE_     scalar      { parser_set_quote(parser, $2); }
-      | _ESCAPE_    scalar      { parser_set_escape(parser, $2); }
-      | _ENCODING_  scalar      { parser_set_encoding(parser, $2); }
-      | _ERROR_LIMIT_ _INTEGER_ { parser_set_error_limit(parser, $2); }
-
-    /* Error recovery */
-      | _DELIMITER_   valid_yaml_list { parser_set_delimiter(parser, 0); }
-      | _DELIMITER_   valid_yaml_map  { parser_set_delimiter(parser, 0); }
-      | _NULL_        valid_yaml_list { parser_set_null(parser, 0); }
-      | _NULL_        valid_yaml_map  { parser_set_null(parser, 0); }
-      | _QUOTE_       valid_yaml_list { parser_set_quote(parser, 0); }
-      | _QUOTE_       valid_yaml_map  { parser_set_quote(parser, 0); }
-      | _ESCAPE_      valid_yaml_list { parser_set_escape(parser, 0); }
-      | _ESCAPE_      valid_yaml_map  { parser_set_escape(parser, 0); }
-      | _ENCODING_    valid_yaml_list { parser_set_encoding(parser, 0); }
-      | _ENCODING_    valid_yaml_map  { parser_set_encoding(parser, 0); }
-      | _ERROR_LIMIT_ valid_yaml_list { parser_set_error_limit(parser, 0); }
-      | _ERROR_LIMIT_ valid_yaml_map  { parser_set_error_limit(parser, 0); }
-      | _ERROR_LIMIT_ _STRING_        { parser_set_error_limit(parser, 0); }
-      | _ERROR_LIMIT_ _ID_            { parser_set_error_limit(parser, 0); }
-      | _ERROR_LIMIT_ _VERSION_STRING_ { parser_set_error_limit(parser, 0); }
-	  | doc_keywords      { yaml_yyerror(parser, "Invalid INPUT Attribute"); } valid_yaml
-	  | obj_keywords      { yaml_yyerror(parser, "Invalid INPUT Attribute"); } valid_yaml
-      | func_keywords     { yaml_yyerror(parser, "Invalid INPUT Attribute"); } valid_yaml
-      | misc_keywords     { yaml_yyerror(parser, "Invalid INPUT Attribute"); } valid_yaml
-  	  | valid_yaml_list   { yaml_yyerror(parser, "YAML LIST element found in INPUT"); } valid_yaml
-  	  | valid_yaml_map    { yaml_yyerror(parser, "YAML MAPPING element found in INPUT"); } valid_yaml
-	  | scalar
-       {
-		   char buffer[128];
-		   snprintf(buffer, 128, "%s is not a valid INPUT attribute", $1);
-		   yaml_yyerror(parser, buffer); 
-	   } valid_yaml
-      ;
-
-
-output_item:
-        _NAME_      obj_name
-      | _TABLE_     io_table
-      | _FILE_      scalar         { parser_set_file(parser, $2); }
-      | _FORMAT_    io_format
-      | _DELIMITER_ scalar    { parser_set_delimiter(parser, $2); }
-      | _MODE_ scalar         { parser_set_mode(parser, $2); }
-
-    /* Error recovery */
-      | _FILE_      valid_yaml_list     { parser_set_file(parser, 0); }
-      | _FILE_      valid_yaml_map      { parser_set_file(parser, 0); }
-      | _DELIMITER_ valid_yaml_list     { parser_set_delimiter(parser, 0); }
-      | _DELIMITER_ valid_yaml_map      { parser_set_delimiter(parser, 0); }
-      | _MODE_      valid_yaml_list     { parser_set_mode(parser, 0); }
-      | _MODE_      valid_yaml_map      { parser_set_mode(parser, 0); }
-	  | doc_keywords          { yaml_yyerror(parser, "Invalid OUTPUT Attribute"); } valid_yaml
-	  | obj_keywords          { yaml_yyerror(parser, "Invalid OUTPUT Attribute"); } valid_yaml
-	  | _FUNCTION_            { yaml_yyerror(parser, "Invalid OUTPUT Attribute"); } valid_yaml
-	  | _LIBRARY_             { yaml_yyerror(parser, "Invalid OUTPUT Attribute"); } valid_yaml
-	  | _LANGUAGE_            { yaml_yyerror(parser, "Invalid OUTPUT Attribute"); } valid_yaml
-	  | _OPTIMIZE_            { yaml_yyerror(parser, "Invalid OUTPUT Attribute"); } valid_yaml
-	  | _PARAMETERS_          { yaml_yyerror(parser, "Invalid OUTPUT Attribute"); } valid_yaml
-	  | _RETURNS_             { yaml_yyerror(parser, "Invalid OUTPUT Attribute"); } valid_yaml
-      | misc_keywords         { yaml_yyerror(parser, "Invalid OUTPUT Attribute"); } valid_yaml
-  	  | valid_yaml_list       { yaml_yyerror(parser, "YAML LIST element found in OUTPUT"); } valid_yaml
-  	  | valid_yaml_map        { yaml_yyerror(parser, "YAML MAPPING element found in OUTPUT"); } valid_yaml
-
-	  | _STRING_            
-       {
-		   char buffer[128];
-		   snprintf(buffer, 128, "%s is not a valid OUTPUT attribute", $1);
-		   yaml_yyerror(parser, buffer);
-	   } valid_yaml
-      ;
-
-reduce_item:
-        _NAME_       obj_name
-      | _TRANSITION_ _ID_     { parser_set_transition(parser, $2); }
-      | _CONSOLIDATE_ _ID_    { parser_set_combiner(parser, $2); }
-      | _FINALIZE_   _ID_     { parser_set_finalizer(parser, $2); }
-      | _INITIALIZE_ scalar   { parser_set_initialize(parser, $2); }
-      | _KEYS_                { parser_begin_keys(parser); }
-           key_list
-      | _ORDERING_            { parser_begin_ordering(parser); }
-           ordering_list
-
-    /* Error recovery */
-	  | _INPUT_               { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-	  | _OUTPUT_              { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-	  | _MAP_                 { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-	  | _REDUCE_              { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-	  | _TASK_                { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-	  | _SOURCE_              { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-	  | _TARGET_              { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-	  | doc_keywords          { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-	  | exec_keywords         { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-	  | func_keywords         { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-      | io_keywords           { yaml_yyerror(parser, "Invalid REDUCE Attribute"); } valid_yaml
-  	  | valid_yaml_list       { yaml_yyerror(parser, "YAML LIST element found in REDUCE"); } valid_yaml
-  	  | valid_yaml_map        { yaml_yyerror(parser, "YAML MAPPING element found in REDUCE"); } valid_yaml
-	  | _STRING_            
-        {
-			char buffer[128];
-			snprintf(buffer, 128, "%s is not a valid REDUCER attribute", $1);
-			yaml_yyerror(parser, buffer); 
-		} valid_yaml
-      ;
-
-function_item:
-       _NAME_ obj_name
-      | _LANGUAGE_ scalar     { parser_set_language(parser, $2); }
-      | _FUNCTION_ scalar     { parser_set_function(parser, $2); }
-      | _LIBRARY_ scalar      { parser_set_library(parser, $2); }
-      | _MODE_ scalar         { parser_set_mode(parser, $2); }
-      | _OPTIMIZE_ scalar     { parser_set_optimize(parser, $2); }
-      | _PARAMETERS_          { parser_begin_parameters(parser); } 
-           parameter_list
-      | _RETURNS_             { parser_begin_returns(parser); }
-           return_list
-
-    /* Error recovery */
-      | _LANGUAGE_  valid_yaml_map   { parser_set_language(parser, 0); }
-      | _LANGUAGE_  valid_yaml_list  { parser_set_language(parser, 0); }
-      | _FUNCTION_  valid_yaml_map   { parser_set_function(parser, 0); }
-      | _FUNCTION_  valid_yaml_list  { parser_set_function(parser, 0); }
-      | _LIBRARY_   valid_yaml_map   { parser_set_library(parser, 0); }
-      | _LIBRARY_   valid_yaml_list  { parser_set_library(parser, 0); }
-      | _MODE_      valid_yaml_map   { parser_set_mode(parser, 0); }
-      | _MODE_      valid_yaml_list  { parser_set_mode(parser, 0); }
-      | _OPTIMIZE_  valid_yaml_map   { parser_set_optimize(parser, 0); }
-      | _OPTIMIZE_  valid_yaml_list  { parser_set_optimize(parser, 0); }
-	  | doc_keywords   { yaml_yyerror(parser, "Invalid FUNCTION Attribute"); } valid_yaml
-	  | obj_keywords   { yaml_yyerror(parser, "Invalid FUNCTION Attribute"); } valid_yaml
-      | io_keywords    { yaml_yyerror(parser, "Invalid FUNCTION Attribute"); } valid_yaml
-      | misc_keywords  { yaml_yyerror(parser, "Invalid FUNCTION Attribute"); } valid_yaml
-  	  | valid_yaml_list  { yaml_yyerror(parser, "YAML LIST element found in FUNCTION"); } valid_yaml
-  	  | valid_yaml_map   { yaml_yyerror(parser, "YAML MAPPING element found in FUNCTION"); } valid_yaml
-	  | _STRING_            
-        {
-			char buffer[128];
-			snprintf(buffer, 128, "%s is not a valid FUNCTION attribute", $1);
-			yaml_yyerror(parser, buffer); 
-		} valid_yaml
-      ;
-
-task_item:
-      _NAME_      obj_name
-      | _SOURCE_  _ID_        { parser_set_source(parser, $2); }
-      | _MAP_     _ID_        { parser_set_mapper(parser, $2); }
-      | _REDUCE_  _ID_        { parser_set_reducer(parser, $2); }
-
-    /* Error recovery */
-	  | doc_keywords          { yaml_yyerror(parser, "Invalid TASK Attribute"); } valid_yaml
-	  | exec_keywords         { yaml_yyerror(parser, "Invalid TASK Attribute"); } valid_yaml
-	  | _TRANSITION_          { yaml_yyerror(parser, "Invalid TASK Attribute"); } valid_yaml
-	  | _CONSOLIDATE_         { yaml_yyerror(parser, "Invalid TASK Attribute"); } valid_yaml
-	  | _FINALIZE_            { yaml_yyerror(parser, "Invalid TASK Attribute"); } valid_yaml
-	  | _INPUT_               { yaml_yyerror(parser, "Invalid TASK Attribute"); } valid_yaml
-	  | _OUTPUT_              { yaml_yyerror(parser, "Invalid TASK Attribute"); } valid_yaml
-      | io_keywords           { yaml_yyerror(parser, "Invalid TASK Attribute"); } valid_yaml
-      | _INITIALIZE_          { yaml_yyerror(parser, "Invalid TASK Attribute"); } valid_yaml
-      | _TARGET_              { yaml_yyerror(parser, "Invalid TASK Attribute"); } valid_yaml
-  	  | valid_yaml_list       { yaml_yyerror(parser, "YAML LIST element found in TASK"); } valid_yaml
-  	  | valid_yaml_map        { yaml_yyerror(parser, "YAML MAPPING element found in TASK"); } valid_yaml
-	  | _STRING_            
-        {
-			char buffer[128];
-			snprintf(buffer, 128, "%s is not a valid TASK attribute", $1);
-			yaml_yyerror(parser, buffer); 
-		} valid_yaml
-      ;
-
-run_item:
-      _NAME_      obj_name
-      | _SOURCE_  _ID_        { parser_set_source(parser, $2); }
-      | _TARGET_  _ID_        { parser_set_target(parser, $2); }
-      | _MAP_     _ID_        { parser_set_mapper(parser, $2); }
-      | _REDUCE_  _ID_        { parser_set_reducer(parser, $2); }
-
-    /* Error recovery */
-      | _INITIALIZE_          { yaml_yyerror(parser, "Invalid RUN Attribute"); } valid_yaml
-	  | doc_keywords          { yaml_yyerror(parser, "Invalid RUN Attribute"); } valid_yaml
-	  | exec_keywords         { yaml_yyerror(parser, "Invalid RUN Attribute"); } valid_yaml
-	  | _TRANSITION_          { yaml_yyerror(parser, "Invalid RUN Attribute"); } valid_yaml
-	  | _CONSOLIDATE_         { yaml_yyerror(parser, "Invalid RUN Attribute"); } valid_yaml
-	  | _FINALIZE_            { yaml_yyerror(parser, "Invalid RUN Attribute"); } valid_yaml
-	  | _INPUT_               { yaml_yyerror(parser, "Invalid RUN Attribute"); } valid_yaml
-	  | _OUTPUT_              { yaml_yyerror(parser, "Invalid RUN Attribute"); } valid_yaml
-      | io_keywords           { yaml_yyerror(parser, "Invalid RUN Attribute"); } valid_yaml
-  	  | valid_yaml_list       { yaml_yyerror(parser, "YAML LIST element found in RUN"); } valid_yaml
-  	  | valid_yaml_map        { yaml_yyerror(parser, "YAML MAPPING element found in RUN"); } valid_yaml
-	  | _STRING_             
-        {
-			char buffer[128];
-			snprintf(buffer, 128, "%s is not a valid RUN attribute", $1);
-			yaml_yyerror(parser, buffer); 
-		} valid_yaml
-      ;
-
-
-/* rules primarily created for error handling */
-obj_name:
-      _ID_                        { parser_set_name(parser, $1); }
-
-    /* Error recovery */
-    | { parser_set_name(parser, 0); }  _STRING_
-    | { parser_set_name(parser, 0); }  _INTEGER_
-    | { parser_set_name(parser, 0); }  _VERSION_STRING_
-    | { parser_set_name(parser, 0); }  valid_yaml_list
-    | { parser_set_name(parser, 0); }  valid_yaml_map
-    | { 
-         parser_set_name(parser, 0); 
-         YYERROR;    /* Can't recover from unknown error */
-      }  error
-    ;
-
-io_table:
-      _ID_                        { parser_set_table(parser, $1); }
-
-    /* Error recovery */
-    | { parser_set_table(parser, 0); }  valid_yaml_list             
-    | { parser_set_table(parser, 0); }  valid_yaml_map
-    | { parser_set_table(parser, 0); }  _STRING_
-    | { parser_set_table(parser, 0); }  _INTEGER_
-    | { parser_set_table(parser, 0); }  _VERSION_STRING_
-    | {
-		  parser_set_table(parser, 0);
-		  YYERROR;   /* Can't recover from unknown error */
-	  } error
-    ;
-
-input_query:
-      scalar                      { parser_set_query(parser, $1); }
-
-      /* Error recovery */
-    | valid_yaml_list             { parser_set_query(parser, 0); }
-    | valid_yaml_map              { parser_set_query(parser, 0); }
-    | error           
-      {
-		  parser_set_query(parser, 0);
-		  YYERROR;   /* Can't recover from unknown error */
-	  }
-    ;
-
-input_exec:
-      scalar                      { parser_set_exec(parser, $1); }
-
-      /* Error recovery */
-    | valid_yaml_list             { parser_set_exec(parser, 0); }
-    | valid_yaml_map              { parser_set_exec(parser, 0); }
-    | error           
-      {
-		  parser_set_exec(parser, 0);
-		  YYERROR;   /* Can't recover from unknown error */
-	  }
-    ;
-
-io_format:
-      scalar                    { parser_set_format(parser, $1); }
-
-      /* Error recovery */
-    | valid_yaml_list           { parser_set_format(parser, 0); }
-    | valid_yaml_map            { parser_set_format(parser, 0); }
-    | error           
-      {
-		  parser_set_format(parser, 0);
-		  YYERROR;   /* Can't recover from unknown error */
-	  }
-    ;
-
-
-
-/* Could probably make these more generic */
-file_list:
-        scalar                { parser_add_file(parser, $1); }
-      | START_LIST file_list_2 END_LIST
-	  
-      /* Error recovery */
-	  | valid_yaml_map        { parser_add_file(parser, 0); }
-      ;
-
-file_list_2:
-      /* empty */
-      | file_list_2 scalar    { parser_add_file(parser, $2); }
-
-      /* Error recovery */
-	  | valid_yaml_map        { parser_add_file(parser, 0); }
-	  | valid_yaml_list       { parser_add_file(parser, 0); }
-      ;
-
-column_list:
-        scalar                { parser_add_column(parser, $1); }
-      | START_LIST column_list_2 END_LIST
-
-      /* Error recovery */
-	  | valid_yaml_map        { parser_add_column(parser, 0); }
-      ;
-
-column_list_2:
-      /* empty */
-      | column_list_2 scalar  { parser_add_column(parser, $2); }
-
-      /* Error recovery */
-	  | valid_yaml_map        { parser_add_column(parser, 0); }
-	  | valid_yaml_list       { parser_add_column(parser, 0); }
-      ;
-
-parameter_list:
-        scalar                { parser_add_parameter(parser, $1); }
-      | START_LIST parameter_list_2 END_LIST
-
-      /* Error recovery */
-	  | valid_yaml_map        { parser_add_parameter(parser, 0); }
-      ;
-
-
-parameter_list_2:
-      /* empty */
-      | parameter_list_2 scalar { parser_add_parameter(parser, $2); }
-
-      /* Error recovery */
-      | valid_yaml_map        { parser_add_parameter(parser, 0); }
-      | valid_yaml_list       { parser_add_parameter(parser, 0); }
-      ;
-
-
-return_list:
-        scalar                { parser_add_return(parser, $1); }
-      | START_LIST return_list_2 END_LIST
-
-	  | valid_yaml_map        { parser_add_return(parser, 0); }
-	  ;
-
-return_list_2:
-      /* empty */
-      | return_list_2 scalar    { parser_add_return(parser, $2); }
-
-      /* Error recovery */
-	  | valid_yaml_map          { parser_add_return(parser, 0); }
-	  | valid_yaml_list         { parser_add_return(parser, 0); }
-      ;
-
-key_list:
-        scalar                { parser_add_key(parser, $1); }
-      | START_LIST key_list_2 END_LIST
-
-      /* Error recovery */
-	  | valid_yaml_map        { parser_add_key(parser, 0); }
-	  ;
-
-key_list_2:
-      /* empty */
-      | key_list_2 scalar     { parser_add_key(parser, $2); }
-
-      /* Error recovery */
-	  | valid_yaml_map        { parser_add_key(parser, 0); }
-	  | valid_yaml_list       { parser_add_key(parser, 0); }
-      ;
-
-
-ordering_list:
-        scalar                { parser_add_ordering(parser, $1); }
-      | START_LIST ordering_list_2 END_LIST
-
-      /* Error recovery */
-	  | valid_yaml_map        { parser_add_ordering(parser, 0); }
-	  ;
-
-ordering_list_2:
-      /* empty */
-      | ordering_list_2 scalar { parser_add_ordering(parser, $2); }
-
-      /* Error recovery */
-	  | valid_yaml_map        { parser_add_ordering(parser, 0); }
-	  | valid_yaml_list       { parser_add_ordering(parser, 0); }
-      ;
-
-
-
-
-scalar:
-      _STRING_
-	  | _INTEGER_
-	  | _ID_
-	  | _VERSION_STRING_
-	  ;
-
-
-/* These are used to handle error recovery */
-valid_yaml:       
-      scalar
-    | valid_yaml_list
-    | valid_yaml_map
-    ;
-valid_yaml_list:  
-      START_LIST valid_yaml_list_item END_LIST
-    ;
-valid_yaml_map:   
-      START_MAP  valid_yaml_map_item  END_MAP
-    ;
-valid_yaml_list_item:    
-    | valid_yaml_list_item valid_yaml
-    ;
-
-valid_yaml_map_item:    
-    | valid_yaml_map_item valid_yaml valid_yaml
-    | valid_yaml_map_item keyword valid_yaml
-	;
-
-
-%%
-
-static const char EMPTY_STRING[1] = "";
-
-
-/* Called by yyparse on error.  */
-void yaml_yyerror (mapred_parser_t *parser, char const *s)
-{
-	if (parser->current_doc)
-	{
-		if (global_verbose_flag)
-			fprintf(stderr, "    - ");
-		parser->current_doc->u.document.flags |= 
-			mapred_document_error;
-	}
-	else
-	{
-		if (global_verbose_flag)
-			fprintf(stderr, "  - ");
-	}
-
-	if (parser->yparser->error != YAML_NO_ERROR)
-	{
-		fprintf(stderr, "Error: YAML syntax error - %s %s, at line %d\n",
-				NULL != parser->yparser->problem? parser->yparser->problem: EMPTY_STRING,
-				NULL != parser->yparser->context? parser->yparser->context: EMPTY_STRING,
-				(int) parser->yparser->problem_mark.line+1);
-	}
-	else 
-	{
-		fprintf(stderr, "Error: %s, at line %d\n", s,
-				(int) parser->event.start_mark.line+1);
-	}
-}
-
-#if 0
-#define DEBUG_TOKEN(x) printf("%s\n", x)
-#else
-#define DEBUG_TOKEN(x) do { } while (0)
-#endif
-#if 0
-#define DEBUG_YYTOKEN(x) printf("  YYTOKEN=%d\n", x)
-#else
-#define DEBUG_YYTOKEN(x) do { } while (0)
-#endif
-
-
-/* 
- * int yamllex(lval, parser)
- *
- * We use a crazy mix of the yaml parse library and flex/bison to build
- * our parser.  
- * 
- * The YAML library handles all of the whitespace and flow parsing very
- * cleanly, but it has no domain knowledge of the Greenplum Mapreduce
- * YAML Schema.
- *
- * Coding up the YAML flow stuff in flex/bison is a pain
- *
- * So... we put the parse first through the YAML library parser and use
- * that as our first pass tokenizer to handle all of the YAML document flow
- * proccessing.  
- *
- * If it was just that simple then we could feed these tokens into bison and 
- * be done, but we also want additional lexical analysis on the scalar values 
- * so we feed them back into a flex tokenizer.
- *
- */
-int
-yaml_yylex (YYSTYPE *lvalp, mapred_parser_t *parser)
-{
-	if (parser->state == STATE_DONE)
-		return 0;
-
-	if (parser->state == STATE_SCALAR_LEX)
-	{
-		int token;
-#if USE_FLEX_REENTRANT
-		token = yaml_scalar_yylex(parser->yscanner, parser);
-#else
-		token = yaml_scalar_yylex(parser);
-#endif
-		if (token)
-		{
-			DEBUG_YYTOKEN(token);
-			return token;
-		}
-		else
-		{
-#if USE_FLEX_REENTRANT
-			yaml_scalar_yy_delete_buffer(parser->yscan_buffer, parser->yscanner);
-			parser->yscan_buffer = NULL;
-#endif
-			parser->state = STATE_YAML_PARSE;
-		}
-	}
-
-	if (parser->state != STATE_YAML_PARSE)
-	{
-		parser->state = STATE_DONE;
-		return ERROR;
-	}
-
-	if (!yaml_parser_parse(parser->yparser, &parser->event))
-	{
-		parser->state = STATE_DONE;
-		return ERROR;
-	}
-
-#if 0
-	if (parser->frame < 0)
-		printf("no frame\n");
-	else if (parser->frame >= MAX_CONTEXT_DEPTH) 
-		printf("bad frame\n");
-	else 
-	{
-		switch (parser->context[parser->frame]) 
-		{
-			case CONTEXT_NONE:
-				printf("FRAME [NONE]\n");
-				break;
-
-			case CONTEXT_HASH_KEY:
-				printf("FRAME [HASH_KEY]\n");
-				break;
-				
-			case CONTEXT_HASH_VALUE:
-				printf("FRAME [HASH_VALUE]\n");
-				break;
-
-			case CONTEXT_LIST:
-				printf("FRAME [LIST]\n");
-				break;
-				
-			default:
-				printf("FRAME [BAD FRAME]\n");
-				break;
-		}
-	}
-#endif
-
-	while (1) {
-		switch (parser->event.type) {
-
-			case YAML_NO_EVENT:
-				parser->state = STATE_DONE;
-				return 0;
-
-			case YAML_STREAM_START_EVENT:
-				DEBUG_TOKEN("YAML_STREAM_START");
-				return START_STREAM;
-
-			case YAML_DOCUMENT_START_EVENT:
-				DEBUG_TOKEN("YAML_DOCUMENT_START");
-				return START_DOCUMENT;
-
-			case YAML_MAPPING_START_EVENT:
-				if (++parser->frame >= MAX_CONTEXT_DEPTH) {
-					fprintf(stderr, "Maximum context depth exceded");
-					parser->state = STATE_DONE;
-					return END_STREAM;
-				}
-				parser->context[parser->frame] = CONTEXT_HASH_KEY;
-
-				DEBUG_TOKEN("YAML_MAPPING_START");
-				return START_MAP;
-
-			case YAML_SEQUENCE_START_EVENT:
-				if (++parser->frame >= MAX_CONTEXT_DEPTH) {
-					printf("Maximum context depth exceded");
-					parser->state = STATE_DONE;
-					return END_STREAM;
-				}
-				parser->context[parser->frame] = CONTEXT_LIST;
-
-				DEBUG_TOKEN("YAML_SEQUENCE_START");
-				return START_LIST;
-
-			case YAML_SCALAR_EVENT:
-			{
-				int   token;
-				char *value = (char*) parser->event.data.scalar.value;
-
-				DEBUG_TOKEN("SCALAR:");
-				lvalp->token = value;
-
-				/* Switch to the scalar scanner and continue */
-				if (value[0] == '\0')
-					token = _STRING_;
-				else
-				{
-					parser->state = STATE_SCALAR_LEX;
-
-#if USE_FLEX_REENTRANT
-					parser->yscan_buffer = 
-						yaml_scalar_yy_scan_string(value, parser->yscanner);
-#else
-					yaml_scalar_yy_scan_string(value);
-#endif
-					token = yaml_yylex(lvalp, parser);
-				}
-
-				/* 
-				 * If we are in a hash context then we switch between the
-				 * key states and the value states.
-				 */
-				if (parser->frame >= 0 && parser->frame < MAX_CONTEXT_DEPTH)
-				{
-					switch (parser->context[parser->frame]) 
-					{
-						case CONTEXT_HASH_KEY:
-							parser->context[parser->frame] = CONTEXT_HASH_VALUE;
-							break;
-
-						case CONTEXT_HASH_VALUE:
-							parser->context[parser->frame] = CONTEXT_HASH_KEY;
-							break;
-
-						default:
-							break;
-					}
-				}
-				return token;
-			}
-			
-			case YAML_SEQUENCE_END_EVENT:
-				if (--parser->frame < -1)
-					parser->frame = -1;
-
-				/* 
-				 * If the sequence was the value pair of a hash then the next
-				 * scalar will be a key 
-				 */
-				if (parser->frame >= 0 && parser->frame < MAX_CONTEXT_DEPTH &&
-					parser->context[parser->frame] == CONTEXT_HASH_VALUE)
-					parser->context[parser->frame] = CONTEXT_HASH_KEY;
-
-				DEBUG_TOKEN("YAML_SEQUENCE_END");
-				return END_LIST;
-				
-			case YAML_MAPPING_END_EVENT:
-			{
-				/* Pop the parser frame stack */
-				if (--parser->frame < -1)
-					parser->frame = -1;
-
-				/* 
-				 * If the mapping was the value pair of a hash then the next
-				 * scalar will be a key 
-				 */
-				if (parser->frame >= 0 && parser->frame < MAX_CONTEXT_DEPTH &&
-					parser->context[parser->frame] == CONTEXT_HASH_VALUE)
-					parser->context[parser->frame] = CONTEXT_HASH_KEY;
-
-				DEBUG_TOKEN("YAML_MAPPING_END");
-				return END_MAP;
-			}
-				
-			case YAML_DOCUMENT_END_EVENT:
-				DEBUG_TOKEN("YAML_DOCUMENT_END");
-				return END_DOCUMENT;
-				
-			case YAML_STREAM_END_EVENT:
-				DEBUG_TOKEN("YAML_STREAM_END");
-				return END_STREAM;
-				
-			default:
-				printf("WARNING: Unknown event %d\n", parser->event.type);
-		}
-		
-		yaml_event_delete(&parser->event);
-	}
-}

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/src/yaml_private.h
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/src/yaml_private.h b/src/bin/gpmapreduce/src/yaml_private.h
deleted file mode 100644
index 6320caf..0000000
--- a/src/bin/gpmapreduce/src/yaml_private.h
+++ /dev/null
@@ -1,635 +0,0 @@
-
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <yaml.h>
-
-#include <assert.h>
-#include <limits.h>
-
-/*
- * Memory management.
- */
-
-YAML_DECLARE(void *)
-yaml_malloc(size_t size);
-
-YAML_DECLARE(void *)
-yaml_realloc(void *ptr, size_t size);
-
-YAML_DECLARE(void)
-yaml_free(void *ptr);
-
-YAML_DECLARE(yaml_char_t *)
-yaml_strdup(const yaml_char_t *);
-
-/*
- * Reader: Ensure that the buffer contains at least `length` characters.
- */
-
-YAML_DECLARE(int)
-yaml_parser_update_buffer(yaml_parser_t *parser, size_t length);
-
-/*
- * Scanner: Ensure that the token stack contains at least one token ready.
- */
-
-YAML_DECLARE(int)
-yaml_parser_fetch_more_tokens(yaml_parser_t *parser);
-
-/*
- * The size of the input raw buffer.
- */
-
-#define INPUT_RAW_BUFFER_SIZE   16384
-
-/*
- * The size of the input buffer.
- *
- * It should be possible to decode the whole raw buffer.
- */
-
-#define INPUT_BUFFER_SIZE       (INPUT_RAW_BUFFER_SIZE*3)
-
-/*
- * The size of the output buffer.
- */
-
-#define OUTPUT_BUFFER_SIZE      16384
-
-/*
- * The size of the output raw buffer.
- *
- * It should be possible to encode the whole output buffer.
- */
-
-#define OUTPUT_RAW_BUFFER_SIZE  (OUTPUT_BUFFER_SIZE*2+2)
-
-/*
- * The size of other stacks and queues.
- */
-
-#define INITIAL_STACK_SIZE  16
-#define INITIAL_QUEUE_SIZE  16
-#define INITIAL_STRING_SIZE 16
-
-/*
- * Buffer management.
- */
-
-#define BUFFER_INIT(context,buffer,size)                                        \
-    (((buffer).start = yaml_malloc(size)) ?                                     \
-        ((buffer).last = (buffer).pointer = (buffer).start,                     \
-         (buffer).end = (buffer).start+(size),                                  \
-         1) :                                                                   \
-        ((context)->error = YAML_MEMORY_ERROR,                                  \
-         0))
-
-#define BUFFER_DEL(context,buffer)                                              \
-    (yaml_free((buffer).start),                                                 \
-     (buffer).start = (buffer).pointer = (buffer).end = 0)
-
-/*
- * String management.
- */
-
-typedef struct {
-    yaml_char_t *start;
-    yaml_char_t *end;
-    yaml_char_t *pointer;
-} yaml_string_t;
-
-YAML_DECLARE(int)
-yaml_string_extend(yaml_char_t **start,
-        yaml_char_t **pointer, yaml_char_t **end);
-
-YAML_DECLARE(int)
-yaml_string_join(
-        yaml_char_t **a_start, yaml_char_t **a_pointer, yaml_char_t **a_end,
-        yaml_char_t **b_start, yaml_char_t **b_pointer, yaml_char_t **b_end);
-
-#define NULL_STRING { NULL, NULL, NULL }
-
-#define STRING(string,length)   { (string), (string)+(length), (string) }
-
-#define STRING_INIT(context,string,size)                                        \
-    (((string).start = yaml_malloc(size)) ?                                     \
-        ((string).pointer = (string).start,                                     \
-         (string).end = (string).start+(size),                                  \
-         memset((string).start, 0, (size)),                                     \
-         1) :                                                                   \
-        ((context)->error = YAML_MEMORY_ERROR,                                  \
-         0))
-
-#define STRING_DEL(context,string)                                              \
-    (yaml_free((string).start),                                                 \
-     (string).start = (string).pointer = (string).end = 0)
-
-#define STRING_EXTEND(context,string)                                           \
-    (((string).pointer+5 < (string).end)                                        \
-        || yaml_string_extend(&(string).start,                                  \
-            &(string).pointer, &(string).end))
-
-#define CLEAR(context,string)                                                   \
-    ((string).pointer = (string).start,                                         \
-     memset((string).start, 0, (string).end-(string).start))
-
-#define JOIN(context,string_a,string_b)                                         \
-    ((yaml_string_join(&(string_a).start, &(string_a).pointer,                  \
-                       &(string_a).end, &(string_b).start,                      \
-                       &(string_b).pointer, &(string_b).end)) ?                 \
-        ((string_b).pointer = (string_b).start,                                 \
-         1) :                                                                   \
-        ((context)->error = YAML_MEMORY_ERROR,                                  \
-         0))
-
-/*
- * String check operations.
- */
-
-/*
- * Check the octet at the specified position.
- */
-
-#define CHECK_AT(string,octet,offset)                                           \
-    ((string).pointer[offset] == (yaml_char_t)(octet))
-
-/*
- * Check the current octet in the buffer.
- */
-
-#define CHECK(string,octet) CHECK_AT((string),(octet),0)
-
-/*
- * Check if the character at the specified position is an alphabetical
- * character, a digit, '_', or '-'.
- */
-
-#define IS_ALPHA_AT(string,offset)                                              \
-     (((string).pointer[offset] >= (yaml_char_t) '0' &&                         \
-       (string).pointer[offset] <= (yaml_char_t) '9') ||                        \
-      ((string).pointer[offset] >= (yaml_char_t) 'A' &&                         \
-       (string).pointer[offset] <= (yaml_char_t) 'Z') ||                        \
-      ((string).pointer[offset] >= (yaml_char_t) 'a' &&                         \
-       (string).pointer[offset] <= (yaml_char_t) 'z') ||                        \
-      (string).pointer[offset] == '_' ||                                        \
-      (string).pointer[offset] == '-')
-
-#define IS_ALPHA(string)    IS_ALPHA_AT((string),0)
-
-/*
- * Check if the character at the specified position is a digit.
- */
-
-#define IS_DIGIT_AT(string,offset)                                              \
-     (((string).pointer[offset] >= (yaml_char_t) '0' &&                         \
-       (string).pointer[offset] <= (yaml_char_t) '9'))
-
-#define IS_DIGIT(string)    IS_DIGIT_AT((string),0)
-
-/*
- * Get the value of a digit.
- */
-
-#define AS_DIGIT_AT(string,offset)                                              \
-     ((string).pointer[offset] - (yaml_char_t) '0')
-
-#define AS_DIGIT(string)    AS_DIGIT_AT((string),0)
-
-/*
- * Check if the character at the specified position is a hex-digit.
- */
-
-#define IS_HEX_AT(string,offset)                                                \
-     (((string).pointer[offset] >= (yaml_char_t) '0' &&                         \
-       (string).pointer[offset] <= (yaml_char_t) '9') ||                        \
-      ((string).pointer[offset] >= (yaml_char_t) 'A' &&                         \
-       (string).pointer[offset] <= (yaml_char_t) 'F') ||                        \
-      ((string).pointer[offset] >= (yaml_char_t) 'a' &&                         \
-       (string).pointer[offset] <= (yaml_char_t) 'f'))
-
-#define IS_HEX(string)    IS_HEX_AT((string),0)
-
-/*
- * Get the value of a hex-digit.
- */
-
-#define AS_HEX_AT(string,offset)                                                \
-      (((string).pointer[offset] >= (yaml_char_t) 'A' &&                        \
-        (string).pointer[offset] <= (yaml_char_t) 'F') ?                        \
-       ((string).pointer[offset] - (yaml_char_t) 'A' + 10) :                    \
-       ((string).pointer[offset] >= (yaml_char_t) 'a' &&                        \
-        (string).pointer[offset] <= (yaml_char_t) 'f') ?                        \
-       ((string).pointer[offset] - (yaml_char_t) 'a' + 10) :                    \
-       ((string).pointer[offset] - (yaml_char_t) '0'))
- 
-#define AS_HEX(string)  AS_HEX_AT((string),0)
- 
-/*
- * Check if the character is ASCII.
- */
-
-#define IS_ASCII_AT(string,offset)                                              \
-    ((string).pointer[offset] <= (yaml_char_t) '\x7F')
-
-#define IS_ASCII(string)    IS_ASCII_AT((string),0)
-
-/*
- * Check if the character can be printed unescaped.
- */
-
-#define IS_PRINTABLE_AT(string,offset)                                          \
-    (((string).pointer[offset] == 0x0A)         /* . == #x0A */                 \
-     || ((string).pointer[offset] >= 0x20       /* #x20 <= . <= #x7E */         \
-         && (string).pointer[offset] <= 0x7E)                                   \
-     || ((string).pointer[offset] == 0xC2       /* #0xA0 <= . <= #xD7FF */      \
-         && (string).pointer[offset+1] >= 0xA0)                                 \
-     || ((string).pointer[offset] > 0xC2                                        \
-         && (string).pointer[offset] < 0xED)                                    \
-     || ((string).pointer[offset] == 0xED                                       \
-         && (string).pointer[offset+1] < 0xA0)                                  \
-     || ((string).pointer[offset] == 0xEE)                                      \
-     || ((string).pointer[offset] == 0xEF      /* #xE000 <= . <= #xFFFD */      \
-         && !((string).pointer[offset+1] == 0xBB        /* && . != #xFEFF */    \
-             && (string).pointer[offset+2] == 0xBF)                             \
-         && !((string).pointer[offset+1] == 0xBF                                \
-             && ((string).pointer[offset+2] == 0xBE                             \
-                 || (string).pointer[offset+2] == 0xBF))))
-
-#define IS_PRINTABLE(string)    IS_PRINTABLE_AT((string),0)
-
-/*
- * Check if the character at the specified position is NUL.
- */
-
-#define IS_Z_AT(string,offset)    CHECK_AT((string),'\0',(offset))
-
-#define IS_Z(string)    IS_Z_AT((string),0)
-
-/*
- * Check if the character at the specified position is BOM.
- */
-
-#define IS_BOM_AT(string,offset)                                                \
-     (CHECK_AT((string),'\xEF',(offset))                                        \
-      && CHECK_AT((string),'\xBB',(offset)+1)                                   \
-      && CHECK_AT((string),'\xBF',(offset)+2))  /* BOM (#xFEFF) */
-
-#define IS_BOM(string)  IS_BOM_AT(string,0)
-
-/*
- * Check if the character at the specified position is space.
- */
-
-#define IS_SPACE_AT(string,offset)  CHECK_AT((string),' ',(offset))
-
-#define IS_SPACE(string)    IS_SPACE_AT((string),0)
-
-/*
- * Check if the character at the specified position is tab.
- */
-
-#define IS_TAB_AT(string,offset)    CHECK_AT((string),'\t',(offset))
-
-#define IS_TAB(string)  IS_TAB_AT((string),0)
-
-/*
- * Check if the character at the specified position is blank (space or tab).
- */
-
-#define IS_BLANK_AT(string,offset)                                              \
-    (IS_SPACE_AT((string),(offset)) || IS_TAB_AT((string),(offset)))
-
-#define IS_BLANK(string)    IS_BLANK_AT((string),0)
-
-/*
- * Check if the character at the specified position is a line break.
- */
-
-#define IS_BREAK_AT(string,offset)                                              \
-    (CHECK_AT((string),'\r',(offset))               /* CR (#xD)*/               \
-     || CHECK_AT((string),'\n',(offset))            /* LF (#xA) */              \
-     || (CHECK_AT((string),'\xC2',(offset))                                     \
-         && CHECK_AT((string),'\x85',(offset)+1))   /* NEL (#x85) */            \
-     || (CHECK_AT((string),'\xE2',(offset))                                     \
-         && CHECK_AT((string),'\x80',(offset)+1)                                \
-         && CHECK_AT((string),'\xA8',(offset)+2))   /* LS (#x2028) */           \
-     || (CHECK_AT((string),'\xE2',(offset))                                     \
-         && CHECK_AT((string),'\x80',(offset)+1)                                \
-         && CHECK_AT((string),'\xA9',(offset)+2)))  /* PS (#x2029) */
-
-#define IS_BREAK(string)    IS_BREAK_AT((string),0)
-
-#define IS_CRLF_AT(string,offset)                                               \
-     (CHECK_AT((string),'\r',(offset)) && CHECK_AT((string),'\n',(offset)+1))
-
-#define IS_CRLF(string) IS_CRLF_AT((string),0)
-
-/*
- * Check if the character is a line break or NUL.
- */
-
-#define IS_BREAKZ_AT(string,offset)                                             \
-    (IS_BREAK_AT((string),(offset)) || IS_Z_AT((string),(offset)))
-
-#define IS_BREAKZ(string)   IS_BREAKZ_AT((string),0)
-
-/*
- * Check if the character is a line break, space, or NUL.
- */
-
-#define IS_SPACEZ_AT(string,offset)                                             \
-    (IS_SPACE_AT((string),(offset)) || IS_BREAKZ_AT((string),(offset)))
-
-#define IS_SPACEZ(string)   IS_SPACEZ_AT((string),0)
-
-/*
- * Check if the character is a line break, space, tab, or NUL.
- */
-
-#define IS_BLANKZ_AT(string,offset)                                             \
-    (IS_BLANK_AT((string),(offset)) || IS_BREAKZ_AT((string),(offset)))
-
-#define IS_BLANKZ(string)   IS_BLANKZ_AT((string),0)
-
-/*
- * Determine the width of the character.
- */
-
-#define WIDTH_AT(string,offset)                                                 \
-     (((string).pointer[offset] & 0x80) == 0x00 ? 1 :                           \
-      ((string).pointer[offset] & 0xE0) == 0xC0 ? 2 :                           \
-      ((string).pointer[offset] & 0xF0) == 0xE0 ? 3 :                           \
-      ((string).pointer[offset] & 0xF8) == 0xF0 ? 4 : 0)
-
-#define WIDTH(string)   WIDTH_AT((string),0)
-
-/*
- * Move the string pointer to the next character.
- */
-
-#define MOVE(string)    ((string).pointer += WIDTH((string)))
-
-/*
- * Copy a character and move the pointers of both strings.
- */
-
-#define COPY(string_a,string_b)                                                 \
-    ((*(string_b).pointer & 0x80) == 0x00 ?                                     \
-     (*((string_a).pointer++) = *((string_b).pointer++)) :                      \
-     (*(string_b).pointer & 0xE0) == 0xC0 ?                                     \
-     (*((string_a).pointer++) = *((string_b).pointer++),                        \
-      *((string_a).pointer++) = *((string_b).pointer++)) :                      \
-     (*(string_b).pointer & 0xF0) == 0xE0 ?                                     \
-     (*((string_a).pointer++) = *((string_b).pointer++),                        \
-      *((string_a).pointer++) = *((string_b).pointer++),                        \
-      *((string_a).pointer++) = *((string_b).pointer++)) :                      \
-     (*(string_b).pointer & 0xF8) == 0xF0 ?                                     \
-     (*((string_a).pointer++) = *((string_b).pointer++),                        \
-      *((string_a).pointer++) = *((string_b).pointer++),                        \
-      *((string_a).pointer++) = *((string_b).pointer++),                        \
-      *((string_a).pointer++) = *((string_b).pointer++)) : 0)
-
-/*
- * Stack and queue management.
- */
-
-YAML_DECLARE(int)
-yaml_stack_extend(void **start, void **top, void **end);
-
-YAML_DECLARE(int)
-yaml_queue_extend(void **start, void **head, void **tail, void **end);
-
-#define STACK_INIT(context,stack,size)                                          \
-    (((stack).start = yaml_malloc((size)*sizeof(*(stack).start))) ?             \
-        ((stack).top = (stack).start,                                           \
-         (stack).end = (stack).start+(size),                                    \
-         1) :                                                                   \
-        ((context)->error = YAML_MEMORY_ERROR,                                  \
-         0))
-
-#define STACK_DEL(context,stack)                                                \
-    (yaml_free((stack).start),                                                  \
-     (stack).start = (stack).top = (stack).end = 0)
-
-#define STACK_EMPTY(context,stack)                                              \
-    ((stack).start == (stack).top)
-
-#define PUSH(context,stack,value)                                               \
-    (((stack).top != (stack).end                                                \
-      || yaml_stack_extend((void **)&(stack).start,                             \
-              (void **)&(stack).top, (void **)&(stack).end)) ?                  \
-        (*((stack).top++) = value,                                              \
-         1) :                                                                   \
-        ((context)->error = YAML_MEMORY_ERROR,                                  \
-         0))
-
-#define POP(context,stack)                                                      \
-    (*(--(stack).top))
-
-#define QUEUE_INIT(context,queue,size)                                          \
-    (((queue).start = yaml_malloc((size)*sizeof(*(queue).start))) ?             \
-        ((queue).head = (queue).tail = (queue).start,                           \
-         (queue).end = (queue).start+(size),                                    \
-         1) :                                                                   \
-        ((context)->error = YAML_MEMORY_ERROR,                                  \
-         0))
-
-#define QUEUE_DEL(context,queue)                                                \
-    (yaml_free((queue).start),                                                  \
-     (queue).start = (queue).head = (queue).tail = (queue).end = 0)
-
-#define QUEUE_EMPTY(context,queue)                                              \
-    ((queue).head == (queue).tail)
-
-#define ENQUEUE(context,queue,value)                                            \
-    (((queue).tail != (queue).end                                               \
-      || yaml_queue_extend((void **)&(queue).start, (void **)&(queue).head,     \
-            (void **)&(queue).tail, (void **)&(queue).end)) ?                   \
-        (*((queue).tail++) = value,                                             \
-         1) :                                                                   \
-        ((context)->error = YAML_MEMORY_ERROR,                                  \
-         0))
-
-#define DEQUEUE(context,queue)                                                  \
-    (*((queue).head++))
-
-#define QUEUE_INSERT(context,queue,index,value)                                 \
-    (((queue).tail != (queue).end                                               \
-      || yaml_queue_extend((void **)&(queue).start, (void **)&(queue).head,     \
-            (void **)&(queue).tail, (void **)&(queue).end)) ?                   \
-        (memmove((queue).head+(index)+1,(queue).head+(index),                   \
-            ((queue).tail-(queue).head-(index))*sizeof(*(queue).start)),        \
-         *((queue).head+(index)) = value,                                       \
-         (queue).tail++,                                                        \
-         1) :                                                                   \
-        ((context)->error = YAML_MEMORY_ERROR,                                  \
-         0))
-
-/*
- * Token initializers.
- */
-
-#define TOKEN_INIT(token,token_type,token_start_mark,token_end_mark)            \
-    (memset(&(token), 0, sizeof(yaml_token_t)),                                 \
-     (token).type = (token_type),                                               \
-     (token).start_mark = (token_start_mark),                                   \
-     (token).end_mark = (token_end_mark))
-
-#define STREAM_START_TOKEN_INIT(token,token_encoding,start_mark,end_mark)       \
-    (TOKEN_INIT((token),YAML_STREAM_START_TOKEN,(start_mark),(end_mark)),       \
-     (token).data.stream_start.encoding = (token_encoding))
-
-#define STREAM_END_TOKEN_INIT(token,start_mark,end_mark)                        \
-    (TOKEN_INIT((token),YAML_STREAM_END_TOKEN,(start_mark),(end_mark)))
-
-#define ALIAS_TOKEN_INIT(token,token_value,start_mark,end_mark)                 \
-    (TOKEN_INIT((token),YAML_ALIAS_TOKEN,(start_mark),(end_mark)),              \
-     (token).data.alias.value = (token_value))
-
-#define ANCHOR_TOKEN_INIT(token,token_value,start_mark,end_mark)                \
-    (TOKEN_INIT((token),YAML_ANCHOR_TOKEN,(start_mark),(end_mark)),             \
-     (token).data.anchor.value = (token_value))
-
-#define TAG_TOKEN_INIT(token,token_handle,token_suffix,start_mark,end_mark)     \
-    (TOKEN_INIT((token),YAML_TAG_TOKEN,(start_mark),(end_mark)),                \
-     (token).data.tag.handle = (token_handle),                                  \
-     (token).data.tag.suffix = (token_suffix))
-
-#define SCALAR_TOKEN_INIT(token,token_value,token_length,token_style,start_mark,end_mark)   \
-    (TOKEN_INIT((token),YAML_SCALAR_TOKEN,(start_mark),(end_mark)),             \
-     (token).data.scalar.value = (token_value),                                 \
-     (token).data.scalar.length = (token_length),                               \
-     (token).data.scalar.style = (token_style))
-
-#define VERSION_DIRECTIVE_TOKEN_INIT(token,token_major,token_minor,start_mark,end_mark)     \
-    (TOKEN_INIT((token),YAML_VERSION_DIRECTIVE_TOKEN,(start_mark),(end_mark)),  \
-     (token).data.version_directive.major = (token_major),                      \
-     (token).data.version_directive.minor = (token_minor))
-
-#define TAG_DIRECTIVE_TOKEN_INIT(token,token_handle,token_prefix,start_mark,end_mark)       \
-    (TOKEN_INIT((token),YAML_TAG_DIRECTIVE_TOKEN,(start_mark),(end_mark)),      \
-     (token).data.tag_directive.handle = (token_handle),                        \
-     (token).data.tag_directive.prefix = (token_prefix))
-
-/*
- * Event initializers.
- */
-
-#define EVENT_INIT(event,event_type,event_start_mark,event_end_mark)            \
-    (memset(&(event), 0, sizeof(yaml_event_t)),                                 \
-     (event).type = (event_type),                                               \
-     (event).start_mark = (event_start_mark),                                   \
-     (event).end_mark = (event_end_mark))
-
-#define STREAM_START_EVENT_INIT(event,event_encoding,start_mark,end_mark)       \
-    (EVENT_INIT((event),YAML_STREAM_START_EVENT,(start_mark),(end_mark)),       \
-     (event).data.stream_start.encoding = (event_encoding))
-
-#define STREAM_END_EVENT_INIT(event,start_mark,end_mark)                        \
-    (EVENT_INIT((event),YAML_STREAM_END_EVENT,(start_mark),(end_mark)))
-
-#define DOCUMENT_START_EVENT_INIT(event,event_version_directive,                \
-        event_tag_directives_start,event_tag_directives_end,event_implicit,start_mark,end_mark) \
-    (EVENT_INIT((event),YAML_DOCUMENT_START_EVENT,(start_mark),(end_mark)),     \
-     (event).data.document_start.version_directive = (event_version_directive), \
-     (event).data.document_start.tag_directives.start = (event_tag_directives_start),   \
-     (event).data.document_start.tag_directives.end = (event_tag_directives_end),   \
-     (event).data.document_start.implicit = (event_implicit))
-
-#define DOCUMENT_END_EVENT_INIT(event,event_implicit,start_mark,end_mark)       \
-    (EVENT_INIT((event),YAML_DOCUMENT_END_EVENT,(start_mark),(end_mark)),       \
-     (event).data.document_end.implicit = (event_implicit))
-
-#define ALIAS_EVENT_INIT(event,event_anchor,start_mark,end_mark)                \
-    (EVENT_INIT((event),YAML_ALIAS_EVENT,(start_mark),(end_mark)),              \
-     (event).data.alias.anchor = (event_anchor))
-
-#define SCALAR_EVENT_INIT(event,event_anchor,event_tag,event_value,event_length,    \
-        event_plain_implicit, event_quoted_implicit,event_style,start_mark,end_mark)    \
-    (EVENT_INIT((event),YAML_SCALAR_EVENT,(start_mark),(end_mark)),             \
-     (event).data.scalar.anchor = (event_anchor),                               \
-     (event).data.scalar.tag = (event_tag),                                     \
-     (event).data.scalar.value = (event_value),                                 \
-     (event).data.scalar.length = (event_length),                               \
-     (event).data.scalar.plain_implicit = (event_plain_implicit),               \
-     (event).data.scalar.quoted_implicit = (event_quoted_implicit),             \
-     (event).data.scalar.style = (event_style))
-
-#define SEQUENCE_START_EVENT_INIT(event,event_anchor,event_tag,                 \
-        event_implicit,event_style,start_mark,end_mark)                         \
-    (EVENT_INIT((event),YAML_SEQUENCE_START_EVENT,(start_mark),(end_mark)),     \
-     (event).data.sequence_start.anchor = (event_anchor),                       \
-     (event).data.sequence_start.tag = (event_tag),                             \
-     (event).data.sequence_start.implicit = (event_implicit),                   \
-     (event).data.sequence_start.style = (event_style))
-
-#define SEQUENCE_END_EVENT_INIT(event,start_mark,end_mark)                      \
-    (EVENT_INIT((event),YAML_SEQUENCE_END_EVENT,(start_mark),(end_mark)))
-
-#define MAPPING_START_EVENT_INIT(event,event_anchor,event_tag,                  \
-        event_implicit,event_style,start_mark,end_mark)                         \
-    (EVENT_INIT((event),YAML_MAPPING_START_EVENT,(start_mark),(end_mark)),      \
-     (event).data.mapping_start.anchor = (event_anchor),                        \
-     (event).data.mapping_start.tag = (event_tag),                              \
-     (event).data.mapping_start.implicit = (event_implicit),                    \
-     (event).data.mapping_start.style = (event_style))
-
-#define MAPPING_END_EVENT_INIT(event,start_mark,end_mark)                       \
-    (EVENT_INIT((event),YAML_MAPPING_END_EVENT,(start_mark),(end_mark)))
-
-/*
- * Document initializer.
- */
-
-#define DOCUMENT_INIT(document,document_nodes_start,document_nodes_end,         \
-        document_version_directive,document_tag_directives_start,               \
-        document_tag_directives_end,document_start_implicit,                    \
-        document_end_implicit,document_start_mark,document_end_mark)            \
-    (memset(&(document), 0, sizeof(yaml_document_t)),                           \
-     (document).nodes.start = (document_nodes_start),                           \
-     (document).nodes.end = (document_nodes_end),                               \
-     (document).nodes.top = (document_nodes_start),                             \
-     (document).version_directive = (document_version_directive),               \
-     (document).tag_directives.start = (document_tag_directives_start),         \
-     (document).tag_directives.end = (document_tag_directives_end),             \
-     (document).start_implicit = (document_start_implicit),                     \
-     (document).end_implicit = (document_end_implicit),                         \
-     (document).start_mark = (document_start_mark),                             \
-     (document).end_mark = (document_end_mark))
-
-/*
- * Node initializers.
- */
-
-#define NODE_INIT(node,node_type,node_tag,node_start_mark,node_end_mark)        \
-    (memset(&(node), 0, sizeof(yaml_node_t)),                                   \
-     (node).type = (node_type),                                                 \
-     (node).tag = (node_tag),                                                   \
-     (node).start_mark = (node_start_mark),                                     \
-     (node).end_mark = (node_end_mark))
-
-#define SCALAR_NODE_INIT(node,node_tag,node_value,node_length,                  \
-        node_style,start_mark,end_mark)                                         \
-    (NODE_INIT((node),YAML_SCALAR_NODE,(node_tag),(start_mark),(end_mark)),     \
-     (node).data.scalar.value = (node_value),                                   \
-     (node).data.scalar.length = (node_length),                                 \
-     (node).data.scalar.style = (node_style))
-
-#define SEQUENCE_NODE_INIT(node,node_tag,node_items_start,node_items_end,       \
-        node_style,start_mark,end_mark)                                         \
-    (NODE_INIT((node),YAML_SEQUENCE_NODE,(node_tag),(start_mark),(end_mark)),   \
-     (node).data.sequence.items.start = (node_items_start),                     \
-     (node).data.sequence.items.end = (node_items_end),                         \
-     (node).data.sequence.items.top = (node_items_start),                       \
-     (node).data.sequence.style = (node_style))
-
-#define MAPPING_NODE_INIT(node,node_tag,node_pairs_start,node_pairs_end,        \
-        node_style,start_mark,end_mark)                                         \
-    (NODE_INIT((node),YAML_MAPPING_NODE,(node_tag),(start_mark),(end_mark)),    \
-     (node).data.mapping.pairs.start = (node_pairs_start),                      \
-     (node).data.mapping.pairs.end = (node_pairs_end),                          \
-     (node).data.mapping.pairs.top = (node_pairs_start),                        \
-     (node).data.mapping.style = (node_style))
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/src/yaml_scan.l
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/src/yaml_scan.l b/src/bin/gpmapreduce/src/yaml_scan.l
deleted file mode 100644
index e91d011..0000000
--- a/src/bin/gpmapreduce/src/yaml_scan.l
+++ /dev/null
@@ -1,138 +0,0 @@
-%option outfile="yaml_scan.c"
-%option 8bit never-interactive nodefault nounput noyywrap noinput
-%option prefix="yaml_scalar_yy"
-
-
-/* 
- * This would be nice, but it isn't necessary and isn't supported by
- * the old version of flex we have on the build machines.
- *
- * If this ever changes make sure to edit parser.h to #define the
- * relevant items.
-*/
-/* %option header-file="yaml_scan.h" */
-/* %option reentrant */
-
-%{
-#include <yaml_parse.h>       /* Get the token types */
-#include <parser.h>
-
-/* 
- * Setup prototypes since we build with -Wmissing-prototypes and flex isn't 
- * kind enough to generate them.
- */
-#define unify_version(a,b,c) ((a<<16)+(b<<8)+c)
-#if unify_version(YY_FLEX_MAJOR_VERSION,YY_FLEX_MINOR_VERSION,YY_FLEX_SUBMINOR_VERSION) < unify_version(2,5,35)
-int   yaml_scalar_yyget_lineno(void);
-FILE* yaml_scalar_yyget_in(void);
-FILE* yaml_scalar_yyget_out(void);
-int   yaml_scalar_yyget_leng(void);
-char* yaml_scalar_yyget_text(void);
-
-void  yaml_scalar_yyset_lineno(int);
-void  yaml_scalar_yyset_in(FILE *);
-void  yaml_scalar_yyset_out(FILE *);
-
-int   yaml_scalar_yyget_debug(void);
-void  yaml_scalar_yyset_debug(int);
-
-int     yaml_scalar_yylex_destroy(void);
-#endif
-
-%}
-   /* 
-    * States:
-    *  INITIAL = default state
-    *   <kw>   = keyword
-    */
-%x kw
-%% 
-
-    /* Look at our parser context and set the current state accordingly */
-    if (parser->frame < 0 || parser->frame >= MAX_CONTEXT_DEPTH)
-       BEGIN(INITIAL);
-    else
-    {
-       switch (parser->context[parser->frame])
-       {
-          case CONTEXT_NONE:
-          case CONTEXT_HASH_VALUE:
-          case CONTEXT_LIST:
-             BEGIN(INITIAL);
-             break;
-
-          case CONTEXT_HASH_KEY:
-             BEGIN(kw);      /* Switch to keyword context */
-             break;
-
-          default:
-             printf("WARNING: bad parse context state\n");
-             BEGIN(INITIAL);
-       }
-    }
-
-
-   /* Keyword tokens */
-<kw>columns      return _COLUMNS_;
-<kw>consolidate  return _CONSOLIDATE_;
-<kw>database     return _DATABASE_;
-<kw>define       return _DEFINE_;
-<kw>delimiter    return _DELIMITER_;
-<kw>encoding     return _ENCODING_;
-<kw>error_limit  return _ERROR_LIMIT_;
-<kw>escape       return _ESCAPE_;
-<kw>exec         return _EXEC_;
-<kw>execute      return _EXECUTE_;
-<kw>file         return _FILE_;
-<kw>finalize     return _FINALIZE_;
-<kw>format       return _FORMAT_;
-<kw>function     return _FUNCTION_;
-<kw>gpfdist      return _GPFDIST_;
-<kw>host         return _HOST_;
-<kw>initialize   return _INITIALIZE_;
-<kw>input        return _INPUT_;
-<kw>keys         return _KEYS_;
-<kw>language     return _LANGUAGE_;
-<kw>library      return _LIBRARY_;
-<kw>map          return _MAP_;
-<kw>mode         return _MODE_;
-<kw>name         return _NAME_;
-<kw>null         return _NULL_;
-<kw>optimize     return _OPTIMIZE_;
-<kw>output       return _OUTPUT_;
-<kw>parameters   return _PARAMETERS_;
-<kw>port         return _PORT_;
-<kw>query        return _QUERY_;
-<kw>quote        return _QUOTE_;
-<kw>reduce       return _REDUCE_;
-<kw>returns      return _RETURNS_;
-<kw>run          return _RUN_;
-<kw>source       return _SOURCE_;
-<kw>table        return _TABLE_;
-<kw>target       return _TARGET_;
-<kw>task         return _TASK_;
-<kw>transition   return _TRANSITION_; 
-<kw>user         return _USER_;
-<kw>version      return _VERSION_;
-<kw>ordering     return _ORDERING_;
-
-   /* Matching specific fields */
-[a-z_]([a-z0-9_])*       return _ID_;
-
-   /* This is a bit of a hack to support schema qualification, the correct
-    * way to do this would require changing the lexer to be reentrant within
-    * yaml scalar values which would be a lot more work.
-    */
-[a-z_]([a-z0-9_])*\.[a-z_]([a-z0-9_])*       return _ID_;
-
-[0-9]+                   return _INTEGER_;
-[1-9][0-9]*(\.[0-9]){3}  return _VERSION_STRING_;
-
-  /* 
-   * We will be calling this on the SCALAR tokens in a yaml file, if the
-   * token doesn't exactly match one of the predefined tokens above then 
-   * just return it as a 'STRING'
-   */
-<*>.*(\n.*)*    return _STRING_;
-<<EOF>>         return 0;
-%%

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/Makefile
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/Makefile b/src/bin/gpmapreduce/test/Makefile
deleted file mode 100644
index 16e8994..0000000
--- a/src/bin/gpmapreduce/test/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-
-MAPRED    = ../gpmapreduce
-PSQL      = psql
-FIXUP     = bin/fixup.pl
-MRDIFF    = bin/mrdiff.pl
-
-DB        = mapreduce_test
-MFLAGS    = $(DB) --key="clar" --file 
-PFLAGS    = -X $(DB) --file
-
-INDIR     = input
-DATADIR   = data
-MASTERDIR = expected
-
-OUTDIR    = output
-YMLDIR    = yml
-SQLDIR    = sql
-
-YMLIN     = $(shell ls $(INDIR)/*.yml.in)
-YML       = $(notdir $(basename $(YMLIN)))
-YMLOUT    = $(addprefix $(YMLDIR)/, $(YML))
-
-TESTS     = $(addprefix $(OUTDIR)/,$(addsuffix .suc, $(basename $(YML))))
-MAILDATA  = $(addprefix $(shell pwd)/,$(DATADIR)/email/mailfiles)
-
-all: libs setup $(YMLDIR) $(OUTDIR) $(YMLOUT) $(MAILDATA) $(TESTS)
-	@printf "\n=======================\n"
-	@if [ -s $(OUTDIR)/FAIL ] ; then \
-       export nfailed=`cat $(OUTDIR)/FAIL | wc -l`; \
-       export ntotal=`ls -1 $(OUTDIR)/*.suc $(OUTDIR)/*.fail | wc -l`;  \
-       printf " %d of %d tests failed. " $$nfailed $$ntotal; \
-	 else \
-       export ntotal=`ls -1 $(OUTDIR)/*.suc | wc -l`;  \
-	   printf " All %d tests passed. " $$ntotal; \
-     fi
-	@printf "\n=======================\n"
-
-libs:
-	$(MAKE) -C lib
-	cp -f lib/*.so $(GPHOME)/lib/postgresql/.
-
-setup:
-	@printf "============== dropping database \"$(DB)\"     ==============\n"
-	@psql -X -c "drop database $(DB)" template1 2>/dev/null || echo "DROP DATABASE"
-	@printf "============== creating database \"$(DB)\"     ==============\n"
-	@printf "============== installing plpython             ==============\n"
-	@psql -X -c "create database $(DB)" template1
-	@psql -X -c "create language plpythonu" -d $(DB) 
-	@printf "============== running mapreduce tests                ==============\n"
-	@rm -rf $(OUTDIR)
-
-clean:
-	rm -rf $(YMLDIR)
-	rm -rf $(OUTDIR)
-	rm -rf $(MAILDATA)
-	@dropdb $(DB) 2>/dev/null || echo > /dev/null
-
-
-%.test: $(OUTDIR)/%.suc
-
-$(OUTDIR):
-	@mkdir $(OUTDIR)
-
-$(MAILDATA):
-	@ls -1 $(dir $(MAILDATA))*.txt > $(MAILDATA)
-	@chmod u+w $(MAILDATA)
-
-$(YMLDIR):
-	@mkdir $(YMLDIR)
-
-$(YMLDIR)/%.yml: $(INDIR)/%.yml.in
-	@$(FIXUP) $(INDIR)/$*.yml.in
-	@mv $(INDIR)/$*.yml $(YMLDIR)/.
-
-$(OUTDIR)/%.suc: $(MAPRED) $(YMLDIR)/%.yml $(MASTERDIR)/%.out $(MASTERDIR)/%.err
-	@printf 'test %-20s ... ' $*
-	@rm -f $(OUTDIR)/$*.suc $(OUTDIR)/$*.fail
-	@touch $(OUTDIR)/$*.out $(OUTDIR)/$*.err
-	@cp -f $(MASTERDIR)/DEFAULT.out $(OUTDIR)/$*.out
-	@cp -f $(MASTERDIR)/DEFAULT.err $(OUTDIR)/$*.err
-	@if [ -e $(SQLDIR)/$*_init.sql ] ; \
-	 then $(PSQL) $(PFLAGS) $(SQLDIR)/$*_init.sql > $(OUTDIR)/$*.init.out; fi
-	@$(MAPRED) $(MFLAGS) $(YMLDIR)/$*.yml >>$(OUTDIR)/$*.out 2>>$(OUTDIR)/$*.err; \
-		if [ $$? -ne 0 ]; then echo "gpmapreduce retcode=$$?" >> $(OUTDIR)/$*.err; fi
-	@if [ -e $(SQLDIR)/$*_done.sql ] ; \
-	 then $(PSQL) $(PFLAGS) $(SQLDIR)/$*_done.sql > $(OUTDIR)/$*.done.out 2>&1; fi
-	@$(MRDIFF) $(OUTDIR) $(MASTERDIR) $* > $(OUTDIR)/$*.suc
-	@psql -c "\d" $(DB) | \
-        perl -e "while (<>) {s/No relations found.\\n$$//; print}" >> $(OUTDIR)/$*.suc
-	@cd $(OUTDIR); if [ -s $*.suc ] ; then \
-	    mv $*.suc $*.fail; echo FAILED; echo $*.fail >> FAIL ; else echo ok; fi
-
-
-# If the master files don't exist this won't let the test pass, but it will
-# allow the test to run
-$(MASTERDIR)/%.out:
-	@echo "FILE MISSING" > $@
-
-$(MASTERDIR)/%.err:
-	@echo "FILE MISSING" > $@

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/bin/fixup.pl
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/bin/fixup.pl b/src/bin/gpmapreduce/test/bin/fixup.pl
deleted file mode 100755
index a8c1811..0000000
--- a/src/bin/gpmapreduce/test/bin/fixup.pl
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/perl
-#
-# fixup.pl - Greenplum MapReduce fixup script
-#
-# copyright (c) 2008
-# Author: Jeffrey I Cohen, Caleb Welton
-#
-
-use strict;
-use warnings;
-use Pod::Usage;
-use Getopt::Long;
-use Cwd;
-
-# let Makefile.pl update the connect string if necessary...
-my $gen_connect = "__CONNECT: postgres __";
-my $glob_id = "";
-
-# find the connect string
-my $glob_connect = $gen_connect;
-$glob_connect =~ s/^\_\_CONNECT\:(.*)\_\_$/$1/;
-
-my $man  = 0;
-my $help = 0;
-
-GetOptions('help|?' => \$help, 
-		   man => \$man,
-           )
-	or pod2usage(2);
-pod2usage(-msg => $glob_id, -exitstatus => 1) if $help;
-pod2usage(-msg => $glob_id, -exitstatus => 0, -verbose => 2) if $man;
-
-# Check that input file exists and is readable
-
-
-
-# convert a postgresql psql formatted table into an array of hashes
-sub tablelizer
-{
-    my ($ini, $got_line1) = @_;
-
-    # first, split into separate lines, the find all the column headings
-
-    my @lines = split(/\n/, $ini);
-
-    return undef
-        unless (scalar(@lines));
-
-    # if the first line is supplied, then it has the column headers,
-    # so don't try to find them (or the ---+---- separator) in
-    # "lines"
-    my $line1 = $got_line1;
-    $line1 = shift @lines
-        unless (defined($got_line1));
-
-    # look for <space>|<space>
-    my @colheads = split(/\s+\|\s+/, $line1);
-
-    # fixup first, last column head (remove leading,trailing spaces)
-
-    $colheads[0] =~ s/^\s+//;
-    $colheads[0] =~ s/\s+$//;
-    $colheads[-1] =~ s/^\s+//;
-    $colheads[-1] =~ s/\s+$//;
-
-    return undef
-        unless (scalar(@lines));
-    
-    shift @lines # skip dashed separator (unless it was skipped already)
-        unless (defined($got_line1));
-    
-    my @rows;
-
-    for my $lin (@lines)
-    {
-        my @cols = split(/\|/, $lin, scalar(@colheads));
-        last 
-            unless (scalar(@cols) == scalar(@colheads));
-
-        my $rowh = {};
-
-        for my $colhdcnt (0..(scalar(@colheads)-1))
-        {
-            my $rawcol = shift @cols;
-
-            $rawcol =~ s/^\s+//;
-            $rawcol =~ s/\s+$//;
-
-            my $colhd = $colheads[$colhdcnt];
-            $rowh->{($colhdcnt+1)} = $rawcol;
-        }
-        push @rows, $rowh;
-    }
-
-    return \@rows;
-}
-
-sub gethostname
-{
-    my $psql_str = "psql ";
-    
-    $psql_str .= $glob_connect
-        if (defined($glob_connect));
-
-    $psql_str .= " -c \'select content, role, status, hostname from gp_segment_configuration\'";
-
-    my $tabdef = `$psql_str`;
-
-#    print $tabdef;
-
-    # do something reasonable on error...
-    if (($tabdef =~ m/database.*does not exist/) 
-        || ($tabdef =~ m/could not connect/) )
-    {
-        return `hostname`;
-    }
-
-    my $mpp_config_table = tablelizer($tabdef);
-
-#    print Data::Dumper->Dump([$mpp_config_table]);
-
-    my $hostname= "localhost";
-
-    for my $rowh (@{$mpp_config_table})
-    {
-        if (($rowh->{1} == 0) && # content (seg 0)
-            ($rowh->{2} =~ m/p/) && # role =primary
-            ($rowh->{3} =~ m/u/))    # status = up 
-        {
-            $hostname = $rowh->{4};
-            last;
-        }
-        
-    }
-
-    return $hostname;
-}
-
-if (1)
-{
-	my $curdir   = getcwd();
-    my $db_user    = `whoami`;
-	my $hostname = gethostname(); # `hostname`
-	chomp $db_user;
-	chomp $hostname;
-
-	# We assume that this script is run by the make file in example directory
-	my $abs_srcdir = "$curdir";
-
-    for my $file (@ARGV)
-    {
-        pod2usage(-exitstatus => 1) unless ($file);
-
-        (-d $file) and die "ERROR: '$file' is a directory\n";
-        (-f $file) or  die "ERROR: No such file '$file'\n";
-        (-r $file) or  die "ERROR: No read permissions for '$file'\n";
-
-        my $outfile = $file;
-
-        # remove the ".in" (input) suffix for the outfile name
-        $outfile =~ s/\.in$//g;
-
-		open(INPUT, "<$file");
-		open(OUTPUT, ">$outfile");
-		while (<INPUT>) {
-			s/\@db_user\@/$db_user/gm; 
-			s/\@abs_srcdir\@/$abs_srcdir/gm;
-			s/\@hostname\@/$hostname/gm;
-			print OUTPUT
-		}
-		close(INPUT);
-		close(OUTPUT);
-    }
-}
-
-exit(0);

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/bin/mrdiff.pl
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/bin/mrdiff.pl b/src/bin/gpmapreduce/test/bin/mrdiff.pl
deleted file mode 100755
index 20ff2a3..0000000
--- a/src/bin/gpmapreduce/test/bin/mrdiff.pl
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/perl
-
-=head1 NAME
-
-B<mrdiff.pl> - Map/Reduce Diff utility script
-
-=head1 SYNOPSIS
-
-B<mrdiff.pl> [options] <output_dir> <expected_dir> <test_name>
-
-Options:
-
-    -help            brief help message
-    -man             full documentation
-    -version         print version information
-
-=head1 OPTIONS
-
-=over 8
-
-=item B<-help>
-
-    Print a brief help message and exits.
-
-=item B<-man>
-    
-    Prints the manual page and exits.
-
-=item B<-version>
-
-    Prints version information
-
-=back
-
-=head1 DESCRIPTION
-
-The diff utility looks for all files matching <test_name>.*" in
-the output directory and compares them against the like named files
-in the expected directory.
-
-It produces either $outdir/$test_name.suc or $outdir/$test_name.fail
-depending on the results of the diff.
-
-To handle the underlying diff the utility calls gpdiff.pl
-
-=head1 AUTHORS
-
-Caleb Welton
-
-Copyright (c) 2008 GreenPlum.  All rights reserved
-
-Address bug reports and comments to: cwelton@greenplum.com
-
-=cut
-
-use warnings;
-use strict;
-use Pod::Usage;
-use Getopt::Long;
-use Cwd;
-
-my $man  = 0;
-my $help = 0;
-
-GetOptions('help|?' => \$help, 
-		   man => \$man,
-           )
-	or pod2usage(2);
-pod2usage(-exitstatus => 1) if $help;
-pod2usage(-exitstatus => 0, -verbose => 2) if $man;
-
-pod2usage(1) unless ($#ARGV == 2);
-my ($output, $expected, $testname) = @ARGV;
-
-my @outfiles = sort(glob("$output/$testname.*"));
-my @expfiles = sort(glob("$expected/$testname.*"));
-
-# We find gpdiff in the source tree assuming that this is being run
-# from the source tree as well.
-my $GPDIFF = getcwd();
-$GPDIFF =~ s|(.*/src)(/bin/gpmapreduce/.*)|$1/test/regress/gpdiff.pl|;
-die "unable to find gpdiff.pl" unless (-e $GPDIFF);
-
-
-sub printheader($$)
-{
-	my ($a, $b) = @_;
-	my $fill = "-" x (length($a) + length($b));
-	print "\n";
-	print "------------$fill\n";
-	print "FILE:  $a <=> $b\n";
-	print "------------$fill\n";
-}
-
-my ($out, $exp, $ofile, $efile);
-while ($#outfiles >= 0 && $#expfiles >= 0) 
-{
-	$out = shift @outfiles;
-	$exp = shift @expfiles;
-
-	# we have paths, and want to check if the filename is the same
-	while (1)
-	{
-		$out =~ m/$output\/(.*)/ or die();
-		$ofile = $1;
-		$exp =~ m/$expected\/(.*)/  or die();
-		$efile = $1;
-	
-		if ($ofile eq $efile)
-		{
-			my $diff = `$GPDIFF $out $exp`;
-			if (length($diff) > 0)
-			{
-				printheader($out,$exp);
-				print $diff;
-			}
-			last;
-		}
-		elsif ($ofile lt $efile) 
-		{
-			printheader($out,"<missing>") unless ($ofile =~ m/^$testname.suc$/);
-			last if ($#outfiles < 0);
-			$out = shift @outfiles;
-		}
-		else
-		{
-			printheader("<missing>", $exp);
-			last if ($#expfiles < 0);
-			$exp = shift @expfiles;
-		}
-
-	}
-}
-
-while ($#outfiles >= 0)
-{
-	$out = shift @outfiles;
-	$out =~ m/$output\/(.*)/ or die();
-	$ofile = $1;
-	printheader($out, "<missing>") unless ($ofile =~ m/^$testname.suc$/);
-}
-while ($#expfiles >= 0)
-{
-	$exp = shift @expfiles;
-	printheader("<missing>", $exp);
-}


[15/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/src/parse.c
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/src/parse.c b/src/bin/gpmapreduce/src/parse.c
deleted file mode 100644
index b7f6c44..0000000
--- a/src/bin/gpmapreduce/src/parse.c
+++ /dev/null
@@ -1,2147 +0,0 @@
-#include <parser.h>
-#include <except.h>
-#include <mapred_errors.h>
-
-#include <stdio.h>
-#include <yaml_parse.h>
-#include <yaml.h>
-
-#include <stdarg.h>
-
-int mapred_verify_object(mapred_parser_t *parser, mapred_object_t *obj);
-
-/* -------------------------------------------------------------------------- */
-int mapred_parse_error(mapred_parser_t *parser, char *fmt, ...)
-{
-	mapred_object_t *obj = parser->current_obj;
-	va_list arg;
-
-	if (parser && parser->current_doc)
-	{
-		if (global_verbose_flag)
-			fprintf(stderr, "    - ");
-		parser->current_doc->u.document.flags |= mapred_document_error;
-	}
-	else if (global_verbose_flag)
-		fprintf(stderr, "  - ");
-
-	fprintf(stderr, "Error: ");
-	if (obj && obj->name)
-		fprintf(stderr, "%s '%s': ", mapred_kind_name[obj->kind], obj->name);
-	if (obj && !obj->name)
-		fprintf(stderr, "%s: ", mapred_kind_name[obj->kind]);
-
-	va_start(arg, fmt);
-	vfprintf(stderr, fmt, arg);
-	va_end(arg);
-	if (parser && parser->event.start_mark.line)
-		fprintf(stderr, ", at line %d", (int) parser->event.start_mark.line+1);
-	fprintf(stderr, "\n");
-	
-	return MAPRED_PARSE_ERROR;
-}
-
-
-#define copyscalar(s)							\
-	strcpy(malloc(strlen(s)+1), s)
-
-mapred_olist_t* mapred_parse_string(unsigned char *yaml)
-{
-	mapred_olist_t  *documents;
-	yaml_parser_t    parser;
-	
-	XASSERT(yaml);
-	if (!yaml_parser_initialize(&parser))
-		XRAISE(MAPRED_PARSE_INTERNAL, 
-			   "YAML parser initialization failed");
-
-	yaml_parser_set_input_string(&parser, yaml, strlen((char*) yaml));
-	documents = mapred_parse_yaml(&parser);
-	yaml_parser_delete(&parser);
-	return documents;
-}
-
-mapred_olist_t* mapred_parse_file(FILE *file)
-{
-	mapred_olist_t  *documents;
-	yaml_parser_t parser;
-
-	XASSERT(file);
-	if (!yaml_parser_initialize(&parser))
-		XRAISE(MAPRED_PARSE_INTERNAL, 
-			   "YAML parser initialization failed");
-
-	yaml_parser_set_input_file(&parser, file);
-	documents = mapred_parse_yaml(&parser);
-	yaml_parser_delete(&parser);
-	return documents;
-}
-
-mapred_olist_t* mapred_parse_yaml(yaml_parser_t *yparser)
-{
-	mapred_parser_t		 parser;
-	int					 i;
-	int					 error = 0;
-	mapred_olist_t		*doc_item;
-
-	/* Give us a clean slate */
-	memset(&parser, 0, sizeof(parser));
-
-	/* Initialize what must be initialized */
-#if USE_FLEX_REENTRANT
-	yaml_scalar_yylex_init (&parser.yscanner);
-#endif
-	parser.yparser = yparser;
-	parser.state   = STATE_YAML_PARSE;
-	parser.frame   = -1;
-	for (i = 0; i < MAX_CONTEXT_DEPTH; i++)
-		parser.context[i] = CONTEXT_NONE;
-
-	/* Call into the parser, detects grammar errors */
-	error = yaml_yyparse(&parser);
-
-	/* finalize final document */
-	parser_add_document(&parser);
-
-	/* Cleanup and return */
-#if USE_FLEX_REENTRANT
-	yaml_scalar_yylex_destroy(parser.yscanner);
-#endif
-
-	/* Check for errors within documents */
-	for (doc_item = parser.doclist; 
-		 doc_item && !error; 
-		 doc_item = doc_item->next)
-	{
-		if (doc_item->object->u.document.flags & mapred_document_error)
-			error = true;
-	}
-
-	/* Cleanup and return */	
-	if (error)
-	{
-		mapred_destroy_olist(&parser.doclist);
-		XRAISE(MAPRED_PARSE_ERROR, "parse failure");
-	}
-	
-	return parser.doclist;
-}
-
-
-void parser_add_document(mapred_parser_t *parser)
-{
-	mapred_olist_t     *newitem;
-	mapred_olist_t     *doclist;
-	int                 error;
-
-	if (!parser->current_doc)
-		return;
-
-	/* Add the last of the documents objects into the document */
-	parser_add_object(parser, MAPRED_NO_KIND);
-
-	/* Verify the completed document */
-	error = mapred_verify_object(parser, parser->current_doc);
-	if (error != NO_ERROR)
-		parser->current_doc->u.document.flags |= mapred_document_error;
-
-	/* Allocate the new list item */
-	newitem = malloc(sizeof(mapred_olist_t));
-	newitem->object = parser->current_doc;
-	newitem->next   = (mapred_olist_t *) NULL;
-
-	/* Insert it into the last slot of the existing list */
-	doclist = parser->doclist;
-	while (doclist && doclist->next)
-		doclist = doclist->next;
-	if (doclist)
-		doclist->next = newitem;
-	else
-		parser->doclist = newitem;
-}
-
-void parser_begin_document(mapred_parser_t *parser)
-{
-	/* If there is a current document add it first */
-	parser_add_document(parser);
-
-	/* Allocate an object for the new document and return */
-	parser->current_doc = malloc(sizeof(mapred_object_t));
-	memset(parser->current_doc, 0, sizeof(mapred_object_t));
-	parser->current_doc->kind = MAPRED_DOCUMENT;
-	parser->current_doc->u.document.id = ++parser->doc_number;
-	parser->current_doc->line = (int) parser->event.start_mark.line+1;
-
-	if (global_verbose_flag)
-		fprintf(stderr, "  - Parsing YAML Document %d:\n", parser->doc_number);
-}
-
-void parser_begin_define(mapred_parser_t *parser)
-{
-	XASSERT(parser->current_doc);
-
-	/* 
-	 * The only thing we have to do is ensure that this isn't a duplicate
-	 * define list.
-	 */
-	if (parser->current_doc->u.document.flags & mapred_document_defines)
-	{
-		mapred_parse_error(parser, "Duplicate DEFINE list in DOCUMENT");
-		return;
-	}
-			   
-	parser->current_doc->u.document.flags |= mapred_document_defines;
-}
-
-void parser_begin_execute(mapred_parser_t *parser)
-{
-	XASSERT(parser->current_doc);
-
-	/* 
-	 * The only thing we have to do is ensure that this isn't a duplicate
-	 * execution list.
-	 */
-	if (parser->current_doc->u.document.flags & mapred_document_executes)
-	{
-		mapred_parse_error(parser, "Duplicate EXECUTE list in DOCUMENT");
-		return;
-	}
-
-	parser->current_doc->u.document.flags |= mapred_document_executes;
-}
-
-void parser_set_version(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-
-	if (parser->current_doc->u.document.version)
-	{
-		mapred_parse_error(parser, "Duplicate Version: %s", value);
-		return;
-	}
-
-	/* 
-	 * We have already assured that the value matches a good regex,
-	 * but we must still validate that the version itself is supported.
-	 */
-	if (strcmp(value, "1.0.0.1") < 0 || strcmp(value, "1.0.0.3") > 0)
-	{
-		mapred_parse_error(parser, "Unrecognized VERSION");
-	}
-
-	parser->current_doc->u.document.version = copyscalar(value);
-}
-
-void parser_set_database(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	if (parser->current_doc->u.document.database)
-	{
-		mapred_parse_error(parser, "Duplicate Database: %s", value);
-		return;
-	}
-	parser->current_doc->u.document.database = copyscalar(value);
-}
-
-void parser_set_user(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	if (parser->current_doc->u.document.user)
-	{
-		mapred_parse_error(parser, "Duplicate User: %s", value);
-		return;
-	}
-	parser->current_doc->u.document.user = copyscalar(value);
-}
-
-void parser_set_host(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	if (parser->current_doc->u.document.host)
-	{
-		mapred_parse_error(parser, "Duplicate Host: %s", value);
-		return;
-	}
-	parser->current_doc->u.document.host = copyscalar(value);
-}
-
-void parser_set_port(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	if (parser->current_doc->u.document.port > 0)
-	{
-		mapred_parse_error(parser, "Duplicate Port: %s", value);
-		return;
-	}
-
-	/* 
-	 * The parse has already assured that the value consists of a sequence
-	 * of digits, so strtol should convert successfully. 
-	 */
-	parser->current_doc->u.document.port = (int) strtol(value, NULL, 10);
-}
-
-
-/*
- * parser_add_object - Create a new empty object for the current document.
- */
-void parser_add_object(mapred_parser_t *parser, mapred_kind_t kind)
-{
-	int error;
-
-	XASSERT(parser->current_doc);
-
-	/* 
-	 * If we have a current object then verify it and add it into the
-	 * document's object list. 
-	 */
-	if (parser->current_obj)
-	{
-		mapred_olist_t *newitem;
-		mapred_olist_t *objlist;
-
-		/* Validate the finished object */
-		error = mapred_verify_object(parser, parser->current_obj);
-		if (error != NO_ERROR)
-		{
-			mapred_destroy_object(&parser->current_obj);
-			parser->current_doc->u.document.flags |= 
-				mapred_document_error;
-		}
-		else
-		{
-
-			/* Allocate the new list item */
-			newitem = malloc(sizeof(mapred_olist_t));
-			newitem->object = parser->current_obj;
-			newitem->next   = (mapred_olist_t *) NULL;
-
-			/* Insert it into the last slot of the existing list */
-			objlist = parser->current_doc->u.document.objects;
-			while (objlist && objlist->next)
-				objlist = objlist->next;
-			if (objlist)
-				objlist->next = newitem;
-			else
-				parser->current_doc->u.document.objects = newitem;
-
-			if (global_verbose_flag)
-			{
-				const char *type, *name;
-				XASSERT (newitem->object->kind > 0 && 
-						 newitem->object->kind <= MAPRED_MAXKIND);
-
-
-				type = mapred_kind_name[newitem->object->kind];
-				name = newitem->object->name; 
-				if (name)
-					fprintf(stderr, "    - %s: %s\n", type, name);
-				else
-					fprintf(stderr, "    - %s\n", type);
-			}
-		}
-	}
-
-	/* 
-	 * If 'kind' is 'NO_KIND' then we just add in the current object
-	 * (above) and do not create a new one.  We call it this way once
-	 * at the end to add the last object into the current document.
-	 */
-	if (kind == MAPRED_NO_KIND)
-	{
-		parser->current_obj = (mapred_object_t *) NULL;
-		return;
-	}
-
-	/* Allocate a new empyt object of the correct kind and return. */
-	parser->current_obj = malloc(sizeof(mapred_object_t));
-	memset(parser->current_obj, 0, sizeof(mapred_object_t));
-	parser->current_obj->kind = kind;
-	parser->current_obj->line = (int) parser->event.start_mark.line+1;
-}
-
-
-
-void parser_add_run(mapred_parser_t *parser)
-{
-	/*
-	 * Execution objects just re-use the 'task' structure.  The only
-	 * differences are that:
-	 *    Execution objects get RUN
-	 *    Execution objects do not require (or support) a NAME
-	 */
-	parser_add_object(parser, MAPRED_EXECUTION);
-	parser->current_obj->u.task.execute = true;
-}
-
-
-
-void parser_set_name(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT      ||
-		   parser->current_obj->kind == MAPRED_OUTPUT     ||
-		   parser->current_obj->kind == MAPRED_MAPPER     ||
-		   parser->current_obj->kind == MAPRED_TRANSITION ||
-		   parser->current_obj->kind == MAPRED_COMBINER   ||
-		   parser->current_obj->kind == MAPRED_FINALIZER  ||
-		   parser->current_obj->kind == MAPRED_REDUCER    ||
-		   parser->current_obj->kind == MAPRED_TASK);
-
-	/* If this is an invalid name => throw an error */
-	if (!value || strlen(value) == 0)
-	{
-		value = "?";
-		mapred_parse_error(parser, "Invalid NAME", value);
-	}
-
-	/* If the object already has a name => throw an error */
-	if (parser->current_obj->name)
-	{
-		mapred_parse_error(parser, "Duplicate NAME", value);
-		return;
-	}
-
-	parser->current_obj->name = copyscalar(value);
-}
-
-void parser_set_table(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT ||
-		   parser->current_obj->kind == MAPRED_OUTPUT);
-
-	if (!value || strlen(value) == 0)
-	{
-		value = "";
-		mapred_parse_error(parser, "Invalid TABLE");
-	}
-
-	if (parser->current_obj->kind == MAPRED_INPUT)
-	{
-		if (!value || strlen(value) == 0)
-		{
-			if (parser->current_obj->u.input.type == MAPRED_INPUT_NONE)
-				parser->current_obj->u.input.type = MAPRED_INPUT_TABLE;
-			mapred_parse_error(parser, "Invalid TABLE");
-			return;
-		}
-
-		if (parser->current_obj->u.input.type != MAPRED_INPUT_NONE)
-		{
-			switch (parser->current_obj->u.input.type)
-			{
-				case MAPRED_INPUT_TABLE:
-					mapred_parse_error(parser, 
-									   "Duplicate TABLE");
-					return;
-				case MAPRED_INPUT_FILE:
-					mapred_parse_error(parser, 
-									   "FILE is incompatible with TABLE");
-					return;
-				case MAPRED_INPUT_GPFDIST:
-					mapred_parse_error(parser, 
-									   "GPFDIST is incompatible with TABLE");
-					return;
-				case MAPRED_INPUT_QUERY:
-					mapred_parse_error(parser, 
-									   "QUERY is incompatible with TABLE");
-					return;
-				case MAPRED_INPUT_EXEC:
-					mapred_parse_error(parser, 
-									   "GPFDIST is incompatible with TABLE");
-					return;
-				default:
-					XASSERT(false);
-			}
-		}
-		parser->current_obj->u.input.type = MAPRED_INPUT_TABLE;
-		parser->current_obj->u.input.desc = copyscalar(value);
-	}
-	else
-	{
-		if (!value || strlen(value) == 0)
-		{
-			if (parser->current_obj->u.output.type == MAPRED_OUTPUT_NONE)
-				parser->current_obj->u.output.type = MAPRED_OUTPUT_TABLE;
-			mapred_parse_error(parser, "Invalid TABLE");
-			return;
-		}
-
-		if (parser->current_obj->u.output.type != MAPRED_OUTPUT_NONE)
-		{
-			switch (parser->current_obj->u.output.type)
-			{
-				case MAPRED_OUTPUT_TABLE:
-					mapred_parse_error(parser, 
-									   "Duplicate TABLE");
-					return;
-				case MAPRED_OUTPUT_FILE:
-					mapred_parse_error(parser, 
-									   "FILE is incompatible with TABLE");
-					return;
-				default:
-					XASSERT(false);
-			}
-		}
-		parser->current_obj->u.output.type = MAPRED_OUTPUT_TABLE;
-		parser->current_obj->u.output.desc = copyscalar(value);
-	}
-}
-
-void parser_set_query(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-
-	if (!value || strlen(value) == 0)
-	{
-		value = "";
-		mapred_parse_error(parser, "Invalid QUERY");
-	}
-
-	if (parser->current_obj->u.input.type != MAPRED_INPUT_NONE)
-	{
-		if (parser->current_obj->u.input.type == MAPRED_INPUT_QUERY)
-		{
-			mapred_parse_error(parser, "Duplicate QUERY for INPUT");
-			return;
-		}
-		else
-		{
-			mapred_parse_error(parser, "INPUT may only specify one of "
-							   "FILE, GPFDIST, TABLE, QUERY, EXEC");
-			return;
-		}
-	}
-	parser->current_obj->u.input.type = MAPRED_INPUT_QUERY;
-	parser->current_obj->u.input.desc = copyscalar(value);
-}
-
-void parser_set_exec(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-
-	if (!value || strlen(value) == 0)
-	{
-		value = "";
-		mapred_parse_error(parser, "Invalid EXEC");
-	}
-
-	if (parser->current_obj->u.input.type != MAPRED_INPUT_NONE)
-	{
-		if (parser->current_obj->u.input.type == MAPRED_INPUT_EXEC)
-		{
-			mapred_parse_error(parser, "Duplicate EXEC for INPUT");
-			return;
-		}
-		else
-		{
-			mapred_parse_error(parser, "INPUT may only specify one of "
-							   "FILE, GPFDIST, TABLE, QUERY, EXEC");
-			return;
-		}
-	}
-	parser->current_obj->u.input.type = MAPRED_INPUT_EXEC;
-	parser->current_obj->u.input.desc = copyscalar(value);
-}
-
-void parser_set_format(mapred_parser_t *parser, char *value)
-{
-	mapred_format_t format;
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-
-	if (value && !strcasecmp(value, "text"))
-		format = MAPRED_FORMAT_TEXT;
-	else if (value && !strcasecmp(value, "csv"))
-		format = MAPRED_FORMAT_CSV;
-	else
-		format = MAPRED_FORMAT_INVALID;
-
-	switch (parser->current_obj->kind)
-	{
-		case MAPRED_INPUT:
-			if (format == MAPRED_FORMAT_INVALID)
-				mapred_parse_error(parser, "Duplicate FORMAT");
-			if (parser->current_obj->u.input.format != MAPRED_FORMAT_NONE)
-			{
-				format = MAPRED_FORMAT_INVALID;
-				mapred_parse_error(parser, "Duplicate FORMAT");
-			}
-			parser->current_obj->u.input.format = format;
-			return;
-
-		case MAPRED_OUTPUT:
-			if (format == MAPRED_FORMAT_INVALID)
-				mapred_parse_error(parser, "Duplicate FORMAT");
-			if (parser->current_obj->u.output.format != MAPRED_FORMAT_NONE)
-			{
-				format = MAPRED_FORMAT_INVALID;
-				mapred_parse_error(parser, "Duplicate FORMAT");
-			}
-			parser->current_obj->u.output.format = format;
-			return;
-
-		default:
-			XASSERT(false);
-	}
-}
-
-void parser_set_delimiter(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-
-	if (!value || strlen(value) == 0)
-	{
-		value = "";
-		mapred_parse_error(parser, "Invalid DELIMITER");
-	}
-
-	switch (parser->current_obj->kind)
-	{
-		case MAPRED_INPUT:
-			if (parser->current_obj->u.input.delimiter)
-			{
-				mapred_parse_error(parser, "Duplicate DELIMITER");
-				return;
-			}
-			parser->current_obj->u.input.delimiter = copyscalar(value);
-			return;
-
-		case MAPRED_OUTPUT:
-			if (parser->current_obj->u.output.delimiter)
-			{
-				mapred_parse_error(parser, "Duplicate DELIMITER");
-				return;
-			}
-			parser->current_obj->u.output.delimiter = copyscalar(value);
-			return;
-			
-		default:
-			XASSERT(false);
-	}
-}
-
-void parser_set_escape(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-
-	if (!value || strlen(value) == 0)
-	{
-		value = "";
-		mapred_parse_error(parser, "Invalid ESCAPE");
-	}
-	if (parser->current_obj->u.input.escape)
-	{
-		mapred_parse_error(parser, "Duplicate ESCAPE");
-		return;
-	}
-	parser->current_obj->u.input.escape = copyscalar(value);
-}
-
-
-void parser_set_null(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-
-	if (!value || strlen(value) == 0)
-	{
-		parser->current_obj->u.input.null = copyscalar("");
-		mapred_parse_error(parser, "Invalid NULL");
-		return;
-	}
-	if (parser->current_obj->u.input.null)
-	{
-		mapred_parse_error(parser, "Duplicate NULL");
-		return;
-	}
-	parser->current_obj->u.input.null = copyscalar(value);
-}
-
-void parser_set_quote(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-
-	if (!value || strlen(value) == 0)
-	{
-		parser->current_obj->u.input.quote = copyscalar("");
-		mapred_parse_error(parser, "Invalid QUOTE");
-		return;
-	}
-	if (parser->current_obj->u.input.quote)
-	{
-		mapred_parse_error(parser, "Duplicate QUOTE");
-		return;
-	}
-	parser->current_obj->u.input.quote = copyscalar(value);
-}
-
-
-void parser_set_encoding(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-
-	if (!value || strlen(value) == 0)
-	{
-		parser->current_obj->u.input.encoding = copyscalar("");
-		mapred_parse_error(parser, "Invalid ENCODING");
-		return;
-	}
-	if (parser->current_obj->u.input.encoding)
-	{
-		mapred_parse_error(parser, "Duplicate ENCODING");
-		return;
-	}
-	parser->current_obj->u.input.encoding = copyscalar(value);
-}
-
-void parser_set_error_limit(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-
-	if (!value || strlen(value) == 0)
-	{
-		parser->current_obj->u.input.error_limit = -1;
-		mapred_parse_error(parser, "Invalid ERROR_LIMIT");
-		return;
-	}
-	if (parser->current_obj->u.input.error_limit > 0)
-	{
-		mapred_parse_error(parser, "Duplicate ERROR_LIMIT");
-		return;
-	}
-
-	/* 
-	 * The parse has already assured that the value consists of a sequence
-	 * of digits, so strtol should convert successfully. 
-	 */
-	parser->current_obj->u.input.error_limit = (int) strtol(value, NULL, 10);
-}
-
-
-void parser_set_mode(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-
-	switch (parser->current_obj->kind)
-	{
-		case MAPRED_MAPPER:
-		case MAPRED_TRANSITION:
-		case MAPRED_COMBINER:
-		case MAPRED_FINALIZER:
-		{
-			mapred_mode_t mode;
-
-			/* Convert input string into a valid mode */
-			if (value && !strcasecmp(value, "single"))
-				mode = MAPRED_MODE_SINGLE;
-			else if (value && !strcasecmp(value, "multi"))
-				mode = MAPRED_MODE_MULTI;
-			else
-				mode = MAPRED_MODE_INVALID;
-
-			/* Only MAP and FINALIZE support MULTI mode */
-			if (mode == MAPRED_MODE_MULTI &&
-				parser->current_obj->kind != MAPRED_MAPPER &&
-				parser->current_obj->kind != MAPRED_FINALIZER)
-			{
-				mode = MAPRED_MODE_INVALID;
-			}
-
-			/* Error for invalid or duplicate modes */
-			if (mode == MAPRED_MODE_INVALID)
-			{
-				mapred_parse_error(parser, "Invalid MODE");
-			}
-			if (parser->current_obj->u.function.mode != MAPRED_MODE_NONE)
-			{
-				mode = MAPRED_MODE_INVALID;
-				mapred_parse_error(parser, "Duplicate MODE");
-			}
-
-			/* Set mode and return */
-			parser->current_obj->u.function.mode = mode;
-			return;
-		}
-
-		case MAPRED_OUTPUT:
-		{
-			mapred_output_mode_t mode;
-
-			/* Convert input string into a valid mode */
-			if (value && !strcasecmp(value, "replace"))
-				mode = MAPRED_OUTPUT_MODE_REPLACE;
-			else if (value && !strcasecmp(value, "append"))
-				mode = MAPRED_OUTPUT_MODE_APPEND;
-			else
-				mode = MAPRED_OUTPUT_MODE_INVALID;
-
-			/* Error for invalid or duplicate modes */
-			if (mode == MAPRED_OUTPUT_MODE_INVALID)
-			{
-				mapred_parse_error(parser, "Invalid MODE");
-			}
-			if (parser->current_obj->u.output.mode != MAPRED_OUTPUT_MODE_NONE)
-			{
-				mode = MAPRED_OUTPUT_MODE_INVALID;
-				mapred_parse_error(parser, "Duplicate MODE");
-			}
-
-			/* Set mode and return */
-			parser->current_obj->u.output.mode = mode;
-			return;
-		}
-
-		default:
-			XASSERT(false);  /* ONLY functions and OUTPUTS have modes */
-	}
-}
-
-void parser_set_file(mapred_parser_t *parser, char *value)
-{
-	/* 
-	 * Only applies to OUTPUTS which have a single file.
-	 * INPUTS use parser_begin_files, parser_add_file ...
-	 */
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_OUTPUT);
-
-	switch (parser->current_obj->u.output.type)
-	{
-		case MAPRED_OUTPUT_NONE:
-			parser->current_obj->u.output.type = MAPRED_OUTPUT_FILE;
-			if (!value || strlen(value) == 0)
-			{
-				mapred_parse_error(parser, "Invalid FILE");
-				return;
-			}
-			parser->current_obj->u.output.desc = copyscalar(value);
-			break;
-
-		case MAPRED_OUTPUT_FILE:
-		{
-			mapred_parse_error(parser, "Duplicate FILE");
-			return;
-		}
-
-		case MAPRED_OUTPUT_TABLE:
-		{
-			mapred_parse_error(parser, "TABLE is incompatible with FILE");
-			return;
-		}
-			
-		default:
-			XASSERT(false);
-	}
-}
-
-void parser_set_transition(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_REDUCER);
-
-	if (parser->current_obj->u.reducer.transition.name)
-	{
-		mapred_parse_error(parser, "Duplicate TRANSITION for REDUCE");
-		return;
-	}
-	parser->current_obj->u.reducer.transition.name = copyscalar(value);
-}
-
-void parser_set_combiner(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_REDUCER);
-
-	if (parser->current_obj->u.reducer.combiner.name)
-	{
-		mapred_parse_error(parser, "Duplicate CONSOLIDATE for REDUCE");
-		return;
-	}
-	parser->current_obj->u.reducer.combiner.name = copyscalar(value);
-}
-
-void parser_set_finalizer(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_REDUCER);
-
-	if (parser->current_obj->u.reducer.finalizer.name)
-	{
-		mapred_parse_error(parser, "Duplicate FINALIZE for REDUCE");
-		return;
-	}
-	parser->current_obj->u.reducer.finalizer.name = copyscalar(value);
-}
-
-void parser_set_initialize(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_REDUCER);
-
-	if (parser->current_obj->u.reducer.initialize)
-	{
-		mapred_parse_error(parser, "Duplicate INITIALIZE for REDUCE");
-		return;
-	}
-	parser->current_obj->u.reducer.initialize = copyscalar(value);
-}
-
-
-void parser_set_language(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_MAPPER     ||
-			parser->current_obj->kind == MAPRED_TRANSITION ||
-			parser->current_obj->kind == MAPRED_COMBINER   ||
-			parser->current_obj->kind == MAPRED_FINALIZER);
-			
-	if (!value || strlen(value) == 0)
-	{
-		value = "";
-		mapred_parse_error(parser, "Invalid LANGUAGE");
-	}
-	if (parser->current_obj->u.function.language)
-	{
-		mapred_parse_error(parser, "Duplicate LANGUAGE");
-		return;
-	}
-	parser->current_obj->u.function.language = copyscalar(value);
-}
-
-void parser_set_function(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_MAPPER     ||
-			parser->current_obj->kind == MAPRED_TRANSITION ||
-			parser->current_obj->kind == MAPRED_COMBINER   ||
-			parser->current_obj->kind == MAPRED_FINALIZER);
-
-	if (!value || strlen(value) == 0)
-	{
-		value = "";
-		mapred_parse_error(parser, "Invalid FUNCTION");
-	}
-	if (parser->current_obj->u.function.body)
-	{
-		mapred_parse_error(parser, "Duplicate FUNCTION");
-		return;
-	}
-	parser->current_obj->u.function.body = copyscalar(value);
-
-
-	/* 
-	 * The "start_mark" of function body has a line number, but what that line 
-	 * number refers to is a bit finicky depending on the nature of the YAML.
-	 * So we take it and adjust it accordingly.
-	 */
-	parser->current_obj->u.function.lineno = parser->event.start_mark.line;
-	switch (parser->event.data.scalar.style)
-	{
-		case YAML_LITERAL_SCALAR_STYLE:
-		case YAML_FOLDED_SCALAR_STYLE:
-			parser->current_obj->u.function.lineno += 2;
-			break;
-
-		case YAML_PLAIN_SCALAR_STYLE:
-		case YAML_SINGLE_QUOTED_SCALAR_STYLE:
-		case YAML_DOUBLE_QUOTED_SCALAR_STYLE:
-			parser->current_obj->u.function.lineno += 1;
-			break;			
-		default:
-			break;
-	}
-}
-
-/*
- * parser_set_library was added to support the "LIBRARY" option in mapreduce 
- * yaml schema version 1.0.0.2.  This is used by C language functions to 
- * specify which code library the C function is defined in.
- *
- * - MAP:
- *     ...
- *     LIBRARY:  $libdir/libfoo
- *     FUNCTION: myFunc
- */
-void parser_set_library(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_MAPPER     ||
-			parser->current_obj->kind == MAPRED_TRANSITION ||
-			parser->current_obj->kind == MAPRED_COMBINER   ||
-			parser->current_obj->kind == MAPRED_FINALIZER);
-
-	if (!value || strlen(value) == 0)
-	{
-		value = "";
-		mapred_parse_error(parser, "Invalid LIBRARY");
-	}
-	if (parser->current_obj->u.function.library)
-	{
-		mapred_parse_error(parser, "Duplicate LIBRARY");
-		return;
-	}
-	parser->current_obj->u.function.library = copyscalar(value);
-
-	/* 
-	 * We will validate that the document version is >= 1.0.0.2
-	 * durring object verification.
-	 */
-}
-
-void parser_set_optimize(mapred_parser_t *parser, char *value)
-{
-   /* FIXME */
-}
-
-
-void parser_set_source(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-
-	switch (parser->current_obj->kind)
-	{
-		case MAPRED_TASK:
-			if (parser->current_obj->u.task.input.name)
-			{
-				mapred_parse_error(parser, "Duplicate SOURCE for TASK");
-				return;
-			}
-			parser->current_obj->u.task.input.name = copyscalar(value);
-			break;
-
-		case MAPRED_EXECUTION:
-			if (parser->current_obj->u.task.input.name)
-			{
-				mapred_parse_error(parser, "Duplicate SOURCE for RUN");
-				return;
-			}
-			parser->current_obj->u.task.input.name = copyscalar(value);
-			break;
-
-		default:
-			XASSERT(false);
-	}
-}
-
-void parser_set_target(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_EXECUTION);
-
-	if (parser->current_obj->u.task.output.name)
-	{
-		mapred_parse_error(parser, "Duplicate TARGET for RUN");
-		return;
-	}
-	parser->current_obj->u.task.output.name = copyscalar(value);
-}
-
-void parser_set_mapper(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-
-	switch (parser->current_obj->kind)
-	{
-		case MAPRED_TASK:
-			if (parser->current_obj->u.task.mapper.name)
-			{
-				mapred_parse_error(parser, "Duplicate MAP for TASK");
-				return;
-			}
-			parser->current_obj->u.task.mapper.name = copyscalar(value);
-			break;
-
-		case MAPRED_EXECUTION:
-			if (parser->current_obj->u.task.mapper.name)
-			{
-				mapred_parse_error(parser, "Duplicate MAP for RUN");
-				return;
-			}
-			parser->current_obj->u.task.mapper.name = copyscalar(value);
-			break;
-
-		default:
-			XASSERT(false);
-	}
-}
-
-void parser_set_reducer(mapred_parser_t *parser, char *value)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-
-	switch (parser->current_obj->kind)
-	{
-		case MAPRED_TASK:
-			if (parser->current_obj->u.task.reducer.name)
-			{
-				mapred_parse_error(parser, "Duplicate REDUCE for TASK");
-				return;
-			}
-			parser->current_obj->u.task.reducer.name = copyscalar(value);
-			break;
-
-		case MAPRED_EXECUTION:
-			if (parser->current_obj->u.task.reducer.name)
-			{
-				mapred_parse_error(parser, "Duplicate REDUCE for RUN");
-				return;
-			}
-			parser->current_obj->u.task.reducer.name = copyscalar(value);
-			break;
-
-		default:
-			XASSERT(false);
-	}
-}
-
-void parser_begin_ordering(mapred_parser_t *parser)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_REDUCER);
-
-	/* 
-	 * We will validate that the document version is >= 1.0.0.3
-	 * durring object verification.
-	 */
-	if (parser->current_obj->u.reducer.ordering)
-	{
-		mapred_parse_error(parser, "Duplicate ORDERING for REDUCER");
-		return;
-	}
-}
-
-void parser_add_ordering(mapred_parser_t *parser, char *value)
-{
-	mapred_clist_t *newitem;
-	mapred_clist_t *clist;
-
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_REDUCER);
-
-	/* 
-	 * Validate ordering:
-	 *   In general ordering can be an arbitrary expression so it is
-	 *   difficult to verify easily.  If we need more verification it
-	 *   makes sense to push that verification into the grammar.
-	 */
-	if (!value || strlen(value) == 0)
-	{
-		mapred_parse_error(parser, "Invalid ORDERING");
-		return;
-	}
-
-	/* Allocate the new list item */
-	newitem = malloc(sizeof(mapred_clist_t));
-	newitem->value = copyscalar(value);
-	newitem->next = (mapred_clist_t *) NULL;
-
-	/* Add the new item into the last slot of the list */
-	clist = parser->current_obj->u.reducer.ordering;
-	if (clist == NULL)
-		parser->current_obj->u.reducer.ordering = newitem;
-	else
-	{
-		while (clist && clist->next)
-			clist = clist->next;
-		clist->next = newitem;
-	}
-}
-
-
-/* List functions */
-void parser_begin_files(mapred_parser_t *parser)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-
-	if (parser->current_obj->u.input.type != MAPRED_INPUT_NONE)
-	{
-		if (parser->current_obj->u.input.type == MAPRED_INPUT_FILE)
-		{
-			mapred_parse_error(parser, "Duplicate FILE for INPUT");
-			return;
-		}
-		else
-		{
-			mapred_parse_error(parser, "INPUT may only specify one of "
-							   "FILE, GPFDIST, TABLE, QUERY, EXEC");
-			return;
-		}
-	}
-
-	/* files will be added individually */
-	parser->current_obj->u.input.type = MAPRED_INPUT_FILE;
-}
-
-void parser_begin_gpfdist(mapred_parser_t *parser)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-
-	if (parser->current_obj->u.input.type != MAPRED_INPUT_NONE)
-	{
-		if (parser->current_obj->u.input.type == MAPRED_INPUT_GPFDIST)
-		{
-			mapred_parse_error(parser, "Duplicate GPFDIST for INPUT");
-			return;
-		}
-		else
-		{
-			mapred_parse_error(parser, "INPUT may only specify one of "
-							   "FILE, GPFDIST, TABLE, QUERY, EXEC");
-			return;
-		}
-	}
-	parser->current_obj->u.input.type = MAPRED_INPUT_GPFDIST;
-}
-
-void parser_begin_columns(mapred_parser_t *parser)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-	if (parser->current_obj->u.input.columns)
-	{
-		mapred_parse_error(parser, "Duplicate COLUMNS for INPUT");
-		return;
-	}
-}
-
-void parser_begin_parameters(mapred_parser_t *parser)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	switch (parser->current_obj->kind)
-	{
-		case MAPRED_MAPPER:
-			if (parser->current_obj->u.function.parameters)
-			{
-				mapred_parse_error(parser, "Duplicate PARAMETERS for MAP");
-				return;
-			}
-			break;
-
-		case MAPRED_TRANSITION:
-			if (parser->current_obj->u.function.parameters)
-			{
-				mapred_parse_error(parser, "Duplicate PARAMETERS for TRANSITION");
-				return;
-			}
-			break;
-
-		case MAPRED_COMBINER:
-			if (parser->current_obj->u.function.parameters)
-			{
-				mapred_parse_error(parser, "Duplicate PARAMETERS for CONSOLIDATE");
-				return;
-			}
-			break;
-
-		case MAPRED_FINALIZER:
-			if (parser->current_obj->u.function.parameters)
-			{
-				mapred_parse_error(parser, "Duplicate PARAMETERS for FINALIZE");
-				return;
-			}
-			break;
-
-		default:
-			XASSERT(false);
-	}
-}
-
-void parser_begin_returns(mapred_parser_t *parser)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	switch (parser->current_obj->kind)
-	{
-		case MAPRED_MAPPER:
-			if (parser->current_obj->u.function.returns)
-			{
-				mapred_parse_error(parser, "Duplicate RETURNS for MAP");
-				return;
-			}
-			break;
-
-		case MAPRED_TRANSITION:
-			if (parser->current_obj->u.function.returns)
-			{
-				mapred_parse_error(parser, "Duplicate RETURNS for TRANSITION");
-				return;
-			}
-			break;
-
-		case MAPRED_COMBINER:
-			if (parser->current_obj->u.function.returns)
-			{
-				mapred_parse_error(parser, "Duplicate RETURNS for CONSOLIDATE");
-				return;
-			}
-			break;
-
-		case MAPRED_FINALIZER:
-			if (parser->current_obj->u.function.returns)
-			{
-				mapred_parse_error(parser, "Duplicate RETURNS for FINALIZE");
-				return;
-			}
-			break;
-
-		default:
-			XASSERT(false);
-	}
-}
-
-void parser_begin_keys(mapred_parser_t *parser)
-{
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_REDUCER);
-	if (parser->current_obj->u.reducer.keys)
-	{
-		mapred_parse_error(parser, "Duplicate KEYS for REDUCER");
-		return;
-	}
-}
-
-void parser_add_file(mapred_parser_t *parser, char *value)
-{
-	mapred_clist_t *newitem;
-	mapred_clist_t *clist;
-
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-	XASSERT(parser->current_obj->u.input.type == MAPRED_INPUT_FILE ||
-			parser->current_obj->u.input.type == MAPRED_INPUT_GPFDIST);
-
-	/* Verify the new file */
-	if (!value || strlen(value) == 0)
-	{
-		switch (parser->current_obj->u.input.type)
-		{
-			case MAPRED_INPUT_FILE:
-				mapred_parse_error(parser, "Invalid FILE");
-				return;
-			case MAPRED_INPUT_GPFDIST:
-				mapred_parse_error(parser, "Invalid GPFDIST");
-				return;
-			default:
-				XASSERT(false);
-		}
-	}
-	/* Todo: improved regex checking on files */
-
-	/* Allocate the new list item */
-	newitem = malloc(sizeof(mapred_clist_t));
-	newitem->value = copyscalar(value);
-	newitem->next  = (mapred_clist_t *) NULL;
-
-	/* Add the new item into the last slot of the list */
-	clist = parser->current_obj->u.input.files;
-	while (clist && clist->next)
-		clist = clist->next;
-	if (clist)
-		clist->next = newitem;
-	else
-		parser->current_obj->u.input.files = newitem;
-}
-
-void parser_add_column(mapred_parser_t *parser, char *value)
-{
-	mapred_plist_t *newitem;
-	mapred_plist_t *plist;
-	char           *name, *type, *tokenizer;
-
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_INPUT);
-
-	/* 
-	 * Verify the new column
-	 * It should be in one of two forms:
-	 *    1)   <name>
-	 *    2)   <name> <datatype>
-	 */
-	if (!value || strlen(value) == 0)
-	{
-		mapred_parse_error(parser, "Invalid COLUMNS");
-		return;
-	}
-	name = strtok_r(value, " \t\r", &tokenizer);
-	type = strtok_r(NULL, " \t\r", &tokenizer);
-	if (!type)
-		type = "text";  /* type defaults to 'text' */
-	
-    /* double check that there's nothing else */
-	if (strtok_r(NULL, " \t\r", &tokenizer))
-	{
-		mapred_parse_error(parser, "Invalid COLUMNS");
-		return;
-	}
-
-	/* Allocate the new list item */
-	newitem = malloc(sizeof(mapred_plist_t));
-	newitem->name = copyscalar(name);
-	newitem->type = copyscalar(type);
-	newitem->next  = (mapred_plist_t *) NULL;
-
-	/* Add the new item into the last slot of the list */
-	plist = parser->current_obj->u.input.columns;
-	while (plist && plist->next)
-		plist = plist->next;
-	if (plist)
-		plist->next = newitem;
-	else
-		parser->current_obj->u.input.columns = newitem;
-}
-
-void parser_add_parameter(mapred_parser_t *parser, char *value)
-{
-	mapred_plist_t *newitem;
-	mapred_plist_t *plist;
-	char           *name, *type, *tokenizer;
-
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_MAPPER     ||
-			parser->current_obj->kind == MAPRED_TRANSITION ||
-			parser->current_obj->kind == MAPRED_COMBINER   ||
-			parser->current_obj->kind == MAPRED_FINALIZER);
-
-	/* 
-	 * Verify the new parameter
-	 * It should be in one of two forms:
-	 *    1)   <name>
-	 *    2)   <name> <datatype>
-	 */
-	if (!value || strlen(value) == 0)
-	{
-		mapred_parse_error(parser, "Invalid PARAMETERS");
-		return;
-	}
-	name = strtok_r(value, " \t\r", &tokenizer);
-	type = strtok_r(NULL, " \t\r", &tokenizer);
-	if (!type)
-		type = "text";  /* type defaults to 'text' */
-	
-    /* double check that there's nothing else */
-	if (strtok_r(NULL, " \t\r", &tokenizer))
-	{
-		mapred_parse_error(parser, "Invalid PARAMETERS");
-		return;
-	}
-
-	/* Allocate the new list item */
-	newitem = malloc(sizeof(mapred_plist_t));
-	newitem->name = copyscalar(name);
-	newitem->type = copyscalar(type);
-	newitem->next  = (mapred_plist_t *) NULL;
-
-	/* Add the new item into the last slot of the list */
-	plist = parser->current_obj->u.function.parameters;
-	while (plist && plist->next)
-		plist = plist->next;
-	if (plist)
-		plist->next = newitem;
-	else
-		parser->current_obj->u.function.parameters = newitem;
-}
-
-void parser_add_return(mapred_parser_t *parser, char *value)
-{
-	mapred_plist_t *newitem;
-	mapred_plist_t *plist;
-	char           *name, *type, *tokenizer;
-
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_MAPPER     ||
-			parser->current_obj->kind == MAPRED_TRANSITION ||
-			parser->current_obj->kind == MAPRED_COMBINER   ||
-			parser->current_obj->kind == MAPRED_FINALIZER);
-
-	/* 
-	 * Verify the new return
-	 * It should be in one of two forms:
-	 *    1)   <name>
-	 *    2)   <name> <datatype>
-	 */
-	if (!value || strlen(value) == 0)
-	{
-		mapred_parse_error(parser, "Invalid RETURNS");
-		return;
-	}
-	name = strtok_r(value, " \t\r", &tokenizer);
-	type = strtok_r(NULL, " \t\r", &tokenizer);
-	if (!type)
-		type = "text";  /* type defaults to 'text' */
-	
-    /* double check that there's nothing else */
-	if (strtok_r(NULL, " \t\r", &tokenizer))
-	{
-		mapred_parse_error(parser, "Invalid RETURNS");
-		return;
-	}
-
-	/* Allocate the new list item */
-	newitem = malloc(sizeof(mapred_plist_t));
-	newitem->name = copyscalar(name);
-	newitem->type = copyscalar(type);
-	newitem->next  = (mapred_plist_t *) NULL;
-
-	/* Add the new item into the last slot of the list */
-	plist = parser->current_obj->u.function.returns;
-	while (plist && plist->next)
-		plist = plist->next;
-	if (plist)
-		plist->next = newitem;
-	else
-		parser->current_obj->u.function.returns = newitem;
-}
-
-
-void parser_add_key(mapred_parser_t *parser, char *value)
-{
-	mapred_clist_t *newitem;
-	mapred_clist_t *clist;
-
-	XASSERT(parser->current_doc);
-	XASSERT(parser->current_obj);
-	XASSERT(parser->current_obj->kind == MAPRED_REDUCER);
-
-	/* Validate key */
-	if (!value || strlen(value) == 0)
-	{
-		mapred_parse_error(parser, "Invalid KEYS");
-		return;
-	}
-
-	/* Allocate the new list item */
-	newitem = malloc(sizeof(mapred_clist_t));
-	newitem->value = copyscalar(value);
-	newitem->next  = (mapred_clist_t *) NULL;
-
-	/* Add the new item into the last slot of the list */
-	clist = parser->current_obj->u.reducer.keys;
-	while (clist && clist->next)
-		clist = clist->next;
-	if (clist)
-		clist->next = newitem;
-	else
-		parser->current_obj->u.reducer.keys = newitem;
-}
-
-
-
-/*
- * mapred_dump_yaml - Given an object, dump it's YAML representation.
- *   This is the inverse of parsing
- *
- *   (*) Could be re-written to avoid code duplication issues.
- */
-void mapred_dump_yaml(mapred_object_t *obj)
-{
-	char *ckind = NULL;
-
-	if (!obj)
-		return;
-
-	switch (obj->kind)
-	{
-		case MAPRED_DOCUMENT:
-			printf("---\n");
-			/* Dumping the current version */
-			printf("VERSION:          1.0.0.3\n");
-			if (obj->u.document.database)
-				printf("DATABASE:         %s\n", obj->u.document.database);
-			if (obj->u.document.user)
-				printf("USER:             %s\n", obj->u.document.user);
-			if (obj->u.document.host)
-				printf("HOST:             %s\n", obj->u.document.host);
-			if (obj->u.document.port > 0)
-				printf("PORT:             %d\n", obj->u.document.port);
-			if (obj->u.document.flags & mapred_document_defines)
-			{
-				mapred_olist_t *sub;
-				printf("DEFINE:\n");
-				for (sub = obj->u.document.objects; sub; sub = sub->next)
-					if (sub->object->kind != MAPRED_EXECUTION)
-						mapred_dump_yaml(sub->object);
-			}
-			if (obj->u.document.flags & mapred_document_executes)
-			{
-				mapred_olist_t *sub;
-				printf("EXECUTE:\n");
-				for (sub = obj->u.document.objects; sub; sub = sub->next)
-					if (sub->object->kind == MAPRED_EXECUTION)
-						mapred_dump_yaml(sub->object);
-			}
-			break;
-
-		case MAPRED_INPUT:
-			printf("  - INPUT:\n");
-			if (obj->name)
-				printf("      NAME:       %s\n", obj->name);
-			if (obj->u.input.columns)
-			{
-				mapred_plist_t *plist;
-				printf("      COLUMNS:\n");
-				for (plist = obj->u.input.columns; plist; plist = plist->next)
-					printf("        - %s %s\n", plist->name, plist->type);
-			}
-			if (obj->u.input.delimiter)
-				printf("      DELIMITER:  %s\n", obj->u.input.delimiter);
-			if (obj->u.input.encoding)
-				printf("      ENCODING:   %s\n", obj->u.input.encoding);
-			switch (obj->u.input.format)
-			{
-				case MAPRED_FORMAT_NONE:
-					break;
-				case MAPRED_FORMAT_TEXT:
-					printf("      FORMAT:     TEXT\n");
-					break;
-				case MAPRED_FORMAT_CSV:
-					printf("      FORMAT:     CSV\n");
-					break;
-				default:
-					XASSERT(false);
-			}
-			switch (obj->u.input.type)
-			{
-				case MAPRED_INPUT_NONE:
-					break;
-				case MAPRED_INPUT_FILE:
-				{
-					mapred_clist_t *clist;
-					printf("      FILE:\n");
-					for (clist = obj->u.input.files; clist; clist = clist->next)
-						printf("        - %s\n", clist->value);
-					break;
-				}
-				case MAPRED_INPUT_GPFDIST:
-					printf("      GPFDIST:    %s\n", obj->u.input.desc);
-					break;
-				case MAPRED_INPUT_TABLE:
-					printf("      TABLE:      %s\n", obj->u.input.desc);
-					break;
-				case MAPRED_INPUT_QUERY:
-					printf("      QUERY: |\n");
-					printf("         %s\n", obj->u.input.desc);
-					break;
-				case MAPRED_INPUT_EXEC:
-					printf("      EXEC:       %s\n", obj->u.input.desc);
-					break;
-				default:
-					XASSERT(false);
-			}
-			break;
-
-		case MAPRED_OUTPUT:
-			printf("  - OUTPUT:\n");
-			if (obj->name)
-				printf("      NAME:       %s\n", obj->name);
-			switch (obj->u.output.mode)
-			{
-				case MAPRED_OUTPUT_MODE_NONE:
-					break;
-				case MAPRED_OUTPUT_MODE_REPLACE:
-					printf("      MODE:       REPLACE\n");
-					break;
-				case MAPRED_OUTPUT_MODE_APPEND:
-					printf("      MODE:       APPEND\n");
-					break;
-				default:
-					XASSERT(false);			
-			}
-			switch (obj->u.output.type)
-			{
-				case MAPRED_OUTPUT_NONE:
-					break;
-				case MAPRED_OUTPUT_FILE:
-					printf("      FILE:       %s\n", obj->u.output.desc);
-					break;
-				case MAPRED_OUTPUT_TABLE:
-					printf("      TABLE:      %s\n", obj->u.output.desc);
-					break;
-				default:
-					XASSERT(false);
-			}
-			break;
-
-		case MAPRED_MAPPER:
-			ckind = "MAP";
-			/* fallthrough */
-
-		case MAPRED_TRANSITION:
-			if (!ckind)
-				ckind = "TRANSITION";
-			/* fallthrough */
-
-		case MAPRED_COMBINER:
-			if (!ckind)
-				ckind = "CONSOLIDATE";
-			/* fallthrough */
-
-		case MAPRED_FINALIZER:
-			if (!ckind)
-				ckind = "FINALIZE";
-
-			printf("  - %s:\n", ckind);
-			if (obj->name)
-				printf("      NAME:       %s\n", obj->name);
-			if (obj->u.function.parameters)
-			{
-				mapred_plist_t *plist;
-				printf("      PARAMETERS:\n");
-				for (plist = obj->u.function.parameters; plist; 
-					 plist = plist->next)
-					printf("        - %s %s\n", plist->name, plist->type);
-			}
-			if (obj->u.function.returns)
-			{
-				mapred_plist_t *plist;
-				printf("      RETURNS:\n");
-				for (plist = obj->u.function.returns; plist; 
-					 plist = plist->next)
-					printf("        - %s %s\n", plist->name, plist->type);
-			}
-			switch (obj->u.function.mode)
-			{
-				case MAPRED_MODE_NONE:
-					break;
-				case MAPRED_MODE_SINGLE:
-					printf("      MODE:       SINGLE\n");
-					break;
-				case MAPRED_MODE_MULTI:
-					printf("      MODE:       MULTI\n");
-					break;
-				case MAPRED_MODE_ACCUMULATED:
-					printf("      MODE:       ACCUMULATED\n");
-					break;
-				case MAPRED_MODE_WINDOWED:
-					printf("      MODE:       WINDOWED\n");
-					break;
-				default:
-					printf("      MODE:       UNKNOWN\n");
-					break;
-			}
-			if (obj->u.function.flags)
-			{
-				printf("      OPTIMIZE:   ");
-				if (obj->u.function.flags & mapred_function_strict)
-					printf("STRICT ");
-				if (obj->u.function.flags & mapred_function_immutable)
-					printf("IMMUTABLE ");
-				if (obj->u.function.flags & mapred_function_unordered)
-					printf("UNORDERED ");
-				printf("\n");
-			}
-			if (obj->u.function.language)
-				printf("      LANGUAGE:   %s\n", obj->u.function.language);
-			if (obj->u.function.body)
-			{
-				printf("      FUNCTION: |\n");
-				printf("         %s\n", obj->u.function.body);
-			}
-			break;
-
-		case MAPRED_REDUCER:
-			printf("  - REDUCE:\n");
-			if (obj->name)
-				printf("      NAME:       %s\n", obj->name);
-			if (obj->u.reducer.transition.name)
-				printf("      TRANSITION: %s\n", 
-					   obj->u.reducer.transition.name);
-			if (obj->u.reducer.combiner.name)
-				printf("      CONSOLIDATE:   %s\n", 
-					   obj->u.reducer.combiner.name);
-			if (obj->u.reducer.finalizer.name)
-				printf("      FINALIZE:  %s\n", 
-					   obj->u.reducer.finalizer.name);
-			if (obj->u.reducer.initialize)
-				printf("      INITIALIZE: %s\n", 
-					   obj->u.reducer.initialize);
-			if (obj->u.reducer.keys)
-			{
-				mapred_clist_t *clist;
-				printf("      KEYS: |\n");
-				for (clist = obj->u.reducer.keys; clist; clist = clist->next)
-					printf("        - %s\n", clist->value);
-			}
-			if (obj->u.reducer.ordering)
-			{
-				mapred_clist_t *clist;
-				printf("      ORDERING: |\n");
-				for (clist = obj->u.reducer.ordering; clist; clist = clist->next)
-					printf("        - %s\n", clist->value);
-			}
-			break;
-
-		case MAPRED_TASK:
-		case MAPRED_EXECUTION:
-			if (obj->u.task.execute)
-				printf("  - RUN:\n");
-			else
-				printf("  - TASK:\n");
-			if (obj->name)
-				printf("      NAME:       %s\n", obj->name);
-			if (obj->u.task.input.name)
-				printf("      SOURCE:     %s\n", obj->u.task.input.name);
-			if (obj->u.task.mapper.name)
-				printf("      MAP:     %s\n", obj->u.task.mapper.name);
-			if (obj->u.task.reducer.name)
-				printf("      REDUCE:    %s\n", obj->u.task.reducer.name);
-			if (obj->u.task.output.name)
-				printf("      TARGET:     %s\n", obj->u.task.output.name);
-			break;
-
-		case MAPRED_NO_KIND:
-		default:
-			XRAISE(MAPRED_PARSE_INTERNAL, 
-				   "Unknown object type");
-	}
-}
-
-
-	
-int mapred_verify_object(mapred_parser_t *parser, mapred_object_t *obj)
-{
-	char *name;
-	int error = NO_ERROR;
-
-	XASSERT(obj);
-
-	/* Verify that all required fields are present and valid */
-	name = obj->name ? obj->name : "unnamed";
-	switch (obj->kind)
-	{
-		case MAPRED_DOCUMENT:
-			
-			/* 
-			 * If there is a version on the document then it should have
-			 * been validated by parser_set_version()
-			 */
-			if (!obj->u.document.version)
-			{
-				error = mapred_obj_error(obj, "Missing VERSION", 
-										 parser->doc_number);
-			}
-
-			break;
-
-		case MAPRED_INPUT:
-
-			/* Validate required fields */
-			if (!obj->name)
-				error = mapred_obj_error(obj, "Missing NAME");
-			if (obj->u.input.type == MAPRED_INPUT_NONE)
-				error = mapred_obj_error(obj, 
-						  "Missing FILE, GPFDIST, TABLE, QUERY, or EXEC");
-
-			/* set default values */
-			if (error == NO_ERROR)
-			{
-				if (!obj->u.input.columns) 
-				{
-					obj->u.input.columns = malloc(sizeof(mapred_plist_t));
-					obj->u.input.columns->name = copyscalar("value");
-					obj->u.input.columns->type = copyscalar("text");
-					obj->u.input.columns->next = NULL;
-				}
-				if (!obj->u.input.columns->next &&
-					!obj->u.input.delimiter)
-				{
-					obj->u.input.delimiter = copyscalar("off");
-				}
-			}
-			break;
-
-		case MAPRED_OUTPUT:
-
-			if (!obj->name)
-				error = mapred_obj_error(obj, "Missing NAME");
-			if (obj->u.output.type == MAPRED_OUTPUT_NONE)
-				error = mapred_obj_error(obj, "Missing FILE or TABLE");
-			break;
-
-		case MAPRED_MAPPER:
-		case MAPRED_TRANSITION:
-		case MAPRED_COMBINER:
-		case MAPRED_FINALIZER:
-
-			if (!obj->name)
-				error = mapred_obj_error(obj, "Missing NAME");
-
-			/*
-			 * We now support "builtin" functions, which are specified by a lack
-			 * of an implementation language.  If a language is specified then
-			 * a function body is still required.  If a language is not specified
-			 * then the function body just defaults to the name of the function.
-			 */
-			if (obj->name && !obj->u.function.language && !obj->u.function.body)
-				obj->u.function.body = copyscalar(obj->name);
-
-			if (obj->u.function.language && !obj->u.function.body)
-				error = mapred_obj_error(obj, "Missing FUNCTION");
-
-			/* 
-			 * LIBRARY is required for "C" language functions.
-			 * LIBRARY is invalid for any other language.
-			 *
-			 * It would be good to verify that LIBRARY is not used in
-			 * older YAML formats, but that is difficult given the current
-			 * structure of the code.
-			 */
-			if (obj->u.function.language)
-			{
-				if (obj->u.function.library)
-				{ 
-					if (strcasecmp("C", obj->u.function.language))
-					{
-						error = mapred_obj_error(obj, "LIBRARY is invalid for "
-												 "%s LANGUAGE functions",
-												 obj->u.function.language);
-					}
-				} 
-				else if (!strcasecmp("C", obj->u.function.language))
-				{
-					error = mapred_obj_error(obj, "Missing LIBRARY");
-				}
-
-				/* 
-				 * Don't bother filling in default arguments if we already have
-				 * an error.
-				 */
-				if (error)
-					break;
-
-				/*
-				 * Set default values.
-				 *   For builtin functions we delay this so that we can lookup the
-				 *   function in the catalog to determine the defaults.
-				 */
-				if (!obj->u.function.parameters)
-				{
-					const char *name = default_parameter_names[obj->kind][0];
-					name = default_parameter_names[obj->kind][0];
-					obj->u.function.parameters = malloc(sizeof(mapred_plist_t));
-					obj->u.function.parameters->type = copyscalar("text");
-					obj->u.function.parameters->name = copyscalar(name);
-					obj->u.function.parameters->next = NULL;
-
-					name = default_parameter_names[obj->kind][1];
-					if (name)
-					{
-						obj->u.function.parameters->next = malloc(sizeof(mapred_plist_t));
-						obj->u.function.parameters->next->type = copyscalar("text");
-						obj->u.function.parameters->next->name = copyscalar(name);
-						obj->u.function.parameters->next->next = NULL;						
-					}
-				}
-				else
-				{
-					switch (obj->kind)
-					{
-						case MAPRED_TRANSITION:
-							if (!obj->u.function.parameters->next)
-							{
-								error = mapred_obj_error(
-									obj, 
-									"requires at least 2 input parameters [state, arg1, ...]"
-									);
-							}
-							break;
-
-						case MAPRED_COMBINER:
-							if (!obj->u.function.parameters->next ||
-								obj->u.function.parameters->next->next)
-							{
-								error = mapred_obj_error(
-									obj, 
-									"requires exactly 2 input parameters [state1, state2]"
-									);
-							}
-							break;
-
-						case MAPRED_FINALIZER:
-							if (obj->u.function.parameters->next)
-							{
-								error = mapred_obj_error(
-									obj, 
-									"requires exactly 1 input parameter [state]"
-									);
-							}
-							break;
-
-						case MAPRED_MAPPER:
-						default:
-							break;
-					}
-				}
-
-				if (!obj->u.function.returns)
-				{
-					const char *name = default_return_names[obj->kind][0];
-					obj->u.function.returns = malloc(sizeof(mapred_plist_t));
-					obj->u.function.returns->type = copyscalar("text");
-					obj->u.function.returns->name = copyscalar(name);
-					obj->u.function.returns->next = NULL;
-
-					name = default_return_names[obj->kind][1];
-					if (name)
-					{
-						obj->u.function.returns->next = malloc(sizeof(mapred_plist_t));
-						obj->u.function.returns->next->type = copyscalar("text");
-						obj->u.function.returns->next->name = copyscalar(name);
-						obj->u.function.returns->next->next = NULL;						
-					}
-				}
-				else if (obj->kind == MAPRED_TRANSITION ||
-						 obj->kind == MAPRED_COMBINER)
-				{
-					if (obj->u.function.returns->next)
-					{
-						error = mapred_obj_error(
-							obj,
-							"requires exactly one output parameter [state]"
-							);
-					}
-				}
-
-				/* Set default mode: depends on type of function */
-				if (obj->u.function.mode == MAPRED_MODE_NONE)
-				{
-					if (obj->kind == MAPRED_TRANSITION || 
-						obj->kind == MAPRED_COMBINER)
-					{
-						obj->u.function.mode = MAPRED_MODE_SINGLE;
-					}
-					else
-					{
-						obj->u.function.mode = MAPRED_MODE_MULTI;
-					}
-				}
-			}
-			break;
-
-		case MAPRED_REDUCER:
-
-			if (!obj->name)
-				error = mapred_obj_error(obj, "Missing NAME");
-			if (!obj->u.reducer.transition.name)
-				error = mapred_obj_error(obj, "Missing TRANSITION");
-			/* 
-			 * Will verify that functions are valid for reducer input after we
-			 * have resolved the pointers.
-			 */
-
-			/*
-			 * It would be good to verify that ORDERING is not used in
-			 * older YAML formats, but that is difficult given the current
-			 * structure of the code.
-			 */
-
-			/*
-			 * ORDERING and COMBINER are incompatible 
-			 */
-			if (obj->u.reducer.ordering != NULL &&
-				obj->u.reducer.combiner.name)
-			{
-				error = mapred_obj_error(obj, 
-										 "REDUCERS cannot specify both a COMBINER "
-										 "function and an ORDERING specification");
-			}
-
-			/* Setup default "keys" */
-			if (!obj->u.reducer.keys)
-			{
-				obj->u.reducer.keys = malloc(sizeof(mapred_clist_t));
-				obj->u.reducer.keys->value = copyscalar("key");
-				obj->u.reducer.keys->next = malloc(sizeof(mapred_clist_t));				
-				obj->u.reducer.keys->next->next = NULL;
-				obj->u.reducer.keys->next->value = copyscalar("*");
-			}
-
-			break;
-
-		case MAPRED_TASK:
-			if (!obj->name)
-				error = mapred_obj_error(obj, "Missing NAME");
-
-			/* Fallthrough */
-
-		case MAPRED_EXECUTION:
-			
-			if (!obj->u.task.input.name)
-				error = mapred_obj_error(obj, "Missing SOURCE");
-			
-			/* IDENTITY Mappers and Reducers */
-			if (obj->u.task.mapper.name && 
-				!strcasecmp("IDENTITY", obj->u.task.mapper.name))
-			{
-				free(obj->u.task.mapper.name);
-				obj->u.task.mapper.name = NULL;
-			}
-			if (obj->u.task.reducer.name && 
-				!strcasecmp("IDENTITY", obj->u.task.reducer.name))
-			{
-				free(obj->u.task.reducer.name);
-				obj->u.task.reducer.name = NULL;
-			}
-
-			/* STDOUT Output */
-			if (obj->u.task.output.name && 
-				!strcasecmp("STDOUT", obj->u.task.output.name))
-			{
-				free(obj->u.task.output.name);
-				obj->u.task.output.name = NULL;
-			}
-			break;
-
-		case MAPRED_NO_KIND:
-		default:
-			XASSERT(false);
-	}
-
-	return error;
-}
-
-
-


[10/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/join.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/join.1 b/src/bin/gpmapreduce/test/expected/join.1
deleted file mode 100644
index 99706b9..0000000
--- a/src/bin/gpmapreduce/test/expected/join.1
+++ /dev/null
@@ -1,12012 +0,0 @@
-0|/|28
-0|/%22index.php|28
-0|///////|14
-0|//admin/index.php|42
-0|//administrator/components/com_remository/admin.remository.php|14
-0|//amember/plugins/payment/secpay/secpay.inc.php|14
-0|//claroline//exercice//testheaderpage.php|14
-0|//claroline/phpbb/page_tail.php|14
-0|//include/monitoring/engine/MakeXML.php|14
-0|//mambots/content/multithumb/multithumb.php|126
-0|//modules/vwar/convert/mvcw_conver.php|28
-0|//myfunctions/mygallerybrowser.php|14
-0|//nuseo/admin/nuseo_admin_d.php|14
-0|/admin/%22index.php|28
-0|/admin///////|14
-0|/admin//admin/index.php|42
-0|/admin//administrator/components/com_remository/admin.remository.php|14
-0|/admin//amember/plugins/payment/secpay/secpay.inc.php|14
-0|/admin//claroline//exercice//testheaderpage.php|14
-0|/admin//claroline/phpbb/page_tail.php|14
-0|/admin//include/monitoring/engine/MakeXML.php|14
-0|/admin//mambots/content/multithumb/multithumb.php|126
-0|/admin//modules/vwar/convert/mvcw_conver.php|28
-0|/admin//myfunctions/mygallerybrowser.php|14
-0|/admin//nuseo/admin/nuseo_admin_d.php|14
-0|/admin/access_log/%22index.php|14
-0|/admin/access_log/components/com_hashcash/server.php|28
-0|/admin/access_log/convert/mvcw.php|56
-0|/admin/access_log/index.php|238
-0|/admin/components/com_hashcash/server.php|28
-0|/admin/convert/mvcw.php|70
-0|/admin/index.php|420
-0|/admin/index2.php|14
-0|/admin/modules/vwar/convert/mvcw_conver.php|14
-0|/components/com_hashcash/server.php|28
-0|/convert/mvcw.php|70
-0|/index.php|448
-0|/index2.php|14
-0|/modules/vwar/convert/mvcw_conver.php|28
-1|/|8
-1|/%22index.php|8
-1|///////|4
-1|//admin/index.php|12
-1|//administrator/components/com_remository/admin.remository.php|4
-1|//amember/plugins/payment/secpay/secpay.inc.php|4
-1|//claroline//exercice//testheaderpage.php|4
-1|//claroline/phpbb/page_tail.php|4
-1|//include/monitoring/engine/MakeXML.php|4
-1|//mambots/content/multithumb/multithumb.php|36
-1|//modules/vwar/convert/mvcw_conver.php|8
-1|//myfunctions/mygallerybrowser.php|4
-1|//nuseo/admin/nuseo_admin_d.php|4
-1|/admin/%22index.php|8
-1|/admin///////|4
-1|/admin//admin/index.php|12
-1|/admin//administrator/components/com_remository/admin.remository.php|4
-1|/admin//amember/plugins/payment/secpay/secpay.inc.php|4
-1|/admin//claroline//exercice//testheaderpage.php|4
-1|/admin//claroline/phpbb/page_tail.php|4
-1|/admin//include/monitoring/engine/MakeXML.php|4
-1|/admin//mambots/content/multithumb/multithumb.php|36
-1|/admin//modules/vwar/convert/mvcw_conver.php|8
-1|/admin//myfunctions/mygallerybrowser.php|4
-1|/admin//nuseo/admin/nuseo_admin_d.php|4
-1|/admin/access_log/%22index.php|4
-1|/admin/access_log/components/com_hashcash/server.php|8
-1|/admin/access_log/convert/mvcw.php|16
-1|/admin/access_log/index.php|68
-1|/admin/components/com_hashcash/server.php|8
-1|/admin/convert/mvcw.php|20
-1|/admin/index.php|120
-1|/admin/index2.php|4
-1|/admin/modules/vwar/convert/mvcw_conver.php|4
-1|/components/com_hashcash/server.php|8
-1|/convert/mvcw.php|20
-1|/index.php|128
-1|/index2.php|4
-1|/modules/vwar/convert/mvcw_conver.php|8
-2|/|2
-2|/%22index.php|2
-2|///////|1
-2|//admin/index.php|3
-2|//administrator/components/com_remository/admin.remository.php|1
-2|//amember/plugins/payment/secpay/secpay.inc.php|1
-2|//claroline//exercice//testheaderpage.php|1
-2|//claroline/phpbb/page_tail.php|1
-2|//include/monitoring/engine/MakeXML.php|1
-2|//mambots/content/multithumb/multithumb.php|9
-2|//modules/vwar/convert/mvcw_conver.php|2
-2|//myfunctions/mygallerybrowser.php|1
-2|//nuseo/admin/nuseo_admin_d.php|1
-2|/admin/%22index.php|2
-2|/admin///////|1
-2|/admin//admin/index.php|3
-2|/admin//administrator/components/com_remository/admin.remository.php|1
-2|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-2|/admin//claroline//exercice//testheaderpage.php|1
-2|/admin//claroline/phpbb/page_tail.php|1
-2|/admin//include/monitoring/engine/MakeXML.php|1
-2|/admin//mambots/content/multithumb/multithumb.php|9
-2|/admin//modules/vwar/convert/mvcw_conver.php|2
-2|/admin//myfunctions/mygallerybrowser.php|1
-2|/admin//nuseo/admin/nuseo_admin_d.php|1
-2|/admin/access_log/%22index.php|1
-2|/admin/access_log/components/com_hashcash/server.php|2
-2|/admin/access_log/convert/mvcw.php|4
-2|/admin/access_log/index.php|17
-2|/admin/components/com_hashcash/server.php|2
-2|/admin/convert/mvcw.php|5
-2|/admin/index.php|30
-2|/admin/index2.php|1
-2|/admin/modules/vwar/convert/mvcw_conver.php|1
-2|/components/com_hashcash/server.php|2
-2|/convert/mvcw.php|5
-2|/index.php|32
-2|/index2.php|1
-2|/modules/vwar/convert/mvcw_conver.php|2
-3|/|4
-3|/%22index.php|4
-3|///////|2
-3|//admin/index.php|6
-3|//administrator/components/com_remository/admin.remository.php|2
-3|//amember/plugins/payment/secpay/secpay.inc.php|2
-3|//claroline//exercice//testheaderpage.php|2
-3|//claroline/phpbb/page_tail.php|2
-3|//include/monitoring/engine/MakeXML.php|2
-3|//mambots/content/multithumb/multithumb.php|18
-3|//modules/vwar/convert/mvcw_conver.php|4
-3|//myfunctions/mygallerybrowser.php|2
-3|//nuseo/admin/nuseo_admin_d.php|2
-3|/admin/%22index.php|4
-3|/admin///////|2
-3|/admin//admin/index.php|6
-3|/admin//administrator/components/com_remository/admin.remository.php|2
-3|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-3|/admin//claroline//exercice//testheaderpage.php|2
-3|/admin//claroline/phpbb/page_tail.php|2
-3|/admin//include/monitoring/engine/MakeXML.php|2
-3|/admin//mambots/content/multithumb/multithumb.php|18
-3|/admin//modules/vwar/convert/mvcw_conver.php|4
-3|/admin//myfunctions/mygallerybrowser.php|2
-3|/admin//nuseo/admin/nuseo_admin_d.php|2
-3|/admin/access_log/%22index.php|2
-3|/admin/access_log/components/com_hashcash/server.php|4
-3|/admin/access_log/convert/mvcw.php|8
-3|/admin/access_log/index.php|34
-3|/admin/components/com_hashcash/server.php|4
-3|/admin/convert/mvcw.php|10
-3|/admin/index.php|60
-3|/admin/index2.php|2
-3|/admin/modules/vwar/convert/mvcw_conver.php|2
-3|/components/com_hashcash/server.php|4
-3|/convert/mvcw.php|10
-3|/index.php|64
-3|/index2.php|2
-3|/modules/vwar/convert/mvcw_conver.php|4
-4|/|6
-4|/%22index.php|6
-4|///////|3
-4|//admin/index.php|9
-4|//administrator/components/com_remository/admin.remository.php|3
-4|//amember/plugins/payment/secpay/secpay.inc.php|3
-4|//claroline//exercice//testheaderpage.php|3
-4|//claroline/phpbb/page_tail.php|3
-4|//include/monitoring/engine/MakeXML.php|3
-4|//mambots/content/multithumb/multithumb.php|27
-4|//modules/vwar/convert/mvcw_conver.php|6
-4|//myfunctions/mygallerybrowser.php|3
-4|//nuseo/admin/nuseo_admin_d.php|3
-4|/admin/%22index.php|6
-4|/admin///////|3
-4|/admin//admin/index.php|9
-4|/admin//administrator/components/com_remository/admin.remository.php|3
-4|/admin//amember/plugins/payment/secpay/secpay.inc.php|3
-4|/admin//claroline//exercice//testheaderpage.php|3
-4|/admin//claroline/phpbb/page_tail.php|3
-4|/admin//include/monitoring/engine/MakeXML.php|3
-4|/admin//mambots/content/multithumb/multithumb.php|27
-4|/admin//modules/vwar/convert/mvcw_conver.php|6
-4|/admin//myfunctions/mygallerybrowser.php|3
-4|/admin//nuseo/admin/nuseo_admin_d.php|3
-4|/admin/access_log/%22index.php|3
-4|/admin/access_log/components/com_hashcash/server.php|6
-4|/admin/access_log/convert/mvcw.php|12
-4|/admin/access_log/index.php|51
-4|/admin/components/com_hashcash/server.php|6
-4|/admin/convert/mvcw.php|15
-4|/admin/index.php|90
-4|/admin/index2.php|3
-4|/admin/modules/vwar/convert/mvcw_conver.php|3
-4|/components/com_hashcash/server.php|6
-4|/convert/mvcw.php|15
-4|/index.php|96
-4|/index2.php|3
-4|/modules/vwar/convert/mvcw_conver.php|6
-5|/|2
-5|/%22index.php|2
-5|///////|1
-5|//admin/index.php|3
-5|//administrator/components/com_remository/admin.remository.php|1
-5|//amember/plugins/payment/secpay/secpay.inc.php|1
-5|//claroline//exercice//testheaderpage.php|1
-5|//claroline/phpbb/page_tail.php|1
-5|//include/monitoring/engine/MakeXML.php|1
-5|//mambots/content/multithumb/multithumb.php|9
-5|//modules/vwar/convert/mvcw_conver.php|2
-5|//myfunctions/mygallerybrowser.php|1
-5|//nuseo/admin/nuseo_admin_d.php|1
-5|/admin/%22index.php|2
-5|/admin///////|1
-5|/admin//admin/index.php|3
-5|/admin//administrator/components/com_remository/admin.remository.php|1
-5|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-5|/admin//claroline//exercice//testheaderpage.php|1
-5|/admin//claroline/phpbb/page_tail.php|1
-5|/admin//include/monitoring/engine/MakeXML.php|1
-5|/admin//mambots/content/multithumb/multithumb.php|9
-5|/admin//modules/vwar/convert/mvcw_conver.php|2
-5|/admin//myfunctions/mygallerybrowser.php|1
-5|/admin//nuseo/admin/nuseo_admin_d.php|1
-5|/admin/access_log/%22index.php|1
-5|/admin/access_log/components/com_hashcash/server.php|2
-5|/admin/access_log/convert/mvcw.php|4
-5|/admin/access_log/index.php|17
-5|/admin/components/com_hashcash/server.php|2
-5|/admin/convert/mvcw.php|5
-5|/admin/index.php|30
-5|/admin/index2.php|1
-5|/admin/modules/vwar/convert/mvcw_conver.php|1
-5|/components/com_hashcash/server.php|2
-5|/convert/mvcw.php|5
-5|/index.php|32
-5|/index2.php|1
-5|/modules/vwar/convert/mvcw_conver.php|2
-6|/|8
-6|/%22index.php|8
-6|///////|4
-6|//admin/index.php|12
-6|//administrator/components/com_remository/admin.remository.php|4
-6|//amember/plugins/payment/secpay/secpay.inc.php|4
-6|//claroline//exercice//testheaderpage.php|4
-6|//claroline/phpbb/page_tail.php|4
-6|//include/monitoring/engine/MakeXML.php|4
-6|//mambots/content/multithumb/multithumb.php|36
-6|//modules/vwar/convert/mvcw_conver.php|8
-6|//myfunctions/mygallerybrowser.php|4
-6|//nuseo/admin/nuseo_admin_d.php|4
-6|/admin/%22index.php|8
-6|/admin///////|4
-6|/admin//admin/index.php|12
-6|/admin//administrator/components/com_remository/admin.remository.php|4
-6|/admin//amember/plugins/payment/secpay/secpay.inc.php|4
-6|/admin//claroline//exercice//testheaderpage.php|4
-6|/admin//claroline/phpbb/page_tail.php|4
-6|/admin//include/monitoring/engine/MakeXML.php|4
-6|/admin//mambots/content/multithumb/multithumb.php|36
-6|/admin//modules/vwar/convert/mvcw_conver.php|8
-6|/admin//myfunctions/mygallerybrowser.php|4
-6|/admin//nuseo/admin/nuseo_admin_d.php|4
-6|/admin/access_log/%22index.php|4
-6|/admin/access_log/components/com_hashcash/server.php|8
-6|/admin/access_log/convert/mvcw.php|16
-6|/admin/access_log/index.php|68
-6|/admin/components/com_hashcash/server.php|8
-6|/admin/convert/mvcw.php|20
-6|/admin/index.php|120
-6|/admin/index2.php|4
-6|/admin/modules/vwar/convert/mvcw_conver.php|4
-6|/components/com_hashcash/server.php|8
-6|/convert/mvcw.php|20
-6|/index.php|128
-6|/index2.php|4
-6|/modules/vwar/convert/mvcw_conver.php|8
-7|/|4
-7|/%22index.php|4
-7|///////|2
-7|//admin/index.php|6
-7|//administrator/components/com_remository/admin.remository.php|2
-7|//amember/plugins/payment/secpay/secpay.inc.php|2
-7|//claroline//exercice//testheaderpage.php|2
-7|//claroline/phpbb/page_tail.php|2
-7|//include/monitoring/engine/MakeXML.php|2
-7|//mambots/content/multithumb/multithumb.php|18
-7|//modules/vwar/convert/mvcw_conver.php|4
-7|//myfunctions/mygallerybrowser.php|2
-7|//nuseo/admin/nuseo_admin_d.php|2
-7|/admin/%22index.php|4
-7|/admin///////|2
-7|/admin//admin/index.php|6
-7|/admin//administrator/components/com_remository/admin.remository.php|2
-7|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-7|/admin//claroline//exercice//testheaderpage.php|2
-7|/admin//claroline/phpbb/page_tail.php|2
-7|/admin//include/monitoring/engine/MakeXML.php|2
-7|/admin//mambots/content/multithumb/multithumb.php|18
-7|/admin//modules/vwar/convert/mvcw_conver.php|4
-7|/admin//myfunctions/mygallerybrowser.php|2
-7|/admin//nuseo/admin/nuseo_admin_d.php|2
-7|/admin/access_log/%22index.php|2
-7|/admin/access_log/components/com_hashcash/server.php|4
-7|/admin/access_log/convert/mvcw.php|8
-7|/admin/access_log/index.php|34
-7|/admin/components/com_hashcash/server.php|4
-7|/admin/convert/mvcw.php|10
-7|/admin/index.php|60
-7|/admin/index2.php|2
-7|/admin/modules/vwar/convert/mvcw_conver.php|2
-7|/components/com_hashcash/server.php|4
-7|/convert/mvcw.php|10
-7|/index.php|64
-7|/index2.php|2
-7|/modules/vwar/convert/mvcw_conver.php|4
-8|/|4
-8|/%22index.php|4
-8|///////|2
-8|//admin/index.php|6
-8|//administrator/components/com_remository/admin.remository.php|2
-8|//amember/plugins/payment/secpay/secpay.inc.php|2
-8|//claroline//exercice//testheaderpage.php|2
-8|//claroline/phpbb/page_tail.php|2
-8|//include/monitoring/engine/MakeXML.php|2
-8|//mambots/content/multithumb/multithumb.php|18
-8|//modules/vwar/convert/mvcw_conver.php|4
-8|//myfunctions/mygallerybrowser.php|2
-8|//nuseo/admin/nuseo_admin_d.php|2
-8|/admin/%22index.php|4
-8|/admin///////|2
-8|/admin//admin/index.php|6
-8|/admin//administrator/components/com_remository/admin.remository.php|2
-8|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-8|/admin//claroline//exercice//testheaderpage.php|2
-8|/admin//claroline/phpbb/page_tail.php|2
-8|/admin//include/monitoring/engine/MakeXML.php|2
-8|/admin//mambots/content/multithumb/multithumb.php|18
-8|/admin//modules/vwar/convert/mvcw_conver.php|4
-8|/admin//myfunctions/mygallerybrowser.php|2
-8|/admin//nuseo/admin/nuseo_admin_d.php|2
-8|/admin/access_log/%22index.php|2
-8|/admin/access_log/components/com_hashcash/server.php|4
-8|/admin/access_log/convert/mvcw.php|8
-8|/admin/access_log/index.php|34
-8|/admin/components/com_hashcash/server.php|4
-8|/admin/convert/mvcw.php|10
-8|/admin/index.php|60
-8|/admin/index2.php|2
-8|/admin/modules/vwar/convert/mvcw_conver.php|2
-8|/components/com_hashcash/server.php|4
-8|/convert/mvcw.php|10
-8|/index.php|64
-8|/index2.php|2
-8|/modules/vwar/convert/mvcw_conver.php|4
-9|/|6
-9|/%22index.php|6
-9|///////|3
-9|//admin/index.php|9
-9|//administrator/components/com_remository/admin.remository.php|3
-9|//amember/plugins/payment/secpay/secpay.inc.php|3
-9|//claroline//exercice//testheaderpage.php|3
-9|//claroline/phpbb/page_tail.php|3
-9|//include/monitoring/engine/MakeXML.php|3
-9|//mambots/content/multithumb/multithumb.php|27
-9|//modules/vwar/convert/mvcw_conver.php|6
-9|//myfunctions/mygallerybrowser.php|3
-9|//nuseo/admin/nuseo_admin_d.php|3
-9|/admin/%22index.php|6
-9|/admin///////|3
-9|/admin//admin/index.php|9
-9|/admin//administrator/components/com_remository/admin.remository.php|3
-9|/admin//amember/plugins/payment/secpay/secpay.inc.php|3
-9|/admin//claroline//exercice//testheaderpage.php|3
-9|/admin//claroline/phpbb/page_tail.php|3
-9|/admin//include/monitoring/engine/MakeXML.php|3
-9|/admin//mambots/content/multithumb/multithumb.php|27
-9|/admin//modules/vwar/convert/mvcw_conver.php|6
-9|/admin//myfunctions/mygallerybrowser.php|3
-9|/admin//nuseo/admin/nuseo_admin_d.php|3
-9|/admin/access_log/%22index.php|3
-9|/admin/access_log/components/com_hashcash/server.php|6
-9|/admin/access_log/convert/mvcw.php|12
-9|/admin/access_log/index.php|51
-9|/admin/components/com_hashcash/server.php|6
-9|/admin/convert/mvcw.php|15
-9|/admin/index.php|90
-9|/admin/index2.php|3
-9|/admin/modules/vwar/convert/mvcw_conver.php|3
-9|/components/com_hashcash/server.php|6
-9|/convert/mvcw.php|15
-9|/index.php|96
-9|/index2.php|3
-9|/modules/vwar/convert/mvcw_conver.php|6
-10|/|2
-10|/%22index.php|2
-10|///////|1
-10|//admin/index.php|3
-10|//administrator/components/com_remository/admin.remository.php|1
-10|//amember/plugins/payment/secpay/secpay.inc.php|1
-10|//claroline//exercice//testheaderpage.php|1
-10|//claroline/phpbb/page_tail.php|1
-10|//include/monitoring/engine/MakeXML.php|1
-10|//mambots/content/multithumb/multithumb.php|9
-10|//modules/vwar/convert/mvcw_conver.php|2
-10|//myfunctions/mygallerybrowser.php|1
-10|//nuseo/admin/nuseo_admin_d.php|1
-10|/admin/%22index.php|2
-10|/admin///////|1
-10|/admin//admin/index.php|3
-10|/admin//administrator/components/com_remository/admin.remository.php|1
-10|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-10|/admin//claroline//exercice//testheaderpage.php|1
-10|/admin//claroline/phpbb/page_tail.php|1
-10|/admin//include/monitoring/engine/MakeXML.php|1
-10|/admin//mambots/content/multithumb/multithumb.php|9
-10|/admin//modules/vwar/convert/mvcw_conver.php|2
-10|/admin//myfunctions/mygallerybrowser.php|1
-10|/admin//nuseo/admin/nuseo_admin_d.php|1
-10|/admin/access_log/%22index.php|1
-10|/admin/access_log/components/com_hashcash/server.php|2
-10|/admin/access_log/convert/mvcw.php|4
-10|/admin/access_log/index.php|17
-10|/admin/components/com_hashcash/server.php|2
-10|/admin/convert/mvcw.php|5
-10|/admin/index.php|30
-10|/admin/index2.php|1
-10|/admin/modules/vwar/convert/mvcw_conver.php|1
-10|/components/com_hashcash/server.php|2
-10|/convert/mvcw.php|5
-10|/index.php|32
-10|/index2.php|1
-10|/modules/vwar/convert/mvcw_conver.php|2
-11|/|4
-11|/%22index.php|4
-11|///////|2
-11|//admin/index.php|6
-11|//administrator/components/com_remository/admin.remository.php|2
-11|//amember/plugins/payment/secpay/secpay.inc.php|2
-11|//claroline//exercice//testheaderpage.php|2
-11|//claroline/phpbb/page_tail.php|2
-11|//include/monitoring/engine/MakeXML.php|2
-11|//mambots/content/multithumb/multithumb.php|18
-11|//modules/vwar/convert/mvcw_conver.php|4
-11|//myfunctions/mygallerybrowser.php|2
-11|//nuseo/admin/nuseo_admin_d.php|2
-11|/admin/%22index.php|4
-11|/admin///////|2
-11|/admin//admin/index.php|6
-11|/admin//administrator/components/com_remository/admin.remository.php|2
-11|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-11|/admin//claroline//exercice//testheaderpage.php|2
-11|/admin//claroline/phpbb/page_tail.php|2
-11|/admin//include/monitoring/engine/MakeXML.php|2
-11|/admin//mambots/content/multithumb/multithumb.php|18
-11|/admin//modules/vwar/convert/mvcw_conver.php|4
-11|/admin//myfunctions/mygallerybrowser.php|2
-11|/admin//nuseo/admin/nuseo_admin_d.php|2
-11|/admin/access_log/%22index.php|2
-11|/admin/access_log/components/com_hashcash/server.php|4
-11|/admin/access_log/convert/mvcw.php|8
-11|/admin/access_log/index.php|34
-11|/admin/components/com_hashcash/server.php|4
-11|/admin/convert/mvcw.php|10
-11|/admin/index.php|60
-11|/admin/index2.php|2
-11|/admin/modules/vwar/convert/mvcw_conver.php|2
-11|/components/com_hashcash/server.php|4
-11|/convert/mvcw.php|10
-11|/index.php|64
-11|/index2.php|2
-11|/modules/vwar/convert/mvcw_conver.php|4
-12|/|4
-12|/%22index.php|4
-12|///////|2
-12|//admin/index.php|6
-12|//administrator/components/com_remository/admin.remository.php|2
-12|//amember/plugins/payment/secpay/secpay.inc.php|2
-12|//claroline//exercice//testheaderpage.php|2
-12|//claroline/phpbb/page_tail.php|2
-12|//include/monitoring/engine/MakeXML.php|2
-12|//mambots/content/multithumb/multithumb.php|18
-12|//modules/vwar/convert/mvcw_conver.php|4
-12|//myfunctions/mygallerybrowser.php|2
-12|//nuseo/admin/nuseo_admin_d.php|2
-12|/admin/%22index.php|4
-12|/admin///////|2
-12|/admin//admin/index.php|6
-12|/admin//administrator/components/com_remository/admin.remository.php|2
-12|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-12|/admin//claroline//exercice//testheaderpage.php|2
-12|/admin//claroline/phpbb/page_tail.php|2
-12|/admin//include/monitoring/engine/MakeXML.php|2
-12|/admin//mambots/content/multithumb/multithumb.php|18
-12|/admin//modules/vwar/convert/mvcw_conver.php|4
-12|/admin//myfunctions/mygallerybrowser.php|2
-12|/admin//nuseo/admin/nuseo_admin_d.php|2
-12|/admin/access_log/%22index.php|2
-12|/admin/access_log/components/com_hashcash/server.php|4
-12|/admin/access_log/convert/mvcw.php|8
-12|/admin/access_log/index.php|34
-12|/admin/components/com_hashcash/server.php|4
-12|/admin/convert/mvcw.php|10
-12|/admin/index.php|60
-12|/admin/index2.php|2
-12|/admin/modules/vwar/convert/mvcw_conver.php|2
-12|/components/com_hashcash/server.php|4
-12|/convert/mvcw.php|10
-12|/index.php|64
-12|/index2.php|2
-12|/modules/vwar/convert/mvcw_conver.php|4
-13|/|2
-13|/%22index.php|2
-13|///////|1
-13|//admin/index.php|3
-13|//administrator/components/com_remository/admin.remository.php|1
-13|//amember/plugins/payment/secpay/secpay.inc.php|1
-13|//claroline//exercice//testheaderpage.php|1
-13|//claroline/phpbb/page_tail.php|1
-13|//include/monitoring/engine/MakeXML.php|1
-13|//mambots/content/multithumb/multithumb.php|9
-13|//modules/vwar/convert/mvcw_conver.php|2
-13|//myfunctions/mygallerybrowser.php|1
-13|//nuseo/admin/nuseo_admin_d.php|1
-13|/admin/%22index.php|2
-13|/admin///////|1
-13|/admin//admin/index.php|3
-13|/admin//administrator/components/com_remository/admin.remository.php|1
-13|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-13|/admin//claroline//exercice//testheaderpage.php|1
-13|/admin//claroline/phpbb/page_tail.php|1
-13|/admin//include/monitoring/engine/MakeXML.php|1
-13|/admin//mambots/content/multithumb/multithumb.php|9
-13|/admin//modules/vwar/convert/mvcw_conver.php|2
-13|/admin//myfunctions/mygallerybrowser.php|1
-13|/admin//nuseo/admin/nuseo_admin_d.php|1
-13|/admin/access_log/%22index.php|1
-13|/admin/access_log/components/com_hashcash/server.php|2
-13|/admin/access_log/convert/mvcw.php|4
-13|/admin/access_log/index.php|17
-13|/admin/components/com_hashcash/server.php|2
-13|/admin/convert/mvcw.php|5
-13|/admin/index.php|30
-13|/admin/index2.php|1
-13|/admin/modules/vwar/convert/mvcw_conver.php|1
-13|/components/com_hashcash/server.php|2
-13|/convert/mvcw.php|5
-13|/index.php|32
-13|/index2.php|1
-13|/modules/vwar/convert/mvcw_conver.php|2
-14|/|18
-14|/%22index.php|18
-14|///////|9
-14|//admin/index.php|27
-14|//administrator/components/com_remository/admin.remository.php|9
-14|//amember/plugins/payment/secpay/secpay.inc.php|9
-14|//claroline//exercice//testheaderpage.php|9
-14|//claroline/phpbb/page_tail.php|9
-14|//include/monitoring/engine/MakeXML.php|9
-14|//mambots/content/multithumb/multithumb.php|81
-14|//modules/vwar/convert/mvcw_conver.php|18
-14|//myfunctions/mygallerybrowser.php|9
-14|//nuseo/admin/nuseo_admin_d.php|9
-14|/admin/%22index.php|18
-14|/admin///////|9
-14|/admin//admin/index.php|27
-14|/admin//administrator/components/com_remository/admin.remository.php|9
-14|/admin//amember/plugins/payment/secpay/secpay.inc.php|9
-14|/admin//claroline//exercice//testheaderpage.php|9
-14|/admin//claroline/phpbb/page_tail.php|9
-14|/admin//include/monitoring/engine/MakeXML.php|9
-14|/admin//mambots/content/multithumb/multithumb.php|81
-14|/admin//modules/vwar/convert/mvcw_conver.php|18
-14|/admin//myfunctions/mygallerybrowser.php|9
-14|/admin//nuseo/admin/nuseo_admin_d.php|9
-14|/admin/access_log/%22index.php|9
-14|/admin/access_log/components/com_hashcash/server.php|18
-14|/admin/access_log/convert/mvcw.php|36
-14|/admin/access_log/index.php|153
-14|/admin/components/com_hashcash/server.php|18
-14|/admin/convert/mvcw.php|45
-14|/admin/index.php|270
-14|/admin/index2.php|9
-14|/admin/modules/vwar/convert/mvcw_conver.php|9
-14|/components/com_hashcash/server.php|18
-14|/convert/mvcw.php|45
-14|/index.php|288
-14|/index2.php|9
-14|/modules/vwar/convert/mvcw_conver.php|18
-15|/|4
-15|/%22index.php|4
-15|///////|2
-15|//admin/index.php|6
-15|//administrator/components/com_remository/admin.remository.php|2
-15|//amember/plugins/payment/secpay/secpay.inc.php|2
-15|//claroline//exercice//testheaderpage.php|2
-15|//claroline/phpbb/page_tail.php|2
-15|//include/monitoring/engine/MakeXML.php|2
-15|//mambots/content/multithumb/multithumb.php|18
-15|//modules/vwar/convert/mvcw_conver.php|4
-15|//myfunctions/mygallerybrowser.php|2
-15|//nuseo/admin/nuseo_admin_d.php|2
-15|/admin/%22index.php|4
-15|/admin///////|2
-15|/admin//admin/index.php|6
-15|/admin//administrator/components/com_remository/admin.remository.php|2
-15|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-15|/admin//claroline//exercice//testheaderpage.php|2
-15|/admin//claroline/phpbb/page_tail.php|2
-15|/admin//include/monitoring/engine/MakeXML.php|2
-15|/admin//mambots/content/multithumb/multithumb.php|18
-15|/admin//modules/vwar/convert/mvcw_conver.php|4
-15|/admin//myfunctions/mygallerybrowser.php|2
-15|/admin//nuseo/admin/nuseo_admin_d.php|2
-15|/admin/access_log/%22index.php|2
-15|/admin/access_log/components/com_hashcash/server.php|4
-15|/admin/access_log/convert/mvcw.php|8
-15|/admin/access_log/index.php|34
-15|/admin/components/com_hashcash/server.php|4
-15|/admin/convert/mvcw.php|10
-15|/admin/index.php|60
-15|/admin/index2.php|2
-15|/admin/modules/vwar/convert/mvcw_conver.php|2
-15|/components/com_hashcash/server.php|4
-15|/convert/mvcw.php|10
-15|/index.php|64
-15|/index2.php|2
-15|/modules/vwar/convert/mvcw_conver.php|4
-16|/|4
-16|/%22index.php|4
-16|///////|2
-16|//admin/index.php|6
-16|//administrator/components/com_remository/admin.remository.php|2
-16|//amember/plugins/payment/secpay/secpay.inc.php|2
-16|//claroline//exercice//testheaderpage.php|2
-16|//claroline/phpbb/page_tail.php|2
-16|//include/monitoring/engine/MakeXML.php|2
-16|//mambots/content/multithumb/multithumb.php|18
-16|//modules/vwar/convert/mvcw_conver.php|4
-16|//myfunctions/mygallerybrowser.php|2
-16|//nuseo/admin/nuseo_admin_d.php|2
-16|/admin/%22index.php|4
-16|/admin///////|2
-16|/admin//admin/index.php|6
-16|/admin//administrator/components/com_remository/admin.remository.php|2
-16|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-16|/admin//claroline//exercice//testheaderpage.php|2
-16|/admin//claroline/phpbb/page_tail.php|2
-16|/admin//include/monitoring/engine/MakeXML.php|2
-16|/admin//mambots/content/multithumb/multithumb.php|18
-16|/admin//modules/vwar/convert/mvcw_conver.php|4
-16|/admin//myfunctions/mygallerybrowser.php|2
-16|/admin//nuseo/admin/nuseo_admin_d.php|2
-16|/admin/access_log/%22index.php|2
-16|/admin/access_log/components/com_hashcash/server.php|4
-16|/admin/access_log/convert/mvcw.php|8
-16|/admin/access_log/index.php|34
-16|/admin/components/com_hashcash/server.php|4
-16|/admin/convert/mvcw.php|10
-16|/admin/index.php|60
-16|/admin/index2.php|2
-16|/admin/modules/vwar/convert/mvcw_conver.php|2
-16|/components/com_hashcash/server.php|4
-16|/convert/mvcw.php|10
-16|/index.php|64
-16|/index2.php|2
-16|/modules/vwar/convert/mvcw_conver.php|4
-17|/|6
-17|/%22index.php|6
-17|///////|3
-17|//admin/index.php|9
-17|//administrator/components/com_remository/admin.remository.php|3
-17|//amember/plugins/payment/secpay/secpay.inc.php|3
-17|//claroline//exercice//testheaderpage.php|3
-17|//claroline/phpbb/page_tail.php|3
-17|//include/monitoring/engine/MakeXML.php|3
-17|//mambots/content/multithumb/multithumb.php|27
-17|//modules/vwar/convert/mvcw_conver.php|6
-17|//myfunctions/mygallerybrowser.php|3
-17|//nuseo/admin/nuseo_admin_d.php|3
-17|/admin/%22index.php|6
-17|/admin///////|3
-17|/admin//admin/index.php|9
-17|/admin//administrator/components/com_remository/admin.remository.php|3
-17|/admin//amember/plugins/payment/secpay/secpay.inc.php|3
-17|/admin//claroline//exercice//testheaderpage.php|3
-17|/admin//claroline/phpbb/page_tail.php|3
-17|/admin//include/monitoring/engine/MakeXML.php|3
-17|/admin//mambots/content/multithumb/multithumb.php|27
-17|/admin//modules/vwar/convert/mvcw_conver.php|6
-17|/admin//myfunctions/mygallerybrowser.php|3
-17|/admin//nuseo/admin/nuseo_admin_d.php|3
-17|/admin/access_log/%22index.php|3
-17|/admin/access_log/components/com_hashcash/server.php|6
-17|/admin/access_log/convert/mvcw.php|12
-17|/admin/access_log/index.php|51
-17|/admin/components/com_hashcash/server.php|6
-17|/admin/convert/mvcw.php|15
-17|/admin/index.php|90
-17|/admin/index2.php|3
-17|/admin/modules/vwar/convert/mvcw_conver.php|3
-17|/components/com_hashcash/server.php|6
-17|/convert/mvcw.php|15
-17|/index.php|96
-17|/index2.php|3
-17|/modules/vwar/convert/mvcw_conver.php|6
-18|/|2
-18|/%22index.php|2
-18|///////|1
-18|//admin/index.php|3
-18|//administrator/components/com_remository/admin.remository.php|1
-18|//amember/plugins/payment/secpay/secpay.inc.php|1
-18|//claroline//exercice//testheaderpage.php|1
-18|//claroline/phpbb/page_tail.php|1
-18|//include/monitoring/engine/MakeXML.php|1
-18|//mambots/content/multithumb/multithumb.php|9
-18|//modules/vwar/convert/mvcw_conver.php|2
-18|//myfunctions/mygallerybrowser.php|1
-18|//nuseo/admin/nuseo_admin_d.php|1
-18|/admin/%22index.php|2
-18|/admin///////|1
-18|/admin//admin/index.php|3
-18|/admin//administrator/components/com_remository/admin.remository.php|1
-18|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-18|/admin//claroline//exercice//testheaderpage.php|1
-18|/admin//claroline/phpbb/page_tail.php|1
-18|/admin//include/monitoring/engine/MakeXML.php|1
-18|/admin//mambots/content/multithumb/multithumb.php|9
-18|/admin//modules/vwar/convert/mvcw_conver.php|2
-18|/admin//myfunctions/mygallerybrowser.php|1
-18|/admin//nuseo/admin/nuseo_admin_d.php|1
-18|/admin/access_log/%22index.php|1
-18|/admin/access_log/components/com_hashcash/server.php|2
-18|/admin/access_log/convert/mvcw.php|4
-18|/admin/access_log/index.php|17
-18|/admin/components/com_hashcash/server.php|2
-18|/admin/convert/mvcw.php|5
-18|/admin/index.php|30
-18|/admin/index2.php|1
-18|/admin/modules/vwar/convert/mvcw_conver.php|1
-18|/components/com_hashcash/server.php|2
-18|/convert/mvcw.php|5
-18|/index.php|32
-18|/index2.php|1
-18|/modules/vwar/convert/mvcw_conver.php|2
-19|/|6
-19|/%22index.php|6
-19|///////|3
-19|//admin/index.php|9
-19|//administrator/components/com_remository/admin.remository.php|3
-19|//amember/plugins/payment/secpay/secpay.inc.php|3
-19|//claroline//exercice//testheaderpage.php|3
-19|//claroline/phpbb/page_tail.php|3
-19|//include/monitoring/engine/MakeXML.php|3
-19|//mambots/content/multithumb/multithumb.php|27
-19|//modules/vwar/convert/mvcw_conver.php|6
-19|//myfunctions/mygallerybrowser.php|3
-19|//nuseo/admin/nuseo_admin_d.php|3
-19|/admin/%22index.php|6
-19|/admin///////|3
-19|/admin//admin/index.php|9
-19|/admin//administrator/components/com_remository/admin.remository.php|3
-19|/admin//amember/plugins/payment/secpay/secpay.inc.php|3
-19|/admin//claroline//exercice//testheaderpage.php|3
-19|/admin//claroline/phpbb/page_tail.php|3
-19|/admin//include/monitoring/engine/MakeXML.php|3
-19|/admin//mambots/content/multithumb/multithumb.php|27
-19|/admin//modules/vwar/convert/mvcw_conver.php|6
-19|/admin//myfunctions/mygallerybrowser.php|3
-19|/admin//nuseo/admin/nuseo_admin_d.php|3
-19|/admin/access_log/%22index.php|3
-19|/admin/access_log/components/com_hashcash/server.php|6
-19|/admin/access_log/convert/mvcw.php|12
-19|/admin/access_log/index.php|51
-19|/admin/components/com_hashcash/server.php|6
-19|/admin/convert/mvcw.php|15
-19|/admin/index.php|90
-19|/admin/index2.php|3
-19|/admin/modules/vwar/convert/mvcw_conver.php|3
-19|/components/com_hashcash/server.php|6
-19|/convert/mvcw.php|15
-19|/index.php|96
-19|/index2.php|3
-19|/modules/vwar/convert/mvcw_conver.php|6
-20|/|6
-20|/%22index.php|6
-20|///////|3
-20|//admin/index.php|9
-20|//administrator/components/com_remository/admin.remository.php|3
-20|//amember/plugins/payment/secpay/secpay.inc.php|3
-20|//claroline//exercice//testheaderpage.php|3
-20|//claroline/phpbb/page_tail.php|3
-20|//include/monitoring/engine/MakeXML.php|3
-20|//mambots/content/multithumb/multithumb.php|27
-20|//modules/vwar/convert/mvcw_conver.php|6
-20|//myfunctions/mygallerybrowser.php|3
-20|//nuseo/admin/nuseo_admin_d.php|3
-20|/admin/%22index.php|6
-20|/admin///////|3
-20|/admin//admin/index.php|9
-20|/admin//administrator/components/com_remository/admin.remository.php|3
-20|/admin//amember/plugins/payment/secpay/secpay.inc.php|3
-20|/admin//claroline//exercice//testheaderpage.php|3
-20|/admin//claroline/phpbb/page_tail.php|3
-20|/admin//include/monitoring/engine/MakeXML.php|3
-20|/admin//mambots/content/multithumb/multithumb.php|27
-20|/admin//modules/vwar/convert/mvcw_conver.php|6
-20|/admin//myfunctions/mygallerybrowser.php|3
-20|/admin//nuseo/admin/nuseo_admin_d.php|3
-20|/admin/access_log/%22index.php|3
-20|/admin/access_log/components/com_hashcash/server.php|6
-20|/admin/access_log/convert/mvcw.php|12
-20|/admin/access_log/index.php|51
-20|/admin/components/com_hashcash/server.php|6
-20|/admin/convert/mvcw.php|15
-20|/admin/index.php|90
-20|/admin/index2.php|3
-20|/admin/modules/vwar/convert/mvcw_conver.php|3
-20|/components/com_hashcash/server.php|6
-20|/convert/mvcw.php|15
-20|/index.php|96
-20|/index2.php|3
-20|/modules/vwar/convert/mvcw_conver.php|6
-21|/|6
-21|/%22index.php|6
-21|///////|3
-21|//admin/index.php|9
-21|//administrator/components/com_remository/admin.remository.php|3
-21|//amember/plugins/payment/secpay/secpay.inc.php|3
-21|//claroline//exercice//testheaderpage.php|3
-21|//claroline/phpbb/page_tail.php|3
-21|//include/monitoring/engine/MakeXML.php|3
-21|//mambots/content/multithumb/multithumb.php|27
-21|//modules/vwar/convert/mvcw_conver.php|6
-21|//myfunctions/mygallerybrowser.php|3
-21|//nuseo/admin/nuseo_admin_d.php|3
-21|/admin/%22index.php|6
-21|/admin///////|3
-21|/admin//admin/index.php|9
-21|/admin//administrator/components/com_remository/admin.remository.php|3
-21|/admin//amember/plugins/payment/secpay/secpay.inc.php|3
-21|/admin//claroline//exercice//testheaderpage.php|3
-21|/admin//claroline/phpbb/page_tail.php|3
-21|/admin//include/monitoring/engine/MakeXML.php|3
-21|/admin//mambots/content/multithumb/multithumb.php|27
-21|/admin//modules/vwar/convert/mvcw_conver.php|6
-21|/admin//myfunctions/mygallerybrowser.php|3
-21|/admin//nuseo/admin/nuseo_admin_d.php|3
-21|/admin/access_log/%22index.php|3
-21|/admin/access_log/components/com_hashcash/server.php|6
-21|/admin/access_log/convert/mvcw.php|12
-21|/admin/access_log/index.php|51
-21|/admin/components/com_hashcash/server.php|6
-21|/admin/convert/mvcw.php|15
-21|/admin/index.php|90
-21|/admin/index2.php|3
-21|/admin/modules/vwar/convert/mvcw_conver.php|3
-21|/components/com_hashcash/server.php|6
-21|/convert/mvcw.php|15
-21|/index.php|96
-21|/index2.php|3
-21|/modules/vwar/convert/mvcw_conver.php|6
-22|/|2
-22|/%22index.php|2
-22|///////|1
-22|//admin/index.php|3
-22|//administrator/components/com_remository/admin.remository.php|1
-22|//amember/plugins/payment/secpay/secpay.inc.php|1
-22|//claroline//exercice//testheaderpage.php|1
-22|//claroline/phpbb/page_tail.php|1
-22|//include/monitoring/engine/MakeXML.php|1
-22|//mambots/content/multithumb/multithumb.php|9
-22|//modules/vwar/convert/mvcw_conver.php|2
-22|//myfunctions/mygallerybrowser.php|1
-22|//nuseo/admin/nuseo_admin_d.php|1
-22|/admin/%22index.php|2
-22|/admin///////|1
-22|/admin//admin/index.php|3
-22|/admin//administrator/components/com_remository/admin.remository.php|1
-22|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-22|/admin//claroline//exercice//testheaderpage.php|1
-22|/admin//claroline/phpbb/page_tail.php|1
-22|/admin//include/monitoring/engine/MakeXML.php|1
-22|/admin//mambots/content/multithumb/multithumb.php|9
-22|/admin//modules/vwar/convert/mvcw_conver.php|2
-22|/admin//myfunctions/mygallerybrowser.php|1
-22|/admin//nuseo/admin/nuseo_admin_d.php|1
-22|/admin/access_log/%22index.php|1
-22|/admin/access_log/components/com_hashcash/server.php|2
-22|/admin/access_log/convert/mvcw.php|4
-22|/admin/access_log/index.php|17
-22|/admin/components/com_hashcash/server.php|2
-22|/admin/convert/mvcw.php|5
-22|/admin/index.php|30
-22|/admin/index2.php|1
-22|/admin/modules/vwar/convert/mvcw_conver.php|1
-22|/components/com_hashcash/server.php|2
-22|/convert/mvcw.php|5
-22|/index.php|32
-22|/index2.php|1
-22|/modules/vwar/convert/mvcw_conver.php|2
-23|/|4
-23|/%22index.php|4
-23|///////|2
-23|//admin/index.php|6
-23|//administrator/components/com_remository/admin.remository.php|2
-23|//amember/plugins/payment/secpay/secpay.inc.php|2
-23|//claroline//exercice//testheaderpage.php|2
-23|//claroline/phpbb/page_tail.php|2
-23|//include/monitoring/engine/MakeXML.php|2
-23|//mambots/content/multithumb/multithumb.php|18
-23|//modules/vwar/convert/mvcw_conver.php|4
-23|//myfunctions/mygallerybrowser.php|2
-23|//nuseo/admin/nuseo_admin_d.php|2
-23|/admin/%22index.php|4
-23|/admin///////|2
-23|/admin//admin/index.php|6
-23|/admin//administrator/components/com_remository/admin.remository.php|2
-23|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-23|/admin//claroline//exercice//testheaderpage.php|2
-23|/admin//claroline/phpbb/page_tail.php|2
-23|/admin//include/monitoring/engine/MakeXML.php|2
-23|/admin//mambots/content/multithumb/multithumb.php|18
-23|/admin//modules/vwar/convert/mvcw_conver.php|4
-23|/admin//myfunctions/mygallerybrowser.php|2
-23|/admin//nuseo/admin/nuseo_admin_d.php|2
-23|/admin/access_log/%22index.php|2
-23|/admin/access_log/components/com_hashcash/server.php|4
-23|/admin/access_log/convert/mvcw.php|8
-23|/admin/access_log/index.php|34
-23|/admin/components/com_hashcash/server.php|4
-23|/admin/convert/mvcw.php|10
-23|/admin/index.php|60
-23|/admin/index2.php|2
-23|/admin/modules/vwar/convert/mvcw_conver.php|2
-23|/components/com_hashcash/server.php|4
-23|/convert/mvcw.php|10
-23|/index.php|64
-23|/index2.php|2
-23|/modules/vwar/convert/mvcw_conver.php|4
-24|/|6
-24|/%22index.php|6
-24|///////|3
-24|//admin/index.php|9
-24|//administrator/components/com_remository/admin.remository.php|3
-24|//amember/plugins/payment/secpay/secpay.inc.php|3
-24|//claroline//exercice//testheaderpage.php|3
-24|//claroline/phpbb/page_tail.php|3
-24|//include/monitoring/engine/MakeXML.php|3
-24|//mambots/content/multithumb/multithumb.php|27
-24|//modules/vwar/convert/mvcw_conver.php|6
-24|//myfunctions/mygallerybrowser.php|3
-24|//nuseo/admin/nuseo_admin_d.php|3
-24|/admin/%22index.php|6
-24|/admin///////|3
-24|/admin//admin/index.php|9
-24|/admin//administrator/components/com_remository/admin.remository.php|3
-24|/admin//amember/plugins/payment/secpay/secpay.inc.php|3
-24|/admin//claroline//exercice//testheaderpage.php|3
-24|/admin//claroline/phpbb/page_tail.php|3
-24|/admin//include/monitoring/engine/MakeXML.php|3
-24|/admin//mambots/content/multithumb/multithumb.php|27
-24|/admin//modules/vwar/convert/mvcw_conver.php|6
-24|/admin//myfunctions/mygallerybrowser.php|3
-24|/admin//nuseo/admin/nuseo_admin_d.php|3
-24|/admin/access_log/%22index.php|3
-24|/admin/access_log/components/com_hashcash/server.php|6
-24|/admin/access_log/convert/mvcw.php|12
-24|/admin/access_log/index.php|51
-24|/admin/components/com_hashcash/server.php|6
-24|/admin/convert/mvcw.php|15
-24|/admin/index.php|90
-24|/admin/index2.php|3
-24|/admin/modules/vwar/convert/mvcw_conver.php|3
-24|/components/com_hashcash/server.php|6
-24|/convert/mvcw.php|15
-24|/index.php|96
-24|/index2.php|3
-24|/modules/vwar/convert/mvcw_conver.php|6
-25|/|8
-25|/%22index.php|8
-25|///////|4
-25|//admin/index.php|12
-25|//administrator/components/com_remository/admin.remository.php|4
-25|//amember/plugins/payment/secpay/secpay.inc.php|4
-25|//claroline//exercice//testheaderpage.php|4
-25|//claroline/phpbb/page_tail.php|4
-25|//include/monitoring/engine/MakeXML.php|4
-25|//mambots/content/multithumb/multithumb.php|36
-25|//modules/vwar/convert/mvcw_conver.php|8
-25|//myfunctions/mygallerybrowser.php|4
-25|//nuseo/admin/nuseo_admin_d.php|4
-25|/admin/%22index.php|8
-25|/admin///////|4
-25|/admin//admin/index.php|12
-25|/admin//administrator/components/com_remository/admin.remository.php|4
-25|/admin//amember/plugins/payment/secpay/secpay.inc.php|4
-25|/admin//claroline//exercice//testheaderpage.php|4
-25|/admin//claroline/phpbb/page_tail.php|4
-25|/admin//include/monitoring/engine/MakeXML.php|4
-25|/admin//mambots/content/multithumb/multithumb.php|36
-25|/admin//modules/vwar/convert/mvcw_conver.php|8
-25|/admin//myfunctions/mygallerybrowser.php|4
-25|/admin//nuseo/admin/nuseo_admin_d.php|4
-25|/admin/access_log/%22index.php|4
-25|/admin/access_log/components/com_hashcash/server.php|8
-25|/admin/access_log/convert/mvcw.php|16
-25|/admin/access_log/index.php|68
-25|/admin/components/com_hashcash/server.php|8
-25|/admin/convert/mvcw.php|20
-25|/admin/index.php|120
-25|/admin/index2.php|4
-25|/admin/modules/vwar/convert/mvcw_conver.php|4
-25|/components/com_hashcash/server.php|8
-25|/convert/mvcw.php|20
-25|/index.php|128
-25|/index2.php|4
-25|/modules/vwar/convert/mvcw_conver.php|8
-26|/|2
-26|/%22index.php|2
-26|///////|1
-26|//admin/index.php|3
-26|//administrator/components/com_remository/admin.remository.php|1
-26|//amember/plugins/payment/secpay/secpay.inc.php|1
-26|//claroline//exercice//testheaderpage.php|1
-26|//claroline/phpbb/page_tail.php|1
-26|//include/monitoring/engine/MakeXML.php|1
-26|//mambots/content/multithumb/multithumb.php|9
-26|//modules/vwar/convert/mvcw_conver.php|2
-26|//myfunctions/mygallerybrowser.php|1
-26|//nuseo/admin/nuseo_admin_d.php|1
-26|/admin/%22index.php|2
-26|/admin///////|1
-26|/admin//admin/index.php|3
-26|/admin//administrator/components/com_remository/admin.remository.php|1
-26|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-26|/admin//claroline//exercice//testheaderpage.php|1
-26|/admin//claroline/phpbb/page_tail.php|1
-26|/admin//include/monitoring/engine/MakeXML.php|1
-26|/admin//mambots/content/multithumb/multithumb.php|9
-26|/admin//modules/vwar/convert/mvcw_conver.php|2
-26|/admin//myfunctions/mygallerybrowser.php|1
-26|/admin//nuseo/admin/nuseo_admin_d.php|1
-26|/admin/access_log/%22index.php|1
-26|/admin/access_log/components/com_hashcash/server.php|2
-26|/admin/access_log/convert/mvcw.php|4
-26|/admin/access_log/index.php|17
-26|/admin/components/com_hashcash/server.php|2
-26|/admin/convert/mvcw.php|5
-26|/admin/index.php|30
-26|/admin/index2.php|1
-26|/admin/modules/vwar/convert/mvcw_conver.php|1
-26|/components/com_hashcash/server.php|2
-26|/convert/mvcw.php|5
-26|/index.php|32
-26|/index2.php|1
-26|/modules/vwar/convert/mvcw_conver.php|2
-27|/|4
-27|/%22index.php|4
-27|///////|2
-27|//admin/index.php|6
-27|//administrator/components/com_remository/admin.remository.php|2
-27|//amember/plugins/payment/secpay/secpay.inc.php|2
-27|//claroline//exercice//testheaderpage.php|2
-27|//claroline/phpbb/page_tail.php|2
-27|//include/monitoring/engine/MakeXML.php|2
-27|//mambots/content/multithumb/multithumb.php|18
-27|//modules/vwar/convert/mvcw_conver.php|4
-27|//myfunctions/mygallerybrowser.php|2
-27|//nuseo/admin/nuseo_admin_d.php|2
-27|/admin/%22index.php|4
-27|/admin///////|2
-27|/admin//admin/index.php|6
-27|/admin//administrator/components/com_remository/admin.remository.php|2
-27|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-27|/admin//claroline//exercice//testheaderpage.php|2
-27|/admin//claroline/phpbb/page_tail.php|2
-27|/admin//include/monitoring/engine/MakeXML.php|2
-27|/admin//mambots/content/multithumb/multithumb.php|18
-27|/admin//modules/vwar/convert/mvcw_conver.php|4
-27|/admin//myfunctions/mygallerybrowser.php|2
-27|/admin//nuseo/admin/nuseo_admin_d.php|2
-27|/admin/access_log/%22index.php|2
-27|/admin/access_log/components/com_hashcash/server.php|4
-27|/admin/access_log/convert/mvcw.php|8
-27|/admin/access_log/index.php|34
-27|/admin/components/com_hashcash/server.php|4
-27|/admin/convert/mvcw.php|10
-27|/admin/index.php|60
-27|/admin/index2.php|2
-27|/admin/modules/vwar/convert/mvcw_conver.php|2
-27|/components/com_hashcash/server.php|4
-27|/convert/mvcw.php|10
-27|/index.php|64
-27|/index2.php|2
-27|/modules/vwar/convert/mvcw_conver.php|4
-28|/|2
-28|/%22index.php|2
-28|///////|1
-28|//admin/index.php|3
-28|//administrator/components/com_remository/admin.remository.php|1
-28|//amember/plugins/payment/secpay/secpay.inc.php|1
-28|//claroline//exercice//testheaderpage.php|1
-28|//claroline/phpbb/page_tail.php|1
-28|//include/monitoring/engine/MakeXML.php|1
-28|//mambots/content/multithumb/multithumb.php|9
-28|//modules/vwar/convert/mvcw_conver.php|2
-28|//myfunctions/mygallerybrowser.php|1
-28|//nuseo/admin/nuseo_admin_d.php|1
-28|/admin/%22index.php|2
-28|/admin///////|1
-28|/admin//admin/index.php|3
-28|/admin//administrator/components/com_remository/admin.remository.php|1
-28|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-28|/admin//claroline//exercice//testheaderpage.php|1
-28|/admin//claroline/phpbb/page_tail.php|1
-28|/admin//include/monitoring/engine/MakeXML.php|1
-28|/admin//mambots/content/multithumb/multithumb.php|9
-28|/admin//modules/vwar/convert/mvcw_conver.php|2
-28|/admin//myfunctions/mygallerybrowser.php|1
-28|/admin//nuseo/admin/nuseo_admin_d.php|1
-28|/admin/access_log/%22index.php|1
-28|/admin/access_log/components/com_hashcash/server.php|2
-28|/admin/access_log/convert/mvcw.php|4
-28|/admin/access_log/index.php|17
-28|/admin/components/com_hashcash/server.php|2
-28|/admin/convert/mvcw.php|5
-28|/admin/index.php|30
-28|/admin/index2.php|1
-28|/admin/modules/vwar/convert/mvcw_conver.php|1
-28|/components/com_hashcash/server.php|2
-28|/convert/mvcw.php|5
-28|/index.php|32
-28|/index2.php|1
-28|/modules/vwar/convert/mvcw_conver.php|2
-29|/|4
-29|/%22index.php|4
-29|///////|2
-29|//admin/index.php|6
-29|//administrator/components/com_remository/admin.remository.php|2
-29|//amember/plugins/payment/secpay/secpay.inc.php|2
-29|//claroline//exercice//testheaderpage.php|2
-29|//claroline/phpbb/page_tail.php|2
-29|//include/monitoring/engine/MakeXML.php|2
-29|//mambots/content/multithumb/multithumb.php|18
-29|//modules/vwar/convert/mvcw_conver.php|4
-29|//myfunctions/mygallerybrowser.php|2
-29|//nuseo/admin/nuseo_admin_d.php|2
-29|/admin/%22index.php|4
-29|/admin///////|2
-29|/admin//admin/index.php|6
-29|/admin//administrator/components/com_remository/admin.remository.php|2
-29|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-29|/admin//claroline//exercice//testheaderpage.php|2
-29|/admin//claroline/phpbb/page_tail.php|2
-29|/admin//include/monitoring/engine/MakeXML.php|2
-29|/admin//mambots/content/multithumb/multithumb.php|18
-29|/admin//modules/vwar/convert/mvcw_conver.php|4
-29|/admin//myfunctions/mygallerybrowser.php|2
-29|/admin//nuseo/admin/nuseo_admin_d.php|2
-29|/admin/access_log/%22index.php|2
-29|/admin/access_log/components/com_hashcash/server.php|4
-29|/admin/access_log/convert/mvcw.php|8
-29|/admin/access_log/index.php|34
-29|/admin/components/com_hashcash/server.php|4
-29|/admin/convert/mvcw.php|10
-29|/admin/index.php|60
-29|/admin/index2.php|2
-29|/admin/modules/vwar/convert/mvcw_conver.php|2
-29|/components/com_hashcash/server.php|4
-29|/convert/mvcw.php|10
-29|/index.php|64
-29|/index2.php|2
-29|/modules/vwar/convert/mvcw_conver.php|4
-30|/|2
-30|/%22index.php|2
-30|///////|1
-30|//admin/index.php|3
-30|//administrator/components/com_remository/admin.remository.php|1
-30|//amember/plugins/payment/secpay/secpay.inc.php|1
-30|//claroline//exercice//testheaderpage.php|1
-30|//claroline/phpbb/page_tail.php|1
-30|//include/monitoring/engine/MakeXML.php|1
-30|//mambots/content/multithumb/multithumb.php|9
-30|//modules/vwar/convert/mvcw_conver.php|2
-30|//myfunctions/mygallerybrowser.php|1
-30|//nuseo/admin/nuseo_admin_d.php|1
-30|/admin/%22index.php|2
-30|/admin///////|1
-30|/admin//admin/index.php|3
-30|/admin//administrator/components/com_remository/admin.remository.php|1
-30|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-30|/admin//claroline//exercice//testheaderpage.php|1
-30|/admin//claroline/phpbb/page_tail.php|1
-30|/admin//include/monitoring/engine/MakeXML.php|1
-30|/admin//mambots/content/multithumb/multithumb.php|9
-30|/admin//modules/vwar/convert/mvcw_conver.php|2
-30|/admin//myfunctions/mygallerybrowser.php|1
-30|/admin//nuseo/admin/nuseo_admin_d.php|1
-30|/admin/access_log/%22index.php|1
-30|/admin/access_log/components/com_hashcash/server.php|2
-30|/admin/access_log/convert/mvcw.php|4
-30|/admin/access_log/index.php|17
-30|/admin/components/com_hashcash/server.php|2
-30|/admin/convert/mvcw.php|5
-30|/admin/index.php|30
-30|/admin/index2.php|1
-30|/admin/modules/vwar/convert/mvcw_conver.php|1
-30|/components/com_hashcash/server.php|2
-30|/convert/mvcw.php|5
-30|/index.php|32
-30|/index2.php|1
-30|/modules/vwar/convert/mvcw_conver.php|2
-33|/|6
-33|/%22index.php|6
-33|///////|3
-33|//admin/index.php|9
-33|//administrator/components/com_remository/admin.remository.php|3
-33|//amember/plugins/payment/secpay/secpay.inc.php|3
-33|//claroline//exercice//testheaderpage.php|3
-33|//claroline/phpbb/page_tail.php|3
-33|//include/monitoring/engine/MakeXML.php|3
-33|//mambots/content/multithumb/multithumb.php|27
-33|//modules/vwar/convert/mvcw_conver.php|6
-33|//myfunctions/mygallerybrowser.php|3
-33|//nuseo/admin/nuseo_admin_d.php|3
-33|/admin/%22index.php|6
-33|/admin///////|3
-33|/admin//admin/index.php|9
-33|/admin//administrator/components/com_remository/admin.remository.php|3
-33|/admin//amember/plugins/payment/secpay/secpay.inc.php|3
-33|/admin//claroline//exercice//testheaderpage.php|3
-33|/admin//claroline/phpbb/page_tail.php|3
-33|/admin//include/monitoring/engine/MakeXML.php|3
-33|/admin//mambots/content/multithumb/multithumb.php|27
-33|/admin//modules/vwar/convert/mvcw_conver.php|6
-33|/admin//myfunctions/mygallerybrowser.php|3
-33|/admin//nuseo/admin/nuseo_admin_d.php|3
-33|/admin/access_log/%22index.php|3
-33|/admin/access_log/components/com_hashcash/server.php|6
-33|/admin/access_log/convert/mvcw.php|12
-33|/admin/access_log/index.php|51
-33|/admin/components/com_hashcash/server.php|6
-33|/admin/convert/mvcw.php|15
-33|/admin/index.php|90
-33|/admin/index2.php|3
-33|/admin/modules/vwar/convert/mvcw_conver.php|3
-33|/components/com_hashcash/server.php|6
-33|/convert/mvcw.php|15
-33|/index.php|96
-33|/index2.php|3
-33|/modules/vwar/convert/mvcw_conver.php|6
-35|/|4
-35|/%22index.php|4
-35|///////|2
-35|//admin/index.php|6
-35|//administrator/components/com_remository/admin.remository.php|2
-35|//amember/plugins/payment/secpay/secpay.inc.php|2
-35|//claroline//exercice//testheaderpage.php|2
-35|//claroline/phpbb/page_tail.php|2
-35|//include/monitoring/engine/MakeXML.php|2
-35|//mambots/content/multithumb/multithumb.php|18
-35|//modules/vwar/convert/mvcw_conver.php|4
-35|//myfunctions/mygallerybrowser.php|2
-35|//nuseo/admin/nuseo_admin_d.php|2
-35|/admin/%22index.php|4
-35|/admin///////|2
-35|/admin//admin/index.php|6
-35|/admin//administrator/components/com_remository/admin.remository.php|2
-35|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-35|/admin//claroline//exercice//testheaderpage.php|2
-35|/admin//claroline/phpbb/page_tail.php|2
-35|/admin//include/monitoring/engine/MakeXML.php|2
-35|/admin//mambots/content/multithumb/multithumb.php|18
-35|/admin//modules/vwar/convert/mvcw_conver.php|4
-35|/admin//myfunctions/mygallerybrowser.php|2
-35|/admin//nuseo/admin/nuseo_admin_d.php|2
-35|/admin/access_log/%22index.php|2
-35|/admin/access_log/components/com_hashcash/server.php|4
-35|/admin/access_log/convert/mvcw.php|8
-35|/admin/access_log/index.php|34
-35|/admin/components/com_hashcash/server.php|4
-35|/admin/convert/mvcw.php|10
-35|/admin/index.php|60
-35|/admin/index2.php|2
-35|/admin/modules/vwar/convert/mvcw_conver.php|2
-35|/components/com_hashcash/server.php|4
-35|/convert/mvcw.php|10
-35|/index.php|64
-35|/index2.php|2
-35|/modules/vwar/convert/mvcw_conver.php|4
-36|/|2
-36|/%22index.php|2
-36|///////|1
-36|//admin/index.php|3
-36|//administrator/components/com_remository/admin.remository.php|1
-36|//amember/plugins/payment/secpay/secpay.inc.php|1
-36|//claroline//exercice//testheaderpage.php|1
-36|//claroline/phpbb/page_tail.php|1
-36|//include/monitoring/engine/MakeXML.php|1
-36|//mambots/content/multithumb/multithumb.php|9
-36|//modules/vwar/convert/mvcw_conver.php|2
-36|//myfunctions/mygallerybrowser.php|1
-36|//nuseo/admin/nuseo_admin_d.php|1
-36|/admin/%22index.php|2
-36|/admin///////|1
-36|/admin//admin/index.php|3
-36|/admin//administrator/components/com_remository/admin.remository.php|1
-36|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-36|/admin//claroline//exercice//testheaderpage.php|1
-36|/admin//claroline/phpbb/page_tail.php|1
-36|/admin//include/monitoring/engine/MakeXML.php|1
-36|/admin//mambots/content/multithumb/multithumb.php|9
-36|/admin//modules/vwar/convert/mvcw_conver.php|2
-36|/admin//myfunctions/mygallerybrowser.php|1
-36|/admin//nuseo/admin/nuseo_admin_d.php|1
-36|/admin/access_log/%22index.php|1
-36|/admin/access_log/components/com_hashcash/server.php|2
-36|/admin/access_log/convert/mvcw.php|4
-36|/admin/access_log/index.php|17
-36|/admin/components/com_hashcash/server.php|2
-36|/admin/convert/mvcw.php|5
-36|/admin/index.php|30
-36|/admin/index2.php|1
-36|/admin/modules/vwar/convert/mvcw_conver.php|1
-36|/components/com_hashcash/server.php|2
-36|/convert/mvcw.php|5
-36|/index.php|32
-36|/index2.php|1
-36|/modules/vwar/convert/mvcw_conver.php|2
-37|/|8
-37|/%22index.php|8
-37|///////|4
-37|//admin/index.php|12
-37|//administrator/components/com_remository/admin.remository.php|4
-37|//amember/plugins/payment/secpay/secpay.inc.php|4
-37|//claroline//exercice//testheaderpage.php|4
-37|//claroline/phpbb/page_tail.php|4
-37|//include/monitoring/engine/MakeXML.php|4
-37|//mambots/content/multithumb/multithumb.php|36
-37|//modules/vwar/convert/mvcw_conver.php|8
-37|//myfunctions/mygallerybrowser.php|4
-37|//nuseo/admin/nuseo_admin_d.php|4
-37|/admin/%22index.php|8
-37|/admin///////|4
-37|/admin//admin/index.php|12
-37|/admin//administrator/components/com_remository/admin.remository.php|4
-37|/admin//amember/plugins/payment/secpay/secpay.inc.php|4
-37|/admin//claroline//exercice//testheaderpage.php|4
-37|/admin//claroline/phpbb/page_tail.php|4
-37|/admin//include/monitoring/engine/MakeXML.php|4
-37|/admin//mambots/content/multithumb/multithumb.php|36
-37|/admin//modules/vwar/convert/mvcw_conver.php|8
-37|/admin//myfunctions/mygallerybrowser.php|4
-37|/admin//nuseo/admin/nuseo_admin_d.php|4
-37|/admin/access_log/%22index.php|4
-37|/admin/access_log/components/com_hashcash/server.php|8
-37|/admin/access_log/convert/mvcw.php|16
-37|/admin/access_log/index.php|68
-37|/admin/components/com_hashcash/server.php|8
-37|/admin/convert/mvcw.php|20
-37|/admin/index.php|120
-37|/admin/index2.php|4
-37|/admin/modules/vwar/convert/mvcw_conver.php|4
-37|/components/com_hashcash/server.php|8
-37|/convert/mvcw.php|20
-37|/index.php|128
-37|/index2.php|4
-37|/modules/vwar/convert/mvcw_conver.php|8
-38|/|4
-38|/%22index.php|4
-38|///////|2
-38|//admin/index.php|6
-38|//administrator/components/com_remository/admin.remository.php|2
-38|//amember/plugins/payment/secpay/secpay.inc.php|2
-38|//claroline//exercice//testheaderpage.php|2
-38|//claroline/phpbb/page_tail.php|2
-38|//include/monitoring/engine/MakeXML.php|2
-38|//mambots/content/multithumb/multithumb.php|18
-38|//modules/vwar/convert/mvcw_conver.php|4
-38|//myfunctions/mygallerybrowser.php|2
-38|//nuseo/admin/nuseo_admin_d.php|2
-38|/admin/%22index.php|4
-38|/admin///////|2
-38|/admin//admin/index.php|6
-38|/admin//administrator/components/com_remository/admin.remository.php|2
-38|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-38|/admin//claroline//exercice//testheaderpage.php|2
-38|/admin//claroline/phpbb/page_tail.php|2
-38|/admin//include/monitoring/engine/MakeXML.php|2
-38|/admin//mambots/content/multithumb/multithumb.php|18
-38|/admin//modules/vwar/convert/mvcw_conver.php|4
-38|/admin//myfunctions/mygallerybrowser.php|2
-38|/admin//nuseo/admin/nuseo_admin_d.php|2
-38|/admin/access_log/%22index.php|2
-38|/admin/access_log/components/com_hashcash/server.php|4
-38|/admin/access_log/convert/mvcw.php|8
-38|/admin/access_log/index.php|34
-38|/admin/components/com_hashcash/server.php|4
-38|/admin/convert/mvcw.php|10
-38|/admin/index.php|60
-38|/admin/index2.php|2
-38|/admin/modules/vwar/convert/mvcw_conver.php|2
-38|/components/com_hashcash/server.php|4
-38|/convert/mvcw.php|10
-38|/index.php|64
-38|/index2.php|2
-38|/modules/vwar/convert/mvcw_conver.php|4
-39|/|4
-39|/%22index.php|4
-39|///////|2
-39|//admin/index.php|6
-39|//administrator/components/com_remository/admin.remository.php|2
-39|//amember/plugins/payment/secpay/secpay.inc.php|2
-39|//claroline//exercice//testheaderpage.php|2
-39|//claroline/phpbb/page_tail.php|2
-39|//include/monitoring/engine/MakeXML.php|2
-39|//mambots/content/multithumb/multithumb.php|18
-39|//modules/vwar/convert/mvcw_conver.php|4
-39|//myfunctions/mygallerybrowser.php|2
-39|//nuseo/admin/nuseo_admin_d.php|2
-39|/admin/%22index.php|4
-39|/admin///////|2
-39|/admin//admin/index.php|6
-39|/admin//administrator/components/com_remository/admin.remository.php|2
-39|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-39|/admin//claroline//exercice//testheaderpage.php|2
-39|/admin//claroline/phpbb/page_tail.php|2
-39|/admin//include/monitoring/engine/MakeXML.php|2
-39|/admin//mambots/content/multithumb/multithumb.php|18
-39|/admin//modules/vwar/convert/mvcw_conver.php|4
-39|/admin//myfunctions/mygallerybrowser.php|2
-39|/admin//nuseo/admin/nuseo_admin_d.php|2
-39|/admin/access_log/%22index.php|2
-39|/admin/access_log/components/com_hashcash/server.php|4
-39|/admin/access_log/convert/mvcw.php|8
-39|/admin/access_log/index.php|34
-39|/admin/components/com_hashcash/server.php|4
-39|/admin/convert/mvcw.php|10
-39|/admin/index.php|60
-39|/admin/index2.php|2
-39|/admin/modules/vwar/convert/mvcw_conver.php|2
-39|/components/com_hashcash/server.php|4
-39|/convert/mvcw.php|10
-39|/index.php|64
-39|/index2.php|2
-39|/modules/vwar/convert/mvcw_conver.php|4
-40|/|6
-40|/%22index.php|6
-40|///////|3
-40|//admin/index.php|9
-40|//administrator/components/com_remository/admin.remository.php|3
-40|//amember/plugins/payment/secpay/secpay.inc.php|3
-40|//claroline//exercice//testheaderpage.php|3
-40|//claroline/phpbb/page_tail.php|3
-40|//include/monitoring/engine/MakeXML.php|3
-40|//mambots/content/multithumb/multithumb.php|27
-40|//modules/vwar/convert/mvcw_conver.php|6
-40|//myfunctions/mygallerybrowser.php|3
-40|//nuseo/admin/nuseo_admin_d.php|3
-40|/admin/%22index.php|6
-40|/admin///////|3
-40|/admin//admin/index.php|9
-40|/admin//administrator/components/com_remository/admin.remository.php|3
-40|/admin//amember/plugins/payment/secpay/secpay.inc.php|3
-40|/admin//claroline//exercice//testheaderpage.php|3
-40|/admin//claroline/phpbb/page_tail.php|3
-40|/admin//include/monitoring/engine/MakeXML.php|3
-40|/admin//mambots/content/multithumb/multithumb.php|27
-40|/admin//modules/vwar/convert/mvcw_conver.php|6
-40|/admin//myfunctions/mygallerybrowser.php|3
-40|/admin//nuseo/admin/nuseo_admin_d.php|3
-40|/admin/access_log/%22index.php|3
-40|/admin/access_log/components/com_hashcash/server.php|6
-40|/admin/access_log/convert/mvcw.php|12
-40|/admin/access_log/index.php|51
-40|/admin/components/com_hashcash/server.php|6
-40|/admin/convert/mvcw.php|15
-40|/admin/index.php|90
-40|/admin/index2.php|3
-40|/admin/modules/vwar/convert/mvcw_conver.php|3
-40|/components/com_hashcash/server.php|6
-40|/convert/mvcw.php|15
-40|/index.php|96
-40|/index2.php|3
-40|/modules/vwar/convert/mvcw_conver.php|6
-41|/|2
-41|/%22index.php|2
-41|///////|1
-41|//admin/index.php|3
-41|//administrator/components/com_remository/admin.remository.php|1
-41|//amember/plugins/payment/secpay/secpay.inc.php|1
-41|//claroline//exercice//testheaderpage.php|1
-41|//claroline/phpbb/page_tail.php|1
-41|//include/monitoring/engine/MakeXML.php|1
-41|//mambots/content/multithumb/multithumb.php|9
-41|//modules/vwar/convert/mvcw_conver.php|2
-41|//myfunctions/mygallerybrowser.php|1
-41|//nuseo/admin/nuseo_admin_d.php|1
-41|/admin/%22index.php|2
-41|/admin///////|1
-41|/admin//admin/index.php|3
-41|/admin//administrator/components/com_remository/admin.remository.php|1
-41|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-41|/admin//claroline//exercice//testheaderpage.php|1
-41|/admin//claroline/phpbb/page_tail.php|1
-41|/admin//include/monitoring/engine/MakeXML.php|1
-41|/admin//mambots/content/multithumb/multithumb.php|9
-41|/admin//modules/vwar/convert/mvcw_conver.php|2
-41|/admin//myfunctions/mygallerybrowser.php|1
-41|/admin//nuseo/admin/nuseo_admin_d.php|1
-41|/admin/access_log/%22index.php|1
-41|/admin/access_log/components/com_hashcash/server.php|2
-41|/admin/access_log/convert/mvcw.php|4
-41|/admin/access_log/index.php|17
-41|/admin/components/com_hashcash/server.php|2
-41|/admin/convert/mvcw.php|5
-41|/admin/index.php|30
-41|/admin/index2.php|1
-41|/admin/modules/vwar/convert/mvcw_conver.php|1
-41|/components/com_hashcash/server.php|2
-41|/convert/mvcw.php|5
-41|/index.php|32
-41|/index2.php|1
-41|/modules/vwar/convert/mvcw_conver.php|2
-43|/|2
-43|/%22index.php|2
-43|///////|1
-43|//admin/index.php|3
-43|//administrator/components/com_remository/admin.remository.php|1
-43|//amember/plugins/payment/secpay/secpay.inc.php|1
-43|//claroline//exercice//testheaderpage.php|1
-43|//claroline/phpbb/page_tail.php|1
-43|//include/monitoring/engine/MakeXML.php|1
-43|//mambots/content/multithumb/multithumb.php|9
-43|//modules/vwar/convert/mvcw_conver.php|2
-43|//myfunctions/mygallerybrowser.php|1
-43|//nuseo/admin/nuseo_admin_d.php|1
-43|/admin/%22index.php|2
-43|/admin///////|1
-43|/admin//admin/index.php|3
-43|/admin//administrator/components/com_remository/admin.remository.php|1
-43|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-43|/admin//claroline//exercice//testheaderpage.php|1
-43|/admin//claroline/phpbb/page_tail.php|1
-43|/admin//include/monitoring/engine/MakeXML.php|1
-43|/admin//mambots/content/multithumb/multithumb.php|9
-43|/admin//modules/vwar/convert/mvcw_conver.php|2
-43|/admin//myfunctions/mygallerybrowser.php|1
-43|/admin//nuseo/admin/nuseo_admin_d.php|1
-43|/admin/access_log/%22index.php|1
-43|/admin/access_log/components/com_hashcash/server.php|2
-43|/admin/access_log/convert/mvcw.php|4
-43|/admin/access_log/index.php|17
-43|/admin/components/com_hashcash/server.php|2
-43|/admin/convert/mvcw.php|5
-43|/admin/index.php|30
-43|/admin/index2.php|1
-43|/admin/modules/vwar/convert/mvcw_conver.php|1
-43|/components/com_hashcash/server.php|2
-43|/convert/mvcw.php|5
-43|/index.php|32
-43|/index2.php|1
-43|/modules/vwar/convert/mvcw_conver.php|2
-44|/|4
-44|/%22index.php|4
-44|///////|2
-44|//admin/index.php|6
-44|//administrator/components/com_remository/admin.remository.php|2
-44|//amember/plugins/payment/secpay/secpay.inc.php|2
-44|//claroline//exercice//testheaderpage.php|2
-44|//claroline/phpbb/page_tail.php|2
-44|//include/monitoring/engine/MakeXML.php|2
-44|//mambots/content/multithumb/multithumb.php|18
-44|//modules/vwar/convert/mvcw_conver.php|4
-44|//myfunctions/mygallerybrowser.php|2
-44|//nuseo/admin/nuseo_admin_d.php|2
-44|/admin/%22index.php|4
-44|/admin///////|2
-44|/admin//admin/index.php|6
-44|/admin//administrator/components/com_remository/admin.remository.php|2
-44|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-44|/admin//claroline//exercice//testheaderpage.php|2
-44|/admin//claroline/phpbb/page_tail.php|2
-44|/admin//include/monitoring/engine/MakeXML.php|2
-44|/admin//mambots/content/multithumb/multithumb.php|18
-44|/admin//modules/vwar/convert/mvcw_conver.php|4
-44|/admin//myfunctions/mygallerybrowser.php|2
-44|/admin//nuseo/admin/nuseo_admin_d.php|2
-44|/admin/access_log/%22index.php|2
-44|/admin/access_log/components/com_hashcash/server.php|4
-44|/admin/access_log/convert/mvcw.php|8
-44|/admin/access_log/index.php|34
-44|/admin/components/com_hashcash/server.php|4
-44|/admin/convert/mvcw.php|10
-44|/admin/index.php|60
-44|/admin/index2.php|2
-44|/admin/modules/vwar/convert/mvcw_conver.php|2
-44|/components/com_hashcash/server.php|4
-44|/convert/mvcw.php|10
-44|/index.php|64
-44|/index2.php|2
-44|/modules/vwar/convert/mvcw_conver.php|4
-45|/|2
-45|/%22index.php|2
-45|///////|1
-45|//admin/index.php|3
-45|//administrator/components/com_remository/admin.remository.php|1
-45|//amember/plugins/payment/secpay/secpay.inc.php|1
-45|//claroline//exercice//testheaderpage.php|1
-45|//claroline/phpbb/page_tail.php|1
-45|//include/monitoring/engine/MakeXML.php|1
-45|//mambots/content/multithumb/multithumb.php|9
-45|//modules/vwar/convert/mvcw_conver.php|2
-45|//myfunctions/mygallerybrowser.php|1
-45|//nuseo/admin/nuseo_admin_d.php|1
-45|/admin/%22index.php|2
-45|/admin///////|1
-45|/admin//admin/index.php|3
-45|/admin//administrator/components/com_remository/admin.remository.php|1
-45|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-45|/admin//claroline//exercice//testheaderpage.php|1
-45|/admin//claroline/phpbb/page_tail.php|1
-45|/admin//include/monitoring/engine/MakeXML.php|1
-45|/admin//mambots/content/multithumb/multithumb.php|9
-45|/admin//modules/vwar/convert/mvcw_conver.php|2
-45|/admin//myfunctions/mygallerybrowser.php|1
-45|/admin//nuseo/admin/nuseo_admin_d.php|1
-45|/admin/access_log/%22index.php|1
-45|/admin/access_log/components/com_hashcash/server.php|2
-45|/admin/access_log/convert/mvcw.php|4
-45|/admin/access_log/index.php|17
-45|/admin/components/com_hashcash/server.php|2
-45|/admin/convert/mvcw.php|5
-45|/admin/index.php|30
-45|/admin/index2.php|1
-45|/admin/modules/vwar/convert/mvcw_conver.php|1
-45|/components/com_hashcash/server.php|2
-45|/convert/mvcw.php|5
-45|/index.php|32
-45|/index2.php|1
-45|/modules/vwar/convert/mvcw_conver.php|2
-46|/|8
-46|/%22index.php|8
-46|///////|4
-46|//admin/index.php|12
-46|//administrator/components/com_remository/admin.remository.php|4
-46|//amember/plugins/payment/secpay/secpay.inc.php|4
-46|//claroline//exercice//testheaderpage.php|4
-46|//claroline/phpbb/page_tail.php|4
-46|//include/monitoring/engine/MakeXML.php|4
-46|//mambots/content/multithumb/multithumb.php|36
-46|//modules/vwar/convert/mvcw_conver.php|8
-46|//myfunctions/mygallerybrowser.php|4
-46|//nuseo/admin/nuseo_admin_d.php|4
-46|/admin/%22index.php|8
-46|/admin///////|4
-46|/admin//admin/index.php|12
-46|/admin//administrator/components/com_remository/admin.remository.php|4
-46|/admin//amember/plugins/payment/secpay/secpay.inc.php|4
-46|/admin//claroline//exercice//testheaderpage.php|4
-46|/admin//claroline/phpbb/page_tail.php|4
-46|/admin//include/monitoring/engine/MakeXML.php|4
-46|/admin//mambots/content/multithumb/multithumb.php|36
-46|/admin//modules/vwar/convert/mvcw_conver.php|8
-46|/admin//myfunctions/mygallerybrowser.php|4
-46|/admin//nuseo/admin/nuseo_admin_d.php|4
-46|/admin/access_log/%22index.php|4
-46|/admin/access_log/components/com_hashcash/server.php|8
-46|/admin/access_log/convert/mvcw.php|16
-46|/admin/access_log/index.php|68
-46|/admin/components/com_hashcash/server.php|8
-46|/admin/convert/mvcw.php|20
-46|/admin/index.php|120
-46|/admin/index2.php|4
-46|/admin/modules/vwar/convert/mvcw_conver.php|4
-46|/components/com_hashcash/server.php|8
-46|/convert/mvcw.php|20
-46|/index.php|128
-46|/index2.php|4
-46|/modules/vwar/convert/mvcw_conver.php|8
-48|/|2
-48|/%22index.php|2
-48|///////|1
-48|//admin/index.php|3
-48|//administrator/components/com_remository/admin.remository.php|1
-48|//amember/plugins/payment/secpay/secpay.inc.php|1
-48|//claroline//exercice//testheaderpage.php|1
-48|//claroline/phpbb/page_tail.php|1
-48|//include/monitoring/engine/MakeXML.php|1
-48|//mambots/content/multithumb/multithumb.php|9
-48|//modules/vwar/convert/mvcw_conver.php|2
-48|//myfunctions/mygallerybrowser.php|1
-48|//nuseo/admin/nuseo_admin_d.php|1
-48|/admin/%22index.php|2
-48|/admin///////|1
-48|/admin//admin/index.php|3
-48|/admin//administrator/components/com_remository/admin.remository.php|1
-48|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-48|/admin//claroline//exercice//testheaderpage.php|1
-48|/admin//claroline/phpbb/page_tail.php|1
-48|/admin//include/monitoring/engine/MakeXML.php|1
-48|/admin//mambots/content/multithumb/multithumb.php|9
-48|/admin//modules/vwar/convert/mvcw_conver.php|2
-48|/admin//myfunctions/mygallerybrowser.php|1
-48|/admin//nuseo/admin/nuseo_admin_d.php|1
-48|/admin/access_log/%22index.php|1
-48|/admin/access_log/components/com_hashcash/server.php|2
-48|/admin/access_log/convert/mvcw.php|4
-48|/admin/access_log/index.php|17
-48|/admin/components/com_hashcash/server.php|2
-48|/admin/convert/mvcw.php|5
-48|/admin/index.php|30
-48|/admin/index2.php|1
-48|/admin/modules/vwar/convert/mvcw_conver.php|1
-48|/components/com_hashcash/server.php|2
-48|/convert/mvcw.php|5
-48|/index.php|32
-48|/index2.php|1
-48|/modules/vwar/convert/mvcw_conver.php|2
-50|/|2
-50|/%22index.php|2
-50|///////|1
-50|//admin/index.php|3
-50|//administrator/components/com_remository/admin.remository.php|1
-50|//amember/plugins/payment/secpay/secpay.inc.php|1
-50|//claroline//exercice//testheaderpage.php|1
-50|//claroline/phpbb/page_tail.php|1
-50|//include/monitoring/engine/MakeXML.php|1
-50|//mambots/content/multithumb/multithumb.php|9
-50|//modules/vwar/convert/mvcw_conver.php|2
-50|//myfunctions/mygallerybrowser.php|1
-50|//nuseo/admin/nuseo_admin_d.php|1
-50|/admin/%22index.php|2
-50|/admin///////|1
-50|/admin//admin/index.php|3
-50|/admin//administrator/components/com_remository/admin.remository.php|1
-50|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-50|/admin//claroline//exercice//testheaderpage.php|1
-50|/admin//claroline/phpbb/page_tail.php|1
-50|/admin//include/monitoring/engine/MakeXML.php|1
-50|/admin//mambots/content/multithumb/multithumb.php|9
-50|/admin//modules/vwar/convert/mvcw_conver.php|2
-50|/admin//myfunctions/mygallerybrowser.php|1
-50|/admin//nuseo/admin/nuseo_admin_d.php|1
-50|/admin/access_log/%22index.php|1
-50|/admin/access_log/components/com_hashcash/server.php|2
-50|/admin/access_log/convert/mvcw.php|4
-50|/admin/access_log/index.php|17
-50|/admin/components/com_hashcash/server.php|2
-50|/admin/convert/mvcw.php|5
-50|/admin/index.php|30
-50|/admin/index2.php|1
-50|/admin/modules/vwar/convert/mvcw_conver.php|1
-50|/components/com_hashcash/server.php|2
-50|/convert/mvcw.php|5
-50|/index.php|32
-50|/index2.php|1
-50|/modules/vwar/convert/mvcw_conver.php|2
-51|/|4
-51|/%22index.php|4
-51|///////|2
-51|//admin/index.php|6
-51|//administrator/components/com_remository/admin.remository.php|2
-51|//amember/plugins/payment/secpay/secpay.inc.php|2
-51|//claroline//exercice//testheaderpage.php|2
-51|//claroline/phpbb/page_tail.php|2
-51|//include/monitoring/engine/MakeXML.php|2
-51|//mambots/content/multithumb/multithumb.php|18
-51|//modules/vwar/convert/mvcw_conver.php|4
-51|//myfunctions/mygallerybrowser.php|2
-51|//nuseo/admin/nuseo_admin_d.php|2
-51|/admin/%22index.php|4
-51|/admin///////|2
-51|/admin//admin/index.php|6
-51|/admin//administrator/components/com_remository/admin.remository.php|2
-51|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-51|/admin//claroline//exercice//testheaderpage.php|2
-51|/admin//claroline/phpbb/page_tail.php|2
-51|/admin//include/monitoring/engine/MakeXML.php|2
-51|/admin//mambots/content/multithumb/multithumb.php|18
-51|/admin//modules/vwar/convert/mvcw_conver.php|4
-51|/admin//myfunctions/mygallerybrowser.php|2
-51|/admin//nuseo/admin/nuseo_admin_d.php|2
-51|/admin/access_log/%22index.php|2
-51|/admin/access_log/components/com_hashcash/server.php|4
-51|/admin/access_log/convert/mvcw.php|8
-51|/admin/access_log/index.php|34
-51|/admin/components/com_hashcash/server.php|4
-51|/admin/convert/mvcw.php|10
-51|/admin/index.php|60
-51|/admin/index2.php|2
-51|/admin/modules/vwar/convert/mvcw_conver.php|2
-51|/components/com_hashcash/server.php|4
-51|/convert/mvcw.php|10
-51|/index.php|64
-51|/index2.php|2
-51|/modules/vwar/convert/mvcw_conver.php|4
-52|/|2
-52|/%22index.php|2
-52|///////|1
-52|//admin/index.php|3
-52|//administrator/components/com_remository/admin.remository.php|1
-52|//amember/plugins/payment/secpay/secpay.inc.php|1
-52|//claroline//exercice//testheaderpage.php|1
-52|//claroline/phpbb/page_tail.php|1
-52|//include/monitoring/engine/MakeXML.php|1
-52|//mambots/content/multithumb/multithumb.php|9
-52|//modules/vwar/convert/mvcw_conver.php|2
-52|//myfunctions/mygallerybrowser.php|1
-52|//nuseo/admin/nuseo_admin_d.php|1
-52|/admin/%22index.php|2
-52|/admin///////|1
-52|/admin//admin/index.php|3
-52|/admin//administrator/components/com_remository/admin.remository.php|1
-52|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-52|/admin//claroline//exercice//testheaderpage.php|1
-52|/admin//claroline/phpbb/page_tail.php|1
-52|/admin//include/monitoring/engine/MakeXML.php|1
-52|/admin//mambots/content/multithumb/multithumb.php|9
-52|/admin//modules/vwar/convert/mvcw_conver.php|2
-52|/admin//myfunctions/mygallerybrowser.php|1
-52|/admin//nuseo/admin/nuseo_admin_d.php|1
-52|/admin/access_log/%22index.php|1
-52|/admin/access_log/components/com_hashcash/server.php|2
-52|/admin/access_log/convert/mvcw.php|4
-52|/admin/access_log/index.php|17
-52|/admin/components/com_hashcash/server.php|2
-52|/admin/convert/mvcw.php|5
-52|/admin/index.php|30
-52|/admin/index2.php|1
-52|/admin/modules/vwar/convert/mvcw_conver.php|1
-52|/components/com_hashcash/server.php|2
-52|/convert/mvcw.php|5
-52|/index.php|32
-52|/index2.php|1
-52|/modules/vwar/convert/mvcw_conver.php|2
-54|/|2
-54|/%22index.php|2
-54|///////|1
-54|//admin/index.php|3
-54|//administrator/components/com_remository/admin.remository.php|1
-54|//amember/plugins/payment/secpay/secpay.inc.php|1
-54|//claroline//exercice//testheaderpage.php|1
-54|//claroline/phpbb/page_tail.php|1
-54|//include/monitoring/engine/MakeXML.php|1
-54|//mambots/content/multithumb/multithumb.php|9
-54|//modules/vwar/convert/mvcw_conver.php|2
-54|//myfunctions/mygallerybrowser.php|1
-54|//nuseo/admin/nuseo_admin_d.php|1
-54|/admin/%22index.php|2
-54|/admin///////|1
-54|/admin//admin/index.php|3
-54|/admin//administrator/components/com_remository/admin.remository.php|1
-54|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-54|/admin//claroline//exercice//testheaderpage.php|1
-54|/admin//claroline/phpbb/page_tail.php|1
-54|/admin//include/monitoring/engine/MakeXML.php|1
-54|/admin//mambots/content/multithumb/multithumb.php|9
-54|/admin//modules/vwar/convert/mvcw_conver.php|2
-54|/admin//myfunctions/mygallerybrowser.php|1
-54|/admin//nuseo/admin/nuseo_admin_d.php|1
-54|/admin/access_log/%22index.php|1
-54|/admin/access_log/components/com_hashcash/server.php|2
-54|/admin/access_log/convert/mvcw.php|4
-54|/admin/access_log/index.php|17
-54|/admin/components/com_hashcash/server.php|2
-54|/admin/convert/mvcw.php|5
-54|/admin/index.php|30
-54|/admin/index2.php|1
-54|/admin/modules/vwar/convert/mvcw_conver.php|1
-54|/components/com_hashcash/server.php|2
-54|/convert/mvcw.php|5
-54|/index.php|32
-54|/index2.php|1
-54|/modules/vwar/convert/mvcw_conver.php|2
-56|/|2
-56|/%22index.php|2
-56|///////|1
-56|//admin/index.php|3
-56|//administrator/components/com_remository/admin.remository.php|1
-56|//amember/plugins/payment/secpay/secpay.inc.php|1
-56|//claroline//exercice//testheaderpage.php|1
-56|//claroline/phpbb/page_tail.php|1
-56|//include/monitoring/engine/MakeXML.php|1
-56|//mambots/content/multithumb/multithumb.php|9
-56|//modules/vwar/convert/mvcw_conver.php|2
-56|//myfunctions/mygallerybrowser.php|1
-56|//nuseo/admin/nuseo_admin_d.php|1
-56|/admin/%22index.php|2
-56|/admin///////|1
-56|/admin//admin/index.php|3
-56|/admin//administrator/components/com_remository/admin.remository.php|1
-56|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-56|/admin//claroline//exercice//testheaderpage.php|1
-56|/admin//claroline/phpbb/page_tail.php|1
-56|/admin//include/monitoring/engine/MakeXML.php|1
-56|/admin//mambots/content/multithumb/multithumb.php|9
-56|/admin//modules/vwar/convert/mvcw_conver.php|2
-56|/admin//myfunctions/mygallerybrowser.php|1
-56|/admin//nuseo/admin/nuseo_admin_d.php|1
-56|/admin/access_log/%22index.php|1
-56|/admin/access_log/components/com_hashcash/server.php|2
-56|/admin/access_log/convert/mvcw.php|4
-56|/admin/access_log/index.php|17
-56|/admin/components/com_hashcash/server.php|2
-56|/admin/convert/mvcw.php|5
-56|/admin/index.php|30
-56|/admin/index2.php|1
-56|/admin/modules/vwar/convert/mvcw_conver.php|1
-56|/components/com_hashcash/server.php|2
-56|/convert/mvcw.php|5
-56|/index.php|32
-56|/index2.php|1
-56|/modules/vwar/convert/mvcw_conver.php|2
-58|/|2
-58|/%22index.php|2
-58|///////|1
-58|//admin/index.php|3
-58|//administrator/components/com_remository/admin.remository.php|1
-58|//amember/plugins/payment/secpay/secpay.inc.php|1
-58|//claroline//exercice//testheaderpage.php|1
-58|//claroline/phpbb/page_tail.php|1
-58|//include/monitoring/engine/MakeXML.php|1
-58|//mambots/content/multithumb/multithumb.php|9
-58|//modules/vwar/convert/mvcw_conver.php|2
-58|//myfunctions/mygallerybrowser.php|1
-58|//nuseo/admin/nuseo_admin_d.php|1
-58|/admin/%22index.php|2
-58|/admin///////|1
-58|/admin//admin/index.php|3
-58|/admin//administrator/components/com_remository/admin.remository.php|1
-58|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-58|/admin//claroline//exercice//testheaderpage.php|1
-58|/admin//claroline/phpbb/page_tail.php|1
-58|/admin//include/monitoring/engine/MakeXML.php|1
-58|/admin//mambots/content/multithumb/multithumb.php|9
-58|/admin//modules/vwar/convert/mvcw_conver.php|2
-58|/admin//myfunctions/mygallerybrowser.php|1
-58|/admin//nuseo/admin/nuseo_admin_d.php|1
-58|/admin/access_log/%22index.php|1
-58|/admin/access_log/components/com_hashcash/server.php|2
-58|/admin/access_log/convert/mvcw.php|4
-58|/admin/access_log/index.php|17
-58|/admin/components/com_hashcash/server.php|2
-58|/admin/convert/mvcw.php|5
-58|/admin/index.php|30
-58|/admin/index2.php|1
-58|/admin/modules/vwar/convert/mvcw_conver.php|1
-58|/components/com_hashcash/server.php|2
-58|/convert/mvcw.php|5
-58|/index.php|32
-58|/index2.php|1
-58|/modules/vwar/convert/mvcw_conver.php|2
-60|/|2
-60|/%22index.php|2
-60|///////|1
-60|//admin/index.php|3
-60|//administrator/components/com_remository/admin.remository.php|1
-60|//amember/plugins/payment/secpay/secpay.inc.php|1
-60|//claroline//exercice//testheaderpage.php|1
-60|//claroline/phpbb/page_tail.php|1
-60|//include/monitoring/engine/MakeXML.php|1
-60|//mambots/content/multithumb/multithumb.php|9
-60|//modules/vwar/convert/mvcw_conver.php|2
-60|//myfunctions/mygallerybrowser.php|1
-60|//nuseo/admin/nuseo_admin_d.php|1
-60|/admin/%22index.php|2
-60|/admin///////|1
-60|/admin//admin/index.php|3
-60|/admin//administrator/components/com_remository/admin.remository.php|1
-60|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-60|/admin//claroline//exercice//testheaderpage.php|1
-60|/admin//claroline/phpbb/page_tail.php|1
-60|/admin//include/monitoring/engine/MakeXML.php|1
-60|/admin//mambots/content/multithumb/multithumb.php|9
-60|/admin//modules/vwar/convert/mvcw_conver.php|2
-60|/admin//myfunctions/mygallerybrowser.php|1
-60|/admin//nuseo/admin/nuseo_admin_d.php|1
-60|/admin/access_log/%22index.php|1
-60|/admin/access_log/components/com_hashcash/server.php|2
-60|/admin/access_log/convert/mvcw.php|4
-60|/admin/access_log/index.php|17
-60|/admin/components/com_hashcash/server.php|2
-60|/admin/convert/mvcw.php|5
-60|/admin/index.php|30
-60|/admin/index2.php|1
-60|/admin/modules/vwar/convert/mvcw_conver.php|1
-60|/components/com_hashcash/server.php|2
-60|/convert/mvcw.php|5
-60|/index.php|32
-60|/index2.php|1
-60|/modules/vwar/convert/mvcw_conver.php|2
-62|/|2
-62|/%22index.php|2
-62|///////|1
-62|//admin/index.php|3
-62|//administrator/components/com_remository/admin.remository.php|1
-62|//amember/plugins/payment/secpay/secpay.inc.php|1
-62|//claroline//exercice//testheaderpage.php|1
-62|//claroline/phpbb/page_tail.php|1
-62|//include/monitoring/engine/MakeXML.php|1
-62|//mambots/content/multithumb/multithumb.php|9
-62|//modules/vwar/convert/mvcw_conver.php|2
-62|//myfunctions/mygallerybrowser.php|1
-62|//nuseo/admin/nuseo_admin_d.php|1
-62|/admin/%22index.php|2
-62|/admin///////|1
-62|/admin//admin/index.php|3
-62|/admin//administrator/components/com_remository/admin.remository.php|1
-62|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-62|/admin//claroline//exercice//testheaderpage.php|1
-62|/admin//claroline/phpbb/page_tail.php|1
-62|/admin//include/monitoring/engine/MakeXML.php|1
-62|/admin//mambots/content/multithumb/multithumb.php|9
-62|/admin//modules/vwar/convert/mvcw_conver.php|2
-62|/admin//myfunctions/mygallerybrowser.php|1
-62|/admin//nuseo/admin/nuseo_admin_d.php|1
-62|/admin/access_log/%22index.php|1
-62|/admin/access_log/components/com_hashcash/server.php|2
-62|/admin/access_log/convert/mvcw.php|4
-62|/admin/access_log/index.php|17
-62|/admin/components/com_hashcash/server.php|2
-62|/admin/convert/mvcw.php|5
-62|/admin/index.php|30
-62|/admin/index2.php|1
-62|/admin/modules/vwar/convert/mvcw_conver.php|1
-62|/components/com_hashcash/server.php|2
-62|/convert/mvcw.php|5
-62|/index.php|32
-62|/index2.php|1
-62|/modules/vwar/convert/mvcw_conver.php|2
-63|/|4
-63|/%22index.php|4
-63|///////|2
-63|//admin/index.php|6
-63|//administrator/components/com_remository/admin.remository.php|2
-63|//amember/plugins/payment/secpay/secpay.inc.php|2
-63|//claroline//exercice//testheaderpage.php|2
-63|//claroline/phpbb/page_tail.php|2
-63|//include/monitoring/engine/MakeXML.php|2
-63|//mambots/content/multithumb/multithumb.php|18
-63|//modules/vwar/convert/mvcw_conver.php|4
-63|//myfunctions/mygallerybrowser.php|2
-63|//nuseo/admin/nuseo_admin_d.php|2
-63|/admin/%22index.php|4
-63|/admin///////|2
-63|/admin//admin/index.php|6
-63|/admin//administrator/components/com_remository/admin.remository.php|2
-63|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-63|/admin//claroline//exercice//testheaderpage.php|2
-63|/admin//claroline/phpbb/page_tail.php|2
-63|/admin//include/monitoring/engine/MakeXML.php|2
-63|/admin//mambots/content/multithumb/multithumb.php|18
-63|/admin//modules/vwar/convert/mvcw_conver.php|4
-63|/admin//myfunctions/mygallerybrowser.php|2
-63|/admin//nuseo/admin/nuseo_admin_d.php|2
-63|/admin/access_log/%22index.php|2
-63|/admin/access_log/components/com_hashcash/server.php|4
-63|/admin/access_log/convert/mvcw.php|8
-63|/admin/access_log/index.php|34
-63|/admin/components/com_hashcash/server.php|4
-63|/admin/convert/mvcw.php|10
-63|/admin/index.php|60
-63|/admin/index2.php|2
-63|/admin/modules/vwar/convert/mvcw_conver.php|2
-63|/components/com_hashcash/server.php|4
-63|/convert/mvcw.php|10
-63|/index.php|64
-63|/index2.php|2
-63|/modules/vwar/convert/mvcw_conver.php|4
-64|/|2
-64|/%22index.php|2
-64|///////|1
-64|//admin/index.php|3
-64|//administrator/components/com_remository/admin.remository.php|1
-64|//amember/plugins/payment/secpay/secpay.inc.php|1
-64|//claroline//exercice//testheaderpage.php|1
-64|//claroline/phpbb/page_tail.php|1
-64|//include/monitoring/engine/MakeXML.php|1
-64|//mambots/content/multithumb/multithumb.php|9
-64|//modules/vwar/convert/mvcw_conver.php|2
-64|//myfunctions/mygallerybrowser.php|1
-64|//nuseo/admin/nuseo_admin_d.php|1
-64|/admin/%22index.php|2
-64|/admin///////|1
-64|/admin//admin/index.php|3
-64|/admin//administrator/components/com_remository/admin.remository.php|1
-64|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-64|/admin//claroline//exercice//testheaderpage.php|1
-64|/admin//claroline/phpbb/page_tail.php|1
-64|/admin//include/monitoring/engine/MakeXML.php|1
-64|/admin//mambots/content/multithumb/multithumb.php|9
-64|/admin//modules/vwar/convert/mvcw_conver.php|2
-64|/admin//myfunctions/mygallerybrowser.php|1
-64|/admin//nuseo/admin/nuseo_admin_d.php|1
-64|/admin/access_log/%22index.php|1
-64|/admin/access_log/components/com_hashcash/server.php|2
-64|/admin/access_log/convert/mvcw.php|4
-64|/admin/access_log/index.php|17
-64|/admin/components/com_hashcash/server.php|2
-64|/admin/convert/mvcw.php|5
-64|/admin/index.php|30
-64|/admin/index2.php|1
-64|/admin/modules/vwar/convert/mvcw_conver.php|1
-64|/components/com_hashcash/server.php|2
-64|/convert/mvcw.php|5
-64|/index.php|32
-64|/index2.php|1
-64|/modules/vwar/convert/mvcw_conver.php|2
-66|/|2
-66|/%22index.php|2
-66|///////|1
-66|//admin/index.php|3
-66|//administrator/components/com_remository/admin.remository.php|1
-66|//amember/plugins/payment/secpay/secpay.inc.php|1
-66|//claroline//exercice//testheaderpage.php|1
-66|//claroline/phpbb/page_tail.php|1
-66|//include/monitoring/engine/MakeXML.php|1
-66|//mambots/content/multithumb/multithumb.php|9
-66|//modules/vwar/convert/mvcw_conver.php|2
-66|//myfunctions/mygallerybrowser.php|1
-66|//nuseo/admin/nuseo_admin_d.php|1
-66|/admin/%22index.php|2
-66|/admin///////|1
-66|/admin//admin/index.php|3
-66|/admin//administrator/components/com_remository/admin.remository.php|1
-66|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-66|/admin//claroline//exercice//testheaderpage.php|1
-66|/admin//claroline/phpbb/page_tail.php|1
-66|/admin//include/monitoring/engine/MakeXML.php|1
-66|/admin//mambots/content/multithumb/multithumb.php|9
-66|/admin//modules/vwar/convert/mvcw_conver.php|2
-66|/admin//myfunctions/mygallerybrowser.php|1
-66|/admin//nuseo/admin/nuseo_admin_d.php|1
-66|/admin/access_log/%22index.php|1
-66|/admin/access_log/components/com_hashcash/server.php|2
-66|/admin/access_log/convert/mvcw.php|4
-66|/admin/access_log/index.php|17
-66|/admin/components/com_hashcash/server.php|2
-66|/admin/convert/mvcw.php|5
-66|/admin/index.php|30
-66|/admin/index2.php|1
-66|/admin/modules/vwar/convert/mvcw_conver.php|1
-66|/components/com_hashcash/server.php|2
-66|/convert/mvcw.php|5
-66|/index.php|32
-66|/index2.php|1
-66|/modules/vwar/convert/mvcw_conver.php|2
-68|/|4
-68|/%22index.php|4
-68|///////|2
-68|//admin/index.php|6
-68|//administrator/components/com_remository/admin.remository.php|2
-68|//amember/plugins/payment/secpay/secpay.inc.php|2
-68|//claroline//exercice//testheaderpage.php|2
-68|//claroline/phpbb/page_tail.php|2
-68|//include/monitoring/engine/MakeXML.php|2
-68|//mambots/content/multithumb/multithumb.php|18
-68|//modules/vwar/convert/mvcw_conver.php|4
-68|//myfunctions/mygallerybrowser.php|2
-68|//nuseo/admin/nuseo_admin_d.php|2
-68|/admin/%22index.php|4
-68|/admin///////|2
-68|/admin//admin/index.php|6
-68|/admin//administrator/components/com_remository/admin.remository.php|2
-68|/admin//amember/plugins/payment/secpay/secpay.inc.php|2
-68|/admin//claroline//exercice//testheaderpage.php|2
-68|/admin//claroline/phpbb/page_tail.php|2
-68|/admin//include/monitoring/engine/MakeXML.php|2
-68|/admin//mambots/content/multithumb/multithumb.php|18
-68|/admin//modules/vwar/convert/mvcw_conver.php|4
-68|/admin//myfunctions/mygallerybrowser.php|2
-68|/admin//nuseo/admin/nuseo_admin_d.php|2
-68|/admin/access_log/%22index.php|2
-68|/admin/access_log/components/com_hashcash/server.php|4
-68|/admin/access_log/convert/mvcw.php|8
-68|/admin/access_log/index.php|34
-68|/admin/components/com_hashcash/server.php|4
-68|/admin/convert/mvcw.php|10
-68|/admin/index.php|60
-68|/admin/index2.php|2
-68|/admin/modules/vwar/convert/mvcw_conver.php|2
-68|/components/com_hashcash/server.php|4
-68|/convert/mvcw.php|10
-68|/index.php|64
-68|/index2.php|2
-68|/modules/vwar/convert/mvcw_conver.php|4
-69|/|2
-69|/%22index.php|2
-69|///////|1
-69|//admin/index.php|3
-69|//administrator/components/com_remository/admin.remository.php|1
-69|//amember/plugins/payment/secpay/secpay.inc.php|1
-69|//claroline//exercice//testheaderpage.php|1
-69|//claroline/phpbb/page_tail.php|1
-69|//include/monitoring/engine/MakeXML.php|1
-69|//mambots/content/multithumb/multithumb.php|9
-69|//modules/vwar/convert/mvcw_conver.php|2
-69|//myfunctions/mygallerybrowser.php|1
-69|//nuseo/admin/nuseo_admin_d.php|1
-69|/admin/%22index.php|2
-69|/admin///////|1
-69|/admin//admin/index.php|3
-69|/admin//administrator/components/com_remository/admin.remository.php|1
-69|/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-69|/admin//claroline//exercice//testheaderpage.php|1
-69|/admin//claroline/phpbb/page_tail.php|1
-69|/admin//include/monitoring/engine/MakeXML.php|1
-69|/admin//mambots/content/multithumb/multithumb.php|9
-69|/admin//modules/vwar/convert/mvcw_conver.php|2
-69|/admin//myfunctions/mygallerybrowser.php|1
-69|/admin//nuseo/admin/nuseo_admin_d.php|1
-69|/admin/access_log/%22index.php|1
-69|/admin/access_log/components/com_hashcash/server.php|2
-69|/admin/access_log/convert/mvcw.php|4
-69|/admin/access_log/index.php|17
-69|/admin/components/com_hashcash/server.php|2
-69|/admin/convert/mvcw.php|5
-69|/admin/index.php|30
-69|/admin/index2.php|1
-69|/admin/modules/vwar/convert/mvcw_conver.php|1
-69|/components/com_hashcash/server.php|2
-69|/convert/mvcw.php|5
-69|/index.php|32
-69|/index2.php|1
-69|/modules/vwar/convert/mvcw_conver.php|2
-70|/|8
-70|/%22index.php|8
-70|///////|4
-70|//admin/index.php|12
-70|//administrator/components/com_remository/admin.remository.php|4
-70|//amember/plugins/payment/secpay/secpay.inc.php|4
-70|//claroline//exercice//testheaderpage.php|4
-70|//claroline/phpbb/page_tail.php|4
-70|//include/monitoring/engine/MakeXML.php|4
-70|//mambots/content/multithumb/multithumb.php|36
-70|//modules/vwar/convert/mvcw_conver.php|8
-70|//myfunctions/mygallerybrowser.php|4
-70|//nuseo/admin/nuseo_admin_d.php|4
-70|/admin/%22index.php|8
-70|/admin///////|4
-70|/admin//admin/index.php|12
-70|/admin//administrator/components/com_remository/admin.remository.php|4
-70|/admin//amember/plugins/payment/secpay/secpay.inc.php|4
-70|/admin//claroline//exercice//testheaderpage.php|4
-70|/admin//claroline/phpbb/page_tail.php|4
-70|/admin//include/monitoring/engine/MakeXML.php|4
-70|/admin//mambots/content/multithumb/multithumb.php|36
-70|/admin//modules/vwar/convert/mvcw_conver.php|8
-70|/admin//myfunctions/mygallerybrowser.php|4
-70|

<TRUNCATED>


[07/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/badref.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/badref.yml.in b/src/bin/gpmapreduce/test/input/badref.yml.in
deleted file mode 100644
index 79d2815..0000000
--- a/src/bin/gpmapreduce/test/input/badref.yml.in
+++ /dev/null
@@ -1,155 +0,0 @@
-#
-#  This test outlines has YAML that conforms to the Greenplum MapReduce schema,
-#  But object names have don't hookup correctly
-#
-%YAML 1.1
-
-# Bad INPUTS
----
-VERSION: 1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:        input_bad_hostname
-      FILE:        invalidhost:/path/to/file
-EXECUTE:
-  - RUN:
-      SOURCE:      input_bad_hostname
----
-VERSION: 1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:        input_bad_hostname
-      GPFDIST:     invalidhost:/badfile
-EXECUTE:
-  - RUN:
-      SOURCE:      input_bad_hostname
----
-VERSION: 1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:        input_bad_file
-      FILE:        @hostname@:/dev/null/badfile
-EXECUTE:
-  - RUN:
-      SOURCE:      input_bad_file
----
-VERSION: 1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:        input_bad_file
-      FILE:        @hostname@:/badfile
-EXECUTE:
-  - RUN:
-      SOURCE:      input_bad_file
----
-VERSION: 1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:        input_bad_exec
-      EXEC:        '/dev/null'
-EXECUTE:
-  - RUN:
-      SOURCE:      input_bad_exec      
----
-VERSION: 1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:        input_bad_table
-      TABLE:       invalid_table
-EXECUTE:
-  - RUN:
-      SOURCE:      input_bad_table      
----
-VERSION: 1.0.0.1
-DEFINE:
-  - MAP:
-      NAME:        map_not_input
-      LANGUAGE:    perl
-      FUNCTION:    return [$@]
-EXECUTE:
-  - RUN:
-      SOURCE:      map_not_input
----
-VERSION: 1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:        good_input
-      TABLE:       gp_configuration
-  - MAP:
-      NAME:        map_not_input
-      LANGUAGE:    perl
-      FUNCTION:    return [$@]
-EXECUTE:
-  - RUN:
-      SOURCE:      good_input
-      TARGET:      map_not_output
----
-
-VERSION: 1.0.0.1
-DEFINE:  
-  - REDUCE:
-      NAME:        badref_reduce
-      INITIALIZE:  '0'
-      TRANSITION:  invalid_transition
----
-VERSION: 1.0.0.1
-DEFINE:  
-  - REDUCE:
-      NAME:        badref_reduce
-      INITIALIZE:  '0'
-      TRANSITION:  int4_sum
-      CONSOLIDATE: invalid_consolidate
----
-VERSION: 1.0.0.1
-DEFINE:  
-  - REDUCE:
-      NAME:        badref_reduce
-      INITIALIZE:  '0'
-      TRANSITION:  int4_sum
-      FINALIZE:    invalid_finalize
----
-VERSION: 1.0.0.1
-DEFINE:  
-  - REDUCE:
-      NAME:        badref_reduce
-      INITIALIZE:  '0'
-      TRANSITION:  generate_series        
----
-VERSION: 1.0.0.1
-DEFINE:
-  - TASK:
-      NAME:        badref_task
-      SOURCE:      invalid_input
-      MAP:         invalid_map
-      REDUCE:      invalid_reduce
----
-VERSION: 1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:        good_input
-      TABLE:       gp_configuration      
-  - TASK:
-      NAME:        badref_task
-      SOURCE:      good_input
-      MAP:         invalid_map      
----
-VERSION: 1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:        good_input
-      TABLE:       gp_configuration
-EXECUTE:
-  - RUN:
-      SOURCE:      invalid_input
-      REDUCE:      invalid_reduce
----
-VERSION: 1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:        good_input
-      TABLE:       gp_configuration
-EXECUTE:
-  - RUN:
-      SOURCE:      good_input
-      TARGET:      invalid_output
-...
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/builtin_1.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/builtin_1.yml.in b/src/bin/gpmapreduce/test/input/builtin_1.yml.in
deleted file mode 100644
index 41888a3..0000000
--- a/src/bin/gpmapreduce/test/input/builtin_1.yml.in
+++ /dev/null
@@ -1,156 +0,0 @@
-%YAML 1.1
-# ============================================================================
-# Test support of builtin functions
-# ============================================================================
-
-
-# ==========================================================================
-# Test 1a: Parameters specified in YAML
-#
-# Note:
-#   - wordsplit_1 was not defined with named parameters
-#   - wordsplit_2 was defined with a parameter named "value"
-# ==========================================================================
----
-VERSION:   1.0.0.2
-USER:      @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      smalldoc
-      FILE:      @hostname@:@abs_srcdir@/data/smalldoc.txt
-      COLUMNS:   [value text]
-
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/builtin_1.1
-      MODE:     replace
-      DELIMITER: '|'
-
-  - OUTPUT:
-      NAME:     out_2
-      FILE:     @abs_srcdir@/output/builtin_1.2
-      MODE:     replace
-      DELIMITER: '|'
-      
-  - MAP:
-      NAME:        wordsplit_1
-      PARAMETERS:  [value text]
-      
-  - MAP:
-      NAME:        wordsplit_2
-      PARAMETERS:  [value text]
-      
-      
-EXECUTE:
-  - RUN:
-      SOURCE:   smalldoc
-      MAP:      wordsplit_1
-      REDUCE:   sum
-      TARGET:   out_1
-
-  - RUN:
-      SOURCE:   smalldoc
-      MAP:      wordsplit_2
-      REDUCE:   sum
-      TARGET:   out_2
-
-
-# ==========================================================================
-# Test 1b: Parameters specified in YAML, but different names than specified
-#
-# Note:
-#   - wordsplit_1 was not defined with named parameters
-#   - wordsplit_2 was defined with a parameter named "value"
-# ==========================================================================
----
-VERSION:   1.0.0.2
-USER:      @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      smalldoc
-      FILE:      @hostname@:@abs_srcdir@/data/smalldoc.txt
-      COLUMNS:   [line text]
-
-  - OUTPUT:
-      NAME:     out_3
-      FILE:     @abs_srcdir@/output/builtin_1.3
-      MODE:     replace
-      DELIMITER: '|'
-
-  - OUTPUT:
-      NAME:     out_4
-      FILE:     @abs_srcdir@/output/builtin_1.4
-      MODE:     replace
-      DELIMITER: '|'
-
-  - MAP:
-      NAME:        wordsplit_1
-      PARAMETERS:  [line text]
-      
-  - MAP:
-      NAME:        wordsplit_2
-      PARAMETERS:  [line text]
-      
-      
-EXECUTE:
-  - RUN:
-      SOURCE:   smalldoc
-      MAP:      wordsplit_1
-      REDUCE:   sum
-      TARGET:   out_3
-
-  - RUN:
-      SOURCE:   smalldoc
-      MAP:      wordsplit_2
-      REDUCE:   sum
-      TARGET:   out_4
-
-# ==========================================================================
-# Test 1c: Using default parameters
-#
-# Note:
-#   - wordsplit_1 was not defined with named parameters
-#   - wordsplit_2 was defined with a parameter named "value"
-# ==========================================================================      
----
-VERSION:   1.0.0.2
-USER:      @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      smalldoc
-      FILE:      @hostname@:@abs_srcdir@/data/smalldoc.txt
-      COLUMNS:   [value text]
-
-  - OUTPUT:
-      NAME:     out_5
-      FILE:     @abs_srcdir@/output/builtin_1.5
-      MODE:     replace
-      DELIMITER: '|'
-
-  - OUTPUT:
-      NAME:     out_6
-      FILE:     @abs_srcdir@/output/builtin_1.6
-      MODE:     replace
-      DELIMITER: '|'
-      
-  - MAP:
-      NAME:        wordsplit_1
-      
-  - MAP:
-      NAME:        wordsplit_2
-      
-EXECUTE:
-  - RUN:
-      SOURCE:   smalldoc
-      MAP:      wordsplit_1
-      REDUCE:   sum
-      TARGET:   out_5
-
-  - RUN:
-      SOURCE:   smalldoc
-      MAP:      wordsplit_2
-      REDUCE:   sum
-      TARGET:   out_6

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/c_function.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/c_function.yml.in b/src/bin/gpmapreduce/test/input/c_function.yml.in
deleted file mode 100644
index 6eb1ef4..0000000
--- a/src/bin/gpmapreduce/test/input/c_function.yml.in
+++ /dev/null
@@ -1,182 +0,0 @@
-%YAML 1.1
----
-
-# ============================================================================
-# Support of "C" language functions was enabled in the 1.0.0.2 version of
-# the Greenplum YAML specification by adding the new "LIBRARY" attribute
-# to MAP/TRANSITION/CONSOLIDATE/FINALIZE specifications.
-# ============================================================================
-VERSION:   1.0.0.2
-USER:      @db_user@
-
-DEFINE:
-
-  # ==========================================================================
-  # This is the input used by all our examples
-  # ==========================================================================
-  - INPUT:
-      NAME:      smalldoc
-      FILE:      @hostname@:@abs_srcdir@/data/smalldoc.txt
-      COLUMNS:   [line text]
-
-  # ==========================================================================
-  # For comparison purposes we also show how to do the same thing
-  #  1) Using user defined C functions
-  #  2) Using the builtin "SUM" reducer
-  #  3) Using builtin functions to define a custom reducer
-  #  4) Using a straight callout to SQL
-  # ==========================================================================
-  
-  # ==========================================================================
-  # 1) Using user defined C functions
-  #
-  # See the code in lib/gpmrdemo.c for details
-  #
-  # Note: There is an assumption that the gpmrdemo.so has already been installed
-  # across the cluster in $GPHOME/lib/postgresql.
-  # ==========================================================================
-  - MAP:
-      NAME:        wordsplit
-      PARAMETERS: [line text]
-      RETURNS:    [key text, value int4]
-      LANGUAGE:   C
-      LIBRARY:    $libdir/gpmrdemo.so
-      FUNCTION:   wordsplit
-
-  - TRANSITION:
-      NAME:       int4_accum
-      PARAMETERS: [state int8, value int4]
-      RETURNS:    [state int8]
-      LANGUAGE:   C
-      LIBRARY:    $libdir/gpmrdemo.so
-      FUNCTION:   int4_accum
-
-  - CONSOLIDATE:
-      NAME:       int8_add
-      PARAMETERS: [value1 int8, value2 int8]
-      RETURNS:    [value int8]
-      LANGUAGE:   C
-      LIBRARY:    $libdir/gpmrdemo.so
-      FUNCTION:   int8_add
-
-  - REDUCE:
-      NAME:        c_sum
-      TRANSITION:  int4_accum
-      CONSOLIDATE: int8_add
-
-  # This task isn't strictly necessary, we could have simply defined
-  # the REDUCE in the RUN block below.
-  - TASK:
-      NAME:        sum_mr_task
-      SOURCE:      smalldoc
-      MAP:         wordsplit
-      REDUCE:      c_sum
-
-
-  # ==========================================================================
-  # 2) SUM as a builtin reducer
-  #
-  # Note: the use of the builtin SUM reducer
-  # ==========================================================================
-  - TASK:
-      NAME:       sum_builtin_task
-      SOURCE:     smalldoc
-      MAP:        wordsplit
-      REDUCE:     SUM
-
-  # ==========================================================================      
-  # 3) Using builtin functions to define a custom reducer
-  #
-  # Note: the transition function and consolidate function are not defined
-  # anywhere in the yaml, they are pre-existing functions within the database.
-  # This only works because the functions "int4_sum" and "int8mi" are uniquely
-  # defined in the database (in contrast to a function like "convert" which
-  # has multiple overloaded arguments).  It is also important to ensure that
-  # the output type of the transition function is the same as the input types
-  # of the consolidate function.
-  #
-  # in this case int4_sum(a int8, b int4) => c int8
-  #     'a': is the input state, it must be as same as the return type 'c'
-  #     'b': is the input value, the input we are passing into the function
-  #        (the value column) should be castable to this datatype.
-  #
-  # ... int8mi(x int8, y int8) => z int8
-  #     'x' and 'y' are input states produced by the transition function.
-  #     'z' is the return type of the function.
-  #     'x', 'y', and 'z' must all be the same datatype as 'c'
-  # ==========================================================================
-  - REDUCE:
-      NAME:        sum_builtin2
-      TRANSITION:  int4_sum
-      CONSOLIDATE: int8mi
-
-  - TASK:
-      NAME:        sum_bulitin2_task
-      SOURCE:      smalldoc
-      MAP:         wordsplit
-      REDUCE:      sum_builtin2
-
-  # ==========================================================================
-  # 4) A direct callout to SQL
-  #
-  # Note: we can use either a TASK or an INPUT as a SOURCE
-  # for execution.
-  # ==========================================================================
-  - INPUT:
-      NAME:      sum_sql
-      QUERY:     |
-        SELECT key, sum(value)
-        FROM (select regexp_split_to_table(line, ' ') as key, 1 as value from smalldoc) m
-        WHERE key != ''
-        GROUP BY key;
-
-  # ==========================================================================
-  # Define the outputs for all the examples above.
-  # ==========================================================================
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/c_function.1
-      MODE:     replace
-      DELIMITER: '|'
-
-  - OUTPUT:
-      NAME:     out_2
-      FILE:     @abs_srcdir@/output/c_function.2
-      MODE:     replace
-      DELIMITER: '|'
-
-  - OUTPUT:
-      NAME:     out_3
-      FILE:     @abs_srcdir@/output/c_function.3
-      MODE:     replace
-      DELIMITER: '|'      
-
-  - OUTPUT:
-      NAME:     out_4
-      FILE:     @abs_srcdir@/output/c_function.4
-      MODE:     replace
-      DELIMITER: '|'      
-
-      
-      
-# ============================================================================
-# The execute block is what is responsible for actually calling
-# each of the above examples and associating them with specific
-# outputs.
-# ============================================================================
-EXECUTE:
-  - RUN:
-      SOURCE:   sum_mr_task
-      TARGET:   out_1
-
-  - RUN:
-      SOURCE:   sum_builtin_task
-      TARGET:   out_2
-      
-  - RUN:
-      SOURCE:   sum_builtin_task
-      TARGET:   out_3
-
-  - RUN:
-      SOURCE:   sum_sql
-      TARGET:   out_4

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/columns.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/columns.yml.in b/src/bin/gpmapreduce/test/input/columns.yml.in
deleted file mode 100644
index c52746c..0000000
--- a/src/bin/gpmapreduce/test/input/columns.yml.in
+++ /dev/null
@@ -1,76 +0,0 @@
-%YAML 1.1
----  
-VERSION:   1.0.0.1
-USER:      @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      weblog
-      FILE:
-        - @hostname@:@abs_srcdir@/data/access_log
-        - @hostname@:@abs_srcdir@/data/access_log2
-      COLUMNS:
-        - ip       text
-        - rfc      text
-        - uname    text
-        - date     text
-        - timezone text
-        - method   text
-        - url      text
-        - protocol text
-        - status   integer
-        - bytes    integer
-      DELIMITER: ' '
-        
-  - MAP:
-      NAME:     myMap
-      LANGUAGE: perl
-      PARAMETERS:
-        - key text
-        - ip text
-        - url text
-      RETURNS:
-        - ip text
-        - url text
-        - value integer
-      FUNCTION: |
-        my ($key, $ip, $url) = @_;
-        return [] unless ($url =~ m/$key/);
-        return [{"ip" => $ip, "url" => $url, "value" => 1}]
-        
-# myReduce is exactly the same as SUM except for the grouping keys and
-# the non-null initialization.
-  - REDUCE:
-      NAME:        myReduce
-      INITIALIZE:  '0'
-      TRANSITION:  int4_sum
-      CONSOLIDATE: int8pl
-      KEYS:        [ip]
-
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/columns.1
-      DELIMITER: '|'
-      MODE:     REPLACE
-
-  - OUTPUT:
-      NAME:     out_2
-      FILE:     @abs_srcdir@/output/columns.1
-      DELIMITER: '|'
-      MODE:     APPEND
-      
-EXECUTE:
-
-# built in SUM groups by all columns not "value" 
-  - RUN:
-     SOURCE:   weblog
-     MAP:      myMap
-     REDUCE:   SUM
-     TARGET:   out_1
-
-# myReduce is defined with "keys" specified as just the "ip" column     
-  - RUN:
-     SOURCE:   weblog
-     MAP:      myMap
-     REDUCE:   myReduce
-     TARGET:   out_2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/graph.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/graph.yml.in b/src/bin/gpmapreduce/test/input/graph.yml.in
deleted file mode 100644
index fc607bd..0000000
--- a/src/bin/gpmapreduce/test/input/graph.yml.in
+++ /dev/null
@@ -1,99 +0,0 @@
-%YAML 1.1
----  
-VERSION:   1.0.0.1
-USER:      @db_user@
-
-DEFINE:
-
-# A sample of www link data
-#      137,941 distinct source pages
-#      325,729 distinct linked pages
-#    1,497,135 total links
-  - INPUT:
-      NAME:      network
-      FILE:      @hostname@:@abs_srcdir@/data/www.small.dat
-      COLUMNS:
-        - key integer
-        - value integer
-      DELIMITER: '|'
-
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/graph.1
-      DELIMITER: '|'
-      
-  - OUTPUT:
-      NAME:     out_2
-      FILE:     @abs_srcdir@/output/graph.2
-      DELIMITER: '|'
-      
-  - OUTPUT:
-      NAME:     out_3
-      FILE:     @abs_srcdir@/output/graph.3
-      DELIMITER: '|'
-            
-# One thing about the Greenplum MapReduce is that it allows you to
-# express calculations in whatever method is easiest.  Here we use
-# SQL to transform the above input from key, value pairs to sparse
-# matrix representation.
-#  - INPUT:
-#      NAME:    sparse_network
-#      QUERY: |
-#        SELECT key, 0.85 as pagerank, array_accum(value) as value
-#        FROM network
-#        GROUP BY key
-        
-# Reverse()
-#   Takes a (key, value) tuple and produces a new tuple of (value, key)
-#   taking the input graph and producing the reverse graph
-#   => It would be faster to have simply reversed the names in the input
-  - MAP:
-      NAME:     reverse
-      LANGUAGE: python
-      PARAMETERS:
-        - key integer
-        - value integer
-      RETURNS:
-        - key integer
-        - value integer
-      MODE: SINGLE
-      FUNCTION:     |
-        return {'key': value, 'value': key}
-        
-# pcount()
-#   Implements a count aggregator in python
-#   => native sql count is about 12x faster
-  - TRANSITION:
-      NAME:       pcount
-      LANGUAGE:   python
-      PARAMETERS:
-        - state integer
-        - value integer
-      RETURNS:
-        - state integer
-      FUNCTION:    return state + 1      
-
-  - REDUCE:
-      NAME:        traverse
-      INITIALIZE:  0
-      TRANSITION:  pcount
-
-      
-EXECUTE:
-
-# This counts the number of links coming FROM a page
-  - RUN:
-      SOURCE:  network
-      REDUCE:  traverse
-      TARGET:  out_1
-      
-# This counts the number of links going TO a page.  
-  - RUN:
-      SOURCE:  network
-      MAP:     reverse
-      REDUCE:  traverse
-      TARGET:  out_2
-
-  - RUN:
-      SOURCE:  network
-      TARGET:  out_3
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/grep.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/grep.yml.in b/src/bin/gpmapreduce/test/input/grep.yml.in
deleted file mode 100644
index d6fbbc7..0000000
--- a/src/bin/gpmapreduce/test/input/grep.yml.in
+++ /dev/null
@@ -1,37 +0,0 @@
-%YAML 1.1
----
-VERSION:         1.0.0.1
-USER:            @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      inDirectory
-      FILE:
-        - @hostname@:@abs_srcdir@/data/access_log
-        - @hostname@:@abs_srcdir@/data/access_log2
-      DELIMITER: '|'
-
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/grep.1
-      DELIMITER: '|'
-      
-  - MAP:
-      NAME:      grep_map
-      FUNCTION:  |
-        return [{"key" => $_[0], "value" => $_[1]}] if ($_[1] =~/$_[0]/);
-        return [];
-      LANGUAGE:  perl
-      OPTIMIZE:  STRICT IMMUTABLE
-
-  - TASK:
-      NAME:      grep_task
-      SOURCE:    inDirectory
-      MAP:       grep_map
-      REDUCE:    IDENTITY
-      
-EXECUTE:
-  - RUN:
-      SOURCE:    grep_task
-      TARGET:    out_1
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/grep_raw.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/grep_raw.yml.in b/src/bin/gpmapreduce/test/input/grep_raw.yml.in
deleted file mode 100644
index f8b98cb..0000000
--- a/src/bin/gpmapreduce/test/input/grep_raw.yml.in
+++ /dev/null
@@ -1,24 +0,0 @@
-%YAML 1.1
----
-VERSION:         1.0.0.1
-USER:            @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      raw_in
-      FILE:      @hostname@:@abs_srcdir@/data/raw.txt
-
-  - MAP:
-      NAME:      grep_map
-      FUNCTION:  |
-        return [{"key" => $_[0], "value" => $_[1]}] if ($_[1] =~/$_[0]/);
-        return [];
-      LANGUAGE:  perl
-      OPTIMIZE:  STRICT IMMUTABLE
-      
-EXECUTE:
-  - RUN:
-      SOURCE:    raw_in
-      MAP:       grep_map
-      TARGET:    STDOUT
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/input.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/input.yml.in b/src/bin/gpmapreduce/test/input/input.yml.in
deleted file mode 100644
index 3d3cefd..0000000
--- a/src/bin/gpmapreduce/test/input/input.yml.in
+++ /dev/null
@@ -1,74 +0,0 @@
-%YAML 1.1
----
-VERSION:         1.0.0.1
-
-DEFINE:
-  - INPUT:
-      NAME:      network1
-      FILE:      @hostname@:@abs_srcdir@/data/www.small.dat
-      COLUMNS:   [key text, value text]
-      DELIMITER: '|'
-
-  - INPUT:
-      NAME:      network2
-      QUERY:     SELECT key, value FROM network1 GROUP BY key, value
-
-  - INPUT:
-      NAME:      network3
-      TABLE:     network2
-      
-  - INPUT:
-      NAME:      network4
-      EXEC:      'cat @abs_srcdir@/data/www.small.dat'
-      COLUMNS:   [key text, value text]
-      DELIMITER: '|'
-
-  - Input:
-      NAME:      network5
-      TABLE:     input.qualified
-      
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/input.1
-      
-  - OUTPUT:
-      NAME:     out_2
-      FILE:     @abs_srcdir@/output/input.2
-      DELIMITER: '|'
-
-      
-  - OUTPUT:
-      NAME:     out_3
-      FILE:     @abs_srcdir@/output/input.3
-      DELIMITER: ':'
-      
-  - OUTPUT:
-      NAME:     out_4
-      FILE:     @abs_srcdir@/output/input.4
-      DELIMITER: ','
-
-  - OUTPUT:
-      NAME:     out_5
-      TABLE:    output.qualified
-      
-EXECUTE:
-
-  - RUN:
-      SOURCE: network1
-      TARGET: out_1
-  
-  - RUN:
-      SOURCE: network2
-      TARGET: out_2
-
-  - RUN:
-      SOURCE: network3
-      TARGET: out_3
-
-  - RUN:
-      SOURCE: network4
-      TARGET: out_4
-
-  - RUN:
-      SOURCE: network5
-      TARGET: out_5

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/join.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/join.yml.in b/src/bin/gpmapreduce/test/input/join.yml.in
deleted file mode 100644
index 2354443..0000000
--- a/src/bin/gpmapreduce/test/input/join.yml.in
+++ /dev/null
@@ -1,94 +0,0 @@
-%YAML 1.1
----  
-VERSION:   1.0.0.1
-DATABASE:  @db_user@
-USER:      @db_user@
-
-DEFINE:
-
-# 3) SQL join
-#    (Define this first to prove non-yaml dependency checks work)
-  - INPUT:
-      NAME:   reverse_access_count
-      QUERY: |
-        SELECT a.key as akey, b.key as bkey, sum(b.value::integer) as value
-        FROM   reverse_network a, access_count b
-        WHERE  a.key != b.key
-        GROUP BY a.key, b.key
-  
-# 1) Access log
-  - INPUT:
-      NAME:      weblog
-      FILE:      @hostname@:@abs_srcdir@/data/access_log
-      DELIMITER: '|'
-      
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/join.1
-      DELIMITER: '|'
-      
-  - MAP:
-      NAME:     myMap
-      LANGUAGE: perl
-      PARAMETERS:
-        - value text
-      RETURNS:
-        - key   text
-        - value integer
-      FUNCTION:     |
-        return [] unless ($_[0] =~ m/GET ([^ ?,]+)/);
-        return [{"key" => $1, "value" => 1}]
-
-  - TRANSITION:
-      NAME:     myTransition
-      LANGUAGE: perl
-      PARAMETERS:
-        - state integer
-        - value integer
-      RETURNS:
-        - value integer
-      FUNCTION:     return $_[0] + $_[1];
-
-  - REDUCE:
-      NAME:        myReduce
-      INITIALIZE:  '0'
-      TRANSITION:  myTransition
-      CONSOLIDATE: myTransition
-
-  - TASK:
-      NAME:     access_count
-      SOURCE:   weblog
-      MAP:      myMap
-      REDUCE:   myReduce
-
-# 2) Network graph
-  - INPUT:
-      NAME:      network
-      FILE:      @hostname@:@abs_srcdir@/data/www.small.dat
-      COLUMNS:
-        - key   integer
-        - value integer
-      DELIMITER: '|'
-
-  - MAP:
-      NAME:     reverse
-      LANGUAGE: python
-      PARAMETERS:
-        - key   integer
-        - value integer
-      RETURNS:
-        - key   integer
-        - value integer
-      FUNCTION:     |
-        return {'key': value, 'value': key}
-      MODE:     SINGLE
-        
-  - TASK:
-      NAME:     reverse_network
-      SOURCE:   network
-      MAP:      reverse
-        
-EXECUTE:
-  - RUN:
-      SOURCE: reverse_access_count
-      TARGET: out_1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/member_kw.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/member_kw.yml.in b/src/bin/gpmapreduce/test/input/member_kw.yml.in
deleted file mode 100755
index 9607de9..0000000
--- a/src/bin/gpmapreduce/test/input/member_kw.yml.in
+++ /dev/null
@@ -1,195 +0,0 @@
-%YAML 1.1
----
-VERSION:         1.0.0.1
-DATABASE:        @db_user@
-USER:            @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      mp
-      TABLE:     member_summary
-
-  - INPUT:
-      NAME:      kw
-      TABLE:     keywords
-
-  # Original example used nltk to do word stemming and tokenization
-  # this version for testing simply does a brain dead space delimited
-  # tokenization and does no stemming.
-  #
-  # The reason for this simplification is that we do not have nltk
-  # installed on all machines.
-  - MAP:
-      NAME:       mp_map
-      LANGUAGE:   python
-      FUNCTION:  |
-        i         = 0
-        terms     = {}
-        for token in text.lower().split():
-          i = i + 1
-          stem = token
-          if stem in terms:
-            terms[stem].append(i)
-          else:
-            terms[stem] = [i]
-        for term in terms:
-          yield([member_id, term, terms[term]])
-      OPTIMIZE:   STRICT IMMUTABLE
-      MODE:       MULTI
-      PARAMETERS:
-        - member_id integer
-        - text      text
-      RETURNS:
-        - member_id integer
-        - term      text
-        - positions text
-
-  - MAP:
-      NAME:       kw_map
-      LANGUAGE:   python
-      FUNCTION:  |
-        i         = 0
-        terms     = {}
-        for token in keyword.lower().split():
-          i = i + 1
-          stem = token
-          if stem in terms:
-            terms[stem].append(i)
-          else:
-            terms[stem] = [i]
-        for term in terms:
-          yield([keyword_id, i, term, terms[term]])
-      OPTIMIZE:   STRICT IMMUTABLE
-      MODE:       MULTI
-      PARAMETERS:
-        - keyword_id   integer
-        - keyword      text
-      RETURNS:
-        - keyword_id integer
-        - nterms     integer
-        - term       text
-        - positions  text
-
-  - TASK:
-      NAME:      mp_prep
-      SOURCE:    mp
-      MAP:       mp_map
-      
-  - TASK:
-      NAME:      kw_prep
-      SOURCE:    kw
-      MAP:       kw_map
-
-  - INPUT:
-      NAME:      term_join
-      QUERY:     |
-        SELECT mp.member_id, kw.keyword_id, mp.term, kw.nterms,
-               mp.positions as mp_positions,
-               kw.positions as kw_positions
-          FROM mp_prep mp INNER JOIN kw_prep kw ON (mp.term = kw.term)
-
-  - REDUCE:
-      NAME:       term_reducer
-      TRANSITION: term_transition
-      FINALIZE:   term_finalizer
-
-  - TRANSITION:
-      NAME:       term_transition
-      LANGUAGE:   python
-      PARAMETERS:
-        - state   text
-        - term    text
-        - nterms  integer
-        - mp_positions  text
-        - kw_positions  text
-      FUNCTION:   |
-        # STATE initialized to: ''
-        # STATE is: 'member positions:member positions: ...'
-        # STATE can be '1,3,2:4:'
-        if state:
-          kw_split = state.split(':')
-        else:
-          kw_split = []
-          for i in range(0,nterms):
-            kw_split.append('')
-            
-        # add mp_positions for the current term
-        for kw_p in kw_positions[1:-1].split(','):
-          kw_split[int(kw_p)-1] = mp_positions
-
-        # reconstruct the delimited state
-        outstate = kw_split[0]
-        for s in kw_split[1:]:
-          outstate = outstate + ':' + s
-        return outstate
-
-  - FINALIZE:
-      NAME:      term_finalizer
-      LANGUAGE:  python
-      MODE:      SINGLE
-      RETURNS:
-        - count integer
-      FUNCTION:  |
-        if not state:
-          return 0
-        kw_split = state.split(':')
-
-        # We adjust each member position list based on
-        # the offset of the term in the keyword and then
-        # intesect all resulting lists
-        previous = None
-        for i in range(0,len(kw_split)):
-          isplit   = kw_split[i][1:-1].split(',')
-          if any(map(lambda(x): x == '', isplit)):
-            return 0
-          adjusted = set(map(lambda(x): int(x)-i, isplit))
-          if (previous):
-            previous = adjusted.intersection(previous)
-          else:
-            previous = adjusted
-
-        # return the final count
-        if previous:
-          return len(previous)
-        return 0
-
-  - TASK:
-      NAME:    term_match
-      SOURCE:  term_join
-      REDUCE:  term_reducer
-
-  - INPUT:
-      NAME:  final_join
-      QUERY:  |
-        SELECT ms.*, kw.*, tm.count 
-        FROM member_summary ms, keywords kw, term_match tm
-        WHERE ms.member_id = tm.member_id
-          AND kw.keyword_id = tm.keyword_id
-          AND tm.count > 0
-
-  - OUTPUT:
-      NAME:      final_output_replace
-      TABLE:     member_keywords_1
-      MODE:      REPLACE
-
-  - OUTPUT:
-      NAME:      final_output_append
-      TABLE:     member_keywords_2
-      MODE:      APPEND
-
-EXECUTE:
-  - RUN:
-      SOURCE:    final_join
-      TARGET:    final_output_replace
-
-  - RUN:
-      SOURCE:    final_join
-      TARGET:    final_output_replace
-
-  - RUN:
-      SOURCE:    final_join
-      TARGET:    final_output_append
-
-  - RUN:
-      SOURCE:    final_join
-      TARGET:    final_output_append      
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/mode.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/mode.yml.in b/src/bin/gpmapreduce/test/input/mode.yml.in
deleted file mode 100644
index a4fae81..0000000
--- a/src/bin/gpmapreduce/test/input/mode.yml.in
+++ /dev/null
@@ -1,72 +0,0 @@
----  # in perl
-VERSION: 1.0.0.1
-
-DEFINE:
-  - INPUT:
-      NAME:        key_value_input
-      QUERY:       |
-        SELECT 'k1' as key, 'v1' as value
-        UNION ALL
-        SELECT 'k2' as key, 'v2' as value;
-
-  - MAP:
-      NAME:        perl_single
-      MODE:        SINGLE
-      PARAMETERS: [key text, value text]
-      RETURNS:    [key text, value text]
-      LANGUAGE:    perl
-      FUNCTION: |
-        my ($key, $value) = @_;
-        return {'key' => $key, 'value' => $value}
-
-  - MAP:
-      NAME:        perl_multi
-      MODE:        MULTI
-      PARAMETERS: [key text, value text]
-      RETURNS:    [key text, value text]
-      LANGUAGE:    perl
-      FUNCTION: |
-        my ($key, $value) = @_;
-        for my $i (0..10) {
-          return_next {'key' => $key, 'value' => $value}
-        }
-        return undef
-
-  - MAP:
-      NAME:        python_single
-      MODE:        SINGLE
-      PARAMETERS: [key text, value text]
-      RETURNS:    [key text, value text]
-      LANGUAGE:    python
-      FUNCTION: |
-        return {'key': key, 'value': value}
-
-  - MAP:
-      NAME:        python_multi
-      MODE:        MULTI
-      PARAMETERS: [key text, value text]
-      RETURNS:    [key text, value text]
-      LANGUAGE:    python
-      FUNCTION: |
-        try:
-            for i in range(0,10):
-                yield {'key': key, 'value': value}
-        except Exception, e:
-            plpy.warning(str(e))
-
-EXECUTE:
-  - RUN:
-      SOURCE: key_value_input
-      MAP:    perl_single
-
-  - RUN:
-      SOURCE: key_value_input
-      MAP:    perl_multi
-
-  - RUN:
-      SOURCE: key_value_input
-      MAP:    python_single
-
-  - RUN:
-      SOURCE: key_value_input
-      MAP:    python_multi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/network.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/network.yml.in b/src/bin/gpmapreduce/test/input/network.yml.in
deleted file mode 100644
index bd17f48..0000000
--- a/src/bin/gpmapreduce/test/input/network.yml.in
+++ /dev/null
@@ -1,42 +0,0 @@
-%YAML 1.1
----
-VERSION:         1.0.0.1
-DATABASE:        @db_user@
-USER:            @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      email
-      FILE:
-        - @hostname@:@abs_srcdir@/data/email/mailfiles
-        
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/network.1
-      DELIMITER: '|'
-
-  - MAP:
-      NAME:      msg_from_to
-      FUNCTION:  |
-        from email import message_from_file
-        msg = message_from_file(open(value))
-        if 'From' in msg and 'To' in msg:
-          me   = msg['From'].strip()
-          yall = msg['To'].split(',')
-          for you in yall:
-            yield([me, you.strip(), 1])
-      LANGUAGE:   python
-      OPTIMIZE:   STRICT IMMUTABLE
-      MODE:       MULTI
-      PARAMETERS: value text
-      RETURNS:
-        - source text
-        - target text
-        - value integer
-        
-EXECUTE:
-  - RUN:
-      SOURCE:    email
-      MAP:       msg_from_to
-      REDUCE:    SUM
-      TARGET:    out_1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/ordering.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/ordering.yml.in b/src/bin/gpmapreduce/test/input/ordering.yml.in
deleted file mode 100644
index b5a6609..0000000
--- a/src/bin/gpmapreduce/test/input/ordering.yml.in
+++ /dev/null
@@ -1,60 +0,0 @@
-%YAML 1.1
----  
-VERSION:   1.0.0.3
-USER:      @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      weblog
-      FILE:
-        - @hostname@:@abs_srcdir@/data/access_log
-        - @hostname@:@abs_srcdir@/data/access_log2
-
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/ordering.1
-      DELIMITER: '|'
-
-  - OUTPUT:
-      NAME:     out_2
-      FILE:     @abs_srcdir@/output/ordering.2
-      DELIMITER: '|'
-
-  - MAP:
-      NAME:     myMap
-      LANGUAGE: perl
-      FUNCTION: |
-        return [] unless ($_[1] =~ m/([0123456789.]+).*GET ([^ ?,]+)/);
-        return [{"key" => $1, "value" => $2}]        
-      
-  - TRANSITION:
-      NAME:     myTransition
-      LANGUAGE: perl
-      FUNCTION: |
-        return $_[1] unless $_[0];
-        return "$_[0], $_[1]";
-
-  - REDUCE:
-      NAME:        myReduce
-      INITIALIZE:  ''
-      TRANSITION:  myTransition
-      ORDERING:    value
-
-  - REDUCE:
-      NAME:        myReduce_2
-      INITIALIZE:  ''
-      TRANSITION:  myTransition
-      ORDERING:    value desc
-
-EXECUTE:
-  - RUN:
-     SOURCE:   weblog
-     MAP:      myMap
-     REDUCE:   myReduce
-     TARGET:   out_1
-
-  - RUN:
-     SOURCE:   weblog
-     MAP:      myMap
-     REDUCE:   myReduce_2
-     TARGET:   out_2

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/oreilly.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/oreilly.yml.in b/src/bin/gpmapreduce/test/input/oreilly.yml.in
deleted file mode 100644
index 691feb2..0000000
--- a/src/bin/gpmapreduce/test/input/oreilly.yml.in
+++ /dev/null
@@ -1,229 +0,0 @@
-%YAML 1.1
----
-VERSION: 1.0.0.1
-
-EXECUTE:
-  - RUN:
-      SOURCE:  ProductionJobs
-      MAP:     extractFields
-      REDUCE:  Uniquify
-      TARGET:  out_1
-      
-DEFINE:
-  
-  - OUTPUT:
-      NAME:    out_1
-      FILE:    @abs_srcdir@/output/oreilly.1
-      DELIMITER: '|'
-      
-  - REDUCE:
-      NAME:         Uniquify
-      TRANSITION:   Uniquify_transition
-      FINALIZE:     Uniquify_finalize
-
-  - TRANSITION:
-      NAME:         Uniquify_transition
-      PARAMETERS:
-        - state text
-        - id integer
-        - date_posted date
-        - date_posted_timestamp integer
-        - first_extract_date timestamp
-        - last_extract_date timestamp
-        - inter_source_hash text
-        - gap integer
-      LANGUAGE: python
-
-      # The transition function just accumulates a list of delimited records
-      FUNCTION:  |
-        import pickle;
-        
-        # newrecord = (id, date_posted, date_posted_timestamp, refind_key,
-        newrecord = (id, date_posted, date_posted_timestamp,
-                     first_extract_date, last_extract_date, inter_source_hash)
-
-        # Add the new record to the existing state, if any
-        if state == None:
-          oldlist = [gap, newrecord]
-        else:
-          oldlist = pickle.loads(state)
-          oldlist.append(newrecord)
-
-        # repickle and return
-        return pickle.dumps(oldlist)
-
-  - FINALIZE:
-      NAME:         Uniquify_finalize
-      RETURNS:
-        - id                    integer
-        - date_posted           date
-        - date_posted_timestamp integer
-        - first_extract_date    timestamp
-        - last_extract_date     timestamp
-        - inter_source_hash     text
-        - refind_index          integer
-
-      MODE: MULTI
-      LANGUAGE: python
-      FUNCTION: |
-        import pickle
-        import datetime
-
-        def date_conv(date, fmt):
-          return datetime.datetime.strptime(date, fmt)
-        date_fmt = '%Y-%m-%d'
-        
-        # Get the accumulated data for this refind_key
-        mydata = pickle.loads(state)
-
-        # The first value in the list is the 'gap' as it was
-        # passed to the transition function.
-        gap = mydata.pop(0)
-        if gap == None:
-          gap = 60
-
-        # derive the sequence
-        mydata.sort(key=lambda(x): x[1])    # date_posted is 2nd element in each tuple
-        
-        # Determine which ones are 'new' values
-        seq = 0
-        prev = mydata[0]
-        prev_date = date_conv(prev[1], date_fmt)
-        for t in mydata[1:]:
-          date_gap = date_conv(t[1], date_fmt) - prev_date;
-          if (date_gap.days > gap):
-            yield(prev[0], prev[1], prev[2], prev[3], prev[4], prev[5], seq)
-            seq += 1
-          prev = t
-        yield(prev[0], prev[1], prev[2], prev[3], prev[4], prev[5], seq)
-        
-
-  - MAP:
-      NAME:     extractFields
-      PARAMETERS:
-        - id integer
-        - date_posted date
-        - date_posted_timestamp integer
-        - refind_key text
-        - first_extract_date timestamp
-        - last_extract_date timestamp
-        - inter_source_hash text
-      RETURNS:
-        - id integer
-        - date_posted date
-        - date_posted_timestamp integer
-        - refind_key text
-        - first_extract_date timestamp
-        - last_extract_date timestamp
-        - inter_source_hash text
-      MODE:     MULTI
-      LANGUAGE: python
-      FUNCTION: |
-        if date_posted:
-          yield [id, date_posted, date_posted_timestamp, refind_key,
-                 first_extract_date, last_extract_date, inter_source_hash]
-      
-  - INPUT:
-      NAME:      ProductionJobs
-      FILE:        @hostname@:@abs_srcdir@/data/ProductionJobs.txt
-      FORMAT:      CSV
-      ERROR_LIMIT:  1000
-      NULL:        '\\N'
-      QUOTE:        '"'
-      COLUMNS:
-        - id integer
-        - dummy1 text
-        - dummy2 text
-        - dummy3 text
-        - dummy4 text
-        - dummy5 text
-        - dummy6 text 
-        - dummy7 text
-        - dummy8 text
-        - dummy9 text
-        - dummy10 text
-        - dummy11 text
-        - dummy12 text
-        - dummy13 text
-        - dummy14 text
-        - dummy15 text
-        - dummy16 text  
-        - dummy17 text
-        - dummy18 text
-        - dummy19 text
-        - dummy20 text
-        - dummy21 text
-        - dummy22 text
-        - dummy23 text
-        - dummy24 text
-        - dummy25 text
-        - dummy26 text  
-        - dummy27 text
-        - dummy28 text
-        - dummy29 text
-        - dummy30 text
-        - dummy31 text
-        - dummy32 text
-        - dummy33 text
-        - dummy34 text
-        - dummy35 text
-        - dummy36 text  
-        - dummy37 text
-        - dummy38 text
-        - date_posted  date
-        - dummy40 text
-        - date_posted_timestamp integer
-        - dummy42 text
-        - dummy43 text
-        - dummy44 text
-        - dummy45 text
-        - dummy46 text  
-        - dummy47 text
-        - dummy48 text
-        - dummy49 text
-        - dummy50 text
-        - dummy51 text
-        - dummy52 text
-        - dummy53 text
-        - dummy54 text
-        - dummy55 text
-        - dummy56 text  
-        - dummy57 text
-        - dummy58 text
-        - dummy59 text
-        - dummy60 text
-        - dummy61 text
-        - dummy62 text
-        - dummy63 text
-        - dummy64 text
-        - dummy65 text
-        - dummy66 text  
-        - dummy67 text
-        - dummy68 text
-        - dummy69 text
-        - dummy70 text
-        - dummy71 text
-        - dummy72 text
-        - dummy73 text
-        - refind_key text
-        - first_extract_date timestamp
-        - last_extract_date timestamp
-        - dummy77 text
-        - dummy78 text
-        - dummy79 text
-        - dummy80 text
-        - dummy81 text
-        - dummy82 text
-        - dummy83 text
-        - dummy84 text
-        - dummy85 text
-        - dummy86 text  
-        - dummy87 text
-        - dummy88 text
-        - dummy89 text
-        - dummy90 text
-        - dummy91 text
-        - inter_source_hash text
-        - dummy93 text
-
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/overwrite_retval_multiple.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/overwrite_retval_multiple.yml.in b/src/bin/gpmapreduce/test/input/overwrite_retval_multiple.yml.in
deleted file mode 100644
index acc692a..0000000
--- a/src/bin/gpmapreduce/test/input/overwrite_retval_multiple.yml.in
+++ /dev/null
@@ -1,47 +0,0 @@
-%YAML 1.1
----
-VERSION:   1.0.0.1
-USER:      @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      data
-      QUERY: "select * from simple"
-      COLUMNS:  [m int, n int]
-
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/overwrite_retval_multiple.1
-      DELIMITER: '|'
-
-  - FINALIZE:
-      NAME: retcomposite 
-      PARAMETERS:
-        - state int 
-      RETURNS:
-        - f1_ integer
-        - f2_ integer
-        - f3_ integer 
-
-  - TRANSITION:
-      NAME: tran 
-      PARAMETERS:
-        - m int 
-        - n int
-      RETURNS:
-        - state int 
-  
-  - REDUCE:
-      NAME: reducer 
-      TRANSITION: tran 
-      FINALIZE: retcomposite
-   
-  - TASK:
-       NAME: worker
-       SOURCE: data 
-       REDUCE: reducer 
-
-EXECUTE:
-  - RUN:
-      SOURCE:  worker
-      TARGET:  out_1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/overwrite_retval_single.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/overwrite_retval_single.yml.in b/src/bin/gpmapreduce/test/input/overwrite_retval_single.yml.in
deleted file mode 100644
index fb506fd..0000000
--- a/src/bin/gpmapreduce/test/input/overwrite_retval_single.yml.in
+++ /dev/null
@@ -1,47 +0,0 @@
-%YAML 1.1
----
-VERSION:   1.0.0.1
-USER:      @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      data
-      QUERY: "select * from simple"
-      COLUMNS:  [m int, n int]
-
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/overwrite_retval_single.1
-      DELIMITER: '|'
-
-  - FINALIZE:
-      NAME: final 
-      FUNCTION: final 
-      PARAMETERS:
-        - arg1 int 
-      RETURNS:
-        - retval int 
-
-  - TRANSITION:
-      NAME: tran 
-      PARAMETERS:
-        - m int 
-        - n int
-      RETURNS:
-        - state int 
-        
-  
-  - REDUCE:
-      NAME: reducer 
-      TRANSITION: tran 
-      FINALIZE: final
-   
-  - TASK:
-       NAME: worker
-       SOURCE: data 
-       REDUCE: reducer 
-
-EXECUTE:
-  - RUN:
-      SOURCE:  worker 
-      TARGET:  out_1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/overwrite_retval_table.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/overwrite_retval_table.yml.in b/src/bin/gpmapreduce/test/input/overwrite_retval_table.yml.in
deleted file mode 100644
index f06f711..0000000
--- a/src/bin/gpmapreduce/test/input/overwrite_retval_table.yml.in
+++ /dev/null
@@ -1,47 +0,0 @@
-%YAML 1.1
----
-VERSION:   1.0.0.1
-USER:      @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      data
-      QUERY: "select * from simple"
-      COLUMNS:  [m int, n int]
-
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/overwrite_retval_table.1
-      DELIMITER: '|'
-
-  - FINALIZE:
-      NAME: retcomposite 
-      PARAMETERS:
-        - state int 
-      RETURNS:
-        - f1_ integer
-        - f2_ integer
-        - f3_ integer 
-
-  - TRANSITION:
-      NAME: tran 
-      PARAMETERS:
-        - m int 
-        - n int
-      RETURNS:
-        - state int 
-  
-  - REDUCE:
-      NAME: reducer 
-      TRANSITION: tran 
-      FINALIZE: retcomposite
-   
-  - TASK:
-       NAME: worker
-       SOURCE: data 
-       REDUCE: reducer 
-
-EXECUTE:
-  - RUN:
-      SOURCE:  worker
-      TARGET:  out_1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/pagerank.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/pagerank.yml.in b/src/bin/gpmapreduce/test/input/pagerank.yml.in
deleted file mode 100644
index 695e06f..0000000
--- a/src/bin/gpmapreduce/test/input/pagerank.yml.in
+++ /dev/null
@@ -1,41 +0,0 @@
-%YAML 1.1
----  
-VERSION:   1.0.0.1
-USER:      @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      network
-      FILE:      @hostname@:@abs_srcdir@/data/www.small.dat
-      COLUMNS:   [key text, value text]
-      DELIMITER: '|'
-
-  - INPUT:
-      NAME:     network_graph
-      QUERY: |
-        SELECT key, value, count(*) over (partition by key) as outfactor
-        FROM   network
-
-  - INPUT:
-      NAME:     network_rank
-      QUERY: |
-        SELECT key, .85 as value
-        FROM   network
-        GROUP BY key
-
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/pagerank.1
-      DELIMITER: '|'
-      
-  - TRANSITION:
-      NAME:       pagerank_transition
-      PARAMETERS: [state float, rank float, outfactor integer]
-      LANGUAGE: plperl
-      FUNCTION: |
-        return .85*$rank/$outfactor
-        
-EXECUTE:
-  - RUN:
-      SOURCE: network_rank
-      TARGET: out_1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/sort.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/sort.yml.in b/src/bin/gpmapreduce/test/input/sort.yml.in
deleted file mode 100644
index a5c49a2..0000000
--- a/src/bin/gpmapreduce/test/input/sort.yml.in
+++ /dev/null
@@ -1,19 +0,0 @@
-%YAML 1.1
----
-VERSION:         1.0.0.1
-
-DEFINE:
-  - INPUT:
-      NAME:      access_log
-      FILE:
-        - @hostname@:@abs_srcdir@/data/access_log
-        - @hostname@:@abs_srcdir@/data/access_log2
-
-  - OUTPUT:
-      NAME:     sort_out
-      FILE:     @abs_srcdir@/output/sort.1
-
-EXECUTE:
-  - RUN:
-      SOURCE: access_log
-      TARGET: sort_out

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/unload.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/unload.yml.in b/src/bin/gpmapreduce/test/input/unload.yml.in
deleted file mode 100644
index 9260b25..0000000
--- a/src/bin/gpmapreduce/test/input/unload.yml.in
+++ /dev/null
@@ -1,45 +0,0 @@
----
-VERSION:         1.0.0.1
-DEFINE:
-  - INPUT:
-      NAME:      unload_input
-      QUERY:     |
-        SELECT gp_execution_segment() as id, textin(record_out(row)) as tuple
-        FROM   unload_test row;
-
-  - MAP:
-      NAME:       unload_map
-      LANGUAGE:   perlu
-      PARAMETERS:
-        - id     integer
-        - tuple  text
-      RETURNS:
-        - value  integer
-      MODE: single
-      FUNCTION: |
-        # It is slightly faster to refer to parameters directly
-        #   my ($id, $tuple) = @_
-        
-        # strip parens from tuple, add newline
-        $tuple = substr($_[1], 1, -1) . "\n";
-
-        # Get the filehandle
-        my $file = $_SHARED{'file'};
-        if (not defined $file) {
-           my $filename = "@abs_srcdir@/output/unload_$_[0]";
-           open($file, ">$filename") or die "Unable to open file: $filename ($!)";
-           $_SHARED{'file'} = $file;
-        }
-        
-        # Write the tuple out to the file
-        print $file $tuple;
-
-        # print happens to return 1 on success.
-        # we can eek out a little extra performance using that is the return value
-        #   return 1;
-
-EXECUTE:
-  - RUN:
-      SOURCE:    unload_input
-      MAP:       unload_map
-      REDUCE:    COUNT

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/wordcount.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/wordcount.yml.in b/src/bin/gpmapreduce/test/input/wordcount.yml.in
deleted file mode 100644
index dc64a3a..0000000
--- a/src/bin/gpmapreduce/test/input/wordcount.yml.in
+++ /dev/null
@@ -1,99 +0,0 @@
-%YAML 1.1
----
-VERSION:         1.0.0.1
-DATABASE:        @db_user@
-USER:            @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      email
-      FILE:
-        - @hostname@:@abs_srcdir@/data/email/mailfiles
-
-  - OUTPUT:
-      NAME:     out_1
-      FILE:     @abs_srcdir@/output/wordcount.1
-      DELIMITER: '|'
-
-  # The original example for this used nltk for word stemming and
-  # tokenization, but it was simplified for testing to simply due
-  # whitespace tokenization and no stemming.
-  #
-  # The reason for the simplification is that not all test machines
-  # have nltk installed.
-  - MAP:
-      NAME:      wordsplit_python
-      FUNCTION:  |
-        from email import message_from_file
-        text      = message_from_file(open(value)).get_payload()
-
-        # Old nltk version
-        #import nltk
-        #tokenizer = nltk.WordTokenizer()
-        #stemmer   = nltk.PorterStemmer()
-        #stopwords = nltk.corpus.stopwords.words()
-        #tokens    = tokenizer.tokenize(text) 
-        #stems     = map(lambda(x): stemmer.stem(x.lower()), tokens)
-        
-
-        # New version
-        #  Results are obviously not the same as the above since the stemming
-        #  in particular is pretty dumb, but it gets the right general idea
-        #  across
-        from string import maketrans
-        stopwords  = ["at", "aft", "ar", "is", "be", "it",
-                      "to", "for", "from", "few", "ha", "last", "lik",
-                      "now", "no", "not", "on", "ov", "se", "up", "who",
-                      "which", "within", "what", "if", "into", "out",
-                      "som", "soon", "they", "that", "you", "with", "of", "will",
-                      "her", "him",
-                      "or", "in", "thes", "ther", "all", "any", "th", "away",
-                      "could", "each", "end", "should", "help", "next"]
-        trailing   = ["ation", "ments",
-                      "ated", "able", "ment",
-                      "ent", "ers", "ing", "ful", "ion",
-                      "al", "ed", "er", "es", "ly",
-                      "e", "s"]
-        tokens     = ''.join(map(lambda(x): x.isalnum() and x or ' ', text.lower())).split()
-        def remove_trailing(x):
-          for ending in trailing:
-            if x.endswith(ending):
-              return x[0:-len(ending)]
-          return x
-        stems = map(remove_trailing, tokens)
-        stems = filter(lambda(x): len(x) > 1, stems)
-
-        
-        # filter stopwords and return results
-        words      = filter(lambda(x): x not in stopwords and not x.isdigit(), stems)
-
-        return map(lambda(x): [x, 1], words)
-      LANGUAGE:   python
-      OPTIMIZE:   STRICT IMMUTABLE
-      PARAMETERS: value text
-      RETURNS:
-        - key text
-        - value integer
-
-  - MAP:
-      NAME:      reverse_python
-      FUNCTION:  |
-        return (value, key)
-      LANGUAGE:  python
-      OPTIMIZE:  STRICT IMMUTABLE
-      MODE:      SINGLE
-      RETURNS:
-        - key integer
-        - value text
-      
-  - TASK:
-      NAME:      email_histogram
-      SOURCE:    email
-      MAP:       wordsplit_python
-      REDUCE:    SUM
-        
-EXECUTE:
-  - RUN:
-      SOURCE:    email_histogram
-      MAP:       reverse_python
-      TARGET:    out_1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/input/xml.yml.in
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/input/xml.yml.in b/src/bin/gpmapreduce/test/input/xml.yml.in
deleted file mode 100644
index 7d6edde..0000000
--- a/src/bin/gpmapreduce/test/input/xml.yml.in
+++ /dev/null
@@ -1,47 +0,0 @@
-%YAML 1.1
----
-VERSION:         1.0.0.1
-DATABASE:        @db_user@
-USER:            @db_user@
-
-DEFINE:
-  - INPUT:
-      NAME:      xml
-      FILE:
-        - @hostname@:@abs_srcdir@/data/xml.dat
-      DELIMITER: '|'
-      COLUMNS:
-        - key integer
-        - value text
-
-  - OUTPUT:
-      NAME:      out_1
-      FILE:      @abs_srcdir@/output/xml.1
-      DELIMITER: '|'
-        
-  - MAP:
-      NAME:      xml_extract
-      FUNCTION:  |
-        import re
-        myre  = re.compile('([0-9]*)</item>')
-        vlist = filter(lambda(x): myre.search(x), value.split('<item>'))
-        rval = []
-        for pos in range(0,len(vlist)):
-          rval.append([key, myre.search(vlist[pos]).group(1), pos])
-        return rval
-      LANGUAGE:   python
-      OPTIMIZE:   STRICT IMMUTABLE
-      MODE:       MULTI
-      PARAMETERS:
-        - key   integer
-        - value text
-      RETURNS:
-        - key   integer
-        - value integer
-        - pos   integer
-        
-EXECUTE:
-  - RUN:
-      SOURCE:    xml
-      MAP:       xml_extract
-      TARGET:    out_1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/lib/Makefile
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/lib/Makefile b/src/bin/gpmapreduce/test/lib/Makefile
deleted file mode 100644
index 9cee8d2..0000000
--- a/src/bin/gpmapreduce/test/lib/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES = gpmrdemo
-
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/lib/gpmrdemo.c
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/lib/gpmrdemo.c b/src/bin/gpmapreduce/test/lib/gpmrdemo.c
deleted file mode 100644
index dd2738a..0000000
--- a/src/bin/gpmapreduce/test/lib/gpmrdemo.c
+++ /dev/null
@@ -1,348 +0,0 @@
-#include "postgres.h"
-#include "fmgr.h"
-#include "funcapi.h"
-#include "catalog/pg_type.h"      /* oids of known types */
-#include "utils/builtins.h"       /* Builtin functions, including lower() */
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <strings.h>
-
-/* Do the module magic dance */
-#ifdef PG_MODULE_MAGIC
-PG_MODULE_MAGIC;
-#endif
-PG_FUNCTION_INFO_V1(wordsplit);
-PG_FUNCTION_INFO_V1(int4_accum);
-PG_FUNCTION_INFO_V1(int8_add);
-PG_FUNCTION_INFO_V1(tran);
-PG_FUNCTION_INFO_V1(final);
-PG_FUNCTION_INFO_V1(retcomposite);
-
-
-/* Declare the functions as module exports */
-
-int tran(PG_FUNCTION_ARGS);
-int final(PG_FUNCTION_ARGS);
-Datum retcomposite(PG_FUNCTION_ARGS);
-Datum wordsplit(PG_FUNCTION_ARGS);
-Datum int4_accum(PG_FUNCTION_ARGS);
-Datum int8_add(PG_FUNCTION_ARGS);
-
-const char* wordsplit_str = "gpmrdemo:wordsplit()";
-const char* accum_str = "gpmrdemo:int4_accum()";
-const char* add_str   = "gpmrdemo:int8_add()";
-
-
-/* 
- * In this case the state structure is so simple that this is unnecessary,
- * but frequently a more complex user state is needed, this demonstrates
- * how that may be accomplished.
- */
-typedef struct {
-	char *string;
-} wordsplit_state;
-
-/* Define the functions */
-Datum 
-wordsplit(PG_FUNCTION_ARGS)
-{
-	FuncCallContext     *funcctx;
-    TupleDesc            tupdesc;
-	wordsplit_state     *myState;
-	char                *word;
-	HeapTuple            res;
-	Datum                result;
-	Datum                values[2];
-	bool                 nulls[2] = {false, false};
-
-	/* stuff done only on the first call of the function */
-	if (SRF_IS_FIRSTCALL())
-	{
-        MemoryContext   oldcontext;
-		
-        /* create a function context for cross-call persistence */
-        funcctx = SRF_FIRSTCALL_INIT();
-
-        /* switch to memory context appropriate for multiple function calls */
-        oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
-
-        /* Build a tuple descriptor for our result type */
-        if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
-            ereport(ERROR,
-                    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                     errmsg("function returning record called in context "
-                            "that cannot accept type record")));
-
-        /* Bless the tuple descriptor for later use */
-		funcctx->tuple_desc = BlessTupleDesc(tupdesc);
-
-		/* Allocate a cross call user state */
-		funcctx->user_fctx = palloc0(sizeof(wordsplit_state));
-		myState = (wordsplit_state*) funcctx->user_fctx;
-
-		/* Extract needed information from input parameters */
-		if (PG_ARGISNULL(0))
-		{
-			myState->string = NULL;
-		}
-		else
-		{
-			/* Fetch the input parameter */
-			Datum d = PG_GETARG_DATUM(0);
-
-			/* Use a builtin function definition to convert it to lower case */
-			d = DirectFunctionCall1(lower, d);
-
-			/* Convert the datum into a cstring for our use */
-			myState->string = TextDatumGetCString(d);
-		}
-		
-		/* Restore the per-call memory context */
-        MemoryContextSwitchTo(oldcontext);
-    }
-
-    /* stuff done on every call of the function */
-    funcctx = SRF_PERCALL_SETUP();
-	myState = (wordsplit_state*) funcctx->user_fctx;
-
-
-	/* Handle the case of null input */
-	if (!myState->string)
-	{
-		SRF_RETURN_DONE(funcctx);
-	}
-
-	/*
-	 * Begin messy string handling in "C", this would be so much nicer
-	 * in any more advanced language...
-	 */
-
-	/* Scan forward to the next word character */
-	while (myState->string[0] < 'a' || myState->string[0] > 'z')
-	{
-		/* If we hit the end then we are done */
-		if (myState->string[0] == '\0')
-			SRF_RETURN_DONE(funcctx);
-		myState->string++;
-	}
-
-	/* Find the next word */
-	word = myState->string;
-
-	/* Scan forward until the end of the word */
-	while (myState->string[0] >= 'a' && myState->string[0] <= 'z')
-		myState->string++;
-
-	/* 
-	 * If we terminated on whitespace then advance to the next non-whitespace
-	 * character.
-	 */
-	if (myState->string[0] != '\0')
-	{
-		myState->string[0] = '\0';
-		myState->string++;
-	}
-
-	/*
-	 * We have our word, and now need to construct the return tuple of:
-	 *    (word, 1)
-	 */
-	values[0] = CStringGetTextDatum(word);
-	values[1] = Int32GetDatum(1);
-
-	/* Construct the Tuple */
-	res = heap_form_tuple(funcctx->tuple_desc, values, nulls);
-
-	/* Convert the Tuple into a Datum */
-	result = HeapTupleGetDatum(res);
-
-	/* Return the tuple */
-	SRF_RETURN_NEXT(funcctx, result);
-}
-
-Datum 
-int4_accum(PG_FUNCTION_ARGS)
-{
-	int64   state;
-    int32   value;
-
-	/*
-	 * GUARD against an incorrectly defined SQL function by verifying
-	 * that the parameters are the types we are expecting: 
-	 *    int4_accum(int64, int32) => int64
-	 */
-	if (PG_NARGS() != 2)
-	{
-		elog(ERROR, "%s defined with %d arguments, expected 2", 
-			 accum_str, PG_NARGS() );
-	}
-	if (get_fn_expr_argtype(fcinfo->flinfo, 0) != INT8OID ||
-		get_fn_expr_argtype(fcinfo->flinfo, 1) != INT4OID)
-	{
-		elog(ERROR, "%s defined with invalid types, expected (int8, int4)",
-			 accum_str );
-	}
-	if (get_fn_expr_rettype(fcinfo->flinfo) != INT8OID)
-	{
-		elog(ERROR, "%s defined with invalid return type, expected int8",
-			 accum_str );
-	}
-
-	/* 
-	 * GUARD against NULL input:
-	 *  - IF both are null return NULL
-	 *  - otherwise treat NULL as a zero value
-	 */
-	if (PG_ARGISNULL(0) && PG_ARGISNULL(1))
-		PG_RETURN_NULL();
-	state = PG_ARGISNULL(0) ? 0 : PG_GETARG_INT64(0);
-	value = PG_ARGISNULL(1) ? 0 : PG_GETARG_INT32(1);
-
-	/* Do the math and return the result */
-    PG_RETURN_INT64(state + value);
-}
-
-
-
-Datum 
-int8_add(PG_FUNCTION_ARGS)
-{
-	int64   state1;
-    int64   state2;
-
-	/*
-	 * GUARD against an incorrectly defined SQL function by verifying
-	 * that the parameters are the types we are expecting: 
-	 *    int8_add(int64, int64) => int64
-	 */
-	if (PG_NARGS() != 2)
-	{
-		elog(ERROR, "%s defined with %d arguments, expected 2", 
-			 add_str, PG_NARGS() );
-	}
-	if (get_fn_expr_argtype(fcinfo->flinfo, 0) != INT8OID ||
-		get_fn_expr_argtype(fcinfo->flinfo, 1) != INT8OID)
-	{
-		elog(ERROR, "%s defined with invalid types, expected (int8, int8)",
-			 add_str );
-	}
-	if (get_fn_expr_rettype(fcinfo->flinfo) != INT8OID)
-	{
-		elog(ERROR, "%s defined with invalid return type, expected int8",
-			 add_str );
-	}
-
-	/* 
-	 * GUARD against NULL input:
-	 *  - IF both are null return NULL
-	 *  - otherwise treat NULL as a zero value
-	 */
-	if (PG_ARGISNULL(0) && PG_ARGISNULL(1))
-		PG_RETURN_NULL();
-	state1 = PG_ARGISNULL(0) ? 0 : PG_GETARG_INT64(0);
-	state2 = PG_ARGISNULL(1) ? 0 : PG_GETARG_INT64(1);
-
-	/* Do the math and return the result */
-    PG_RETURN_INT64(state1 + state2);
-}
-
-int tran(PG_FUNCTION_ARGS)
-{
-    int state = PG_GETARG_INT32(0);
-    int arg2 = PG_GETARG_INT32(1);
-
-    if (state > 0)
-    {
-        arg2 = state + arg2;
-    }
-    return arg2;
-}
-
-int final(PG_FUNCTION_ARGS)
-{
-    int a = PG_GETARG_INT32(0);
-    
-    PG_RETURN_INT32(a);
-}
-
-Datum retcomposite(PG_FUNCTION_ARGS)
-{
-    FuncCallContext     *funcctx;
-    int                  call_cntr;
-    int                  max_calls;
-    TupleDesc            tupdesc;
-    AttInMetadata       *attinmeta;
-
-     /* stuff done only on the first call of the function */
-     if (SRF_IS_FIRSTCALL())
-     {
-        MemoryContext   oldcontext;
-
-        /* create a function context for cross-call persistence */
-        funcctx = SRF_FIRSTCALL_INIT();
-
-        /* switch to memory context appropriate for multiple function calls */
-        oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
-
-        /* total number of tuples to be returned */
-        //funcctx->max_calls = PG_GETARG_UINT32(0);
-        funcctx->max_calls = 1;
-
-        /* Build a tuple descriptor for our result type */
-        if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
-            ereport(ERROR,
-                    (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                     errmsg("function returning record called in context "
-                            "that cannot accept type record")));
-
-        /*
-         * generate attribute metadata needed later to produce tuples from raw
-         * C strings
-         */
-        attinmeta = TupleDescGetAttInMetadata(tupdesc);
-        funcctx->attinmeta = attinmeta;
-
-        MemoryContextSwitchTo(oldcontext);
-    }
-
-    /* stuff done on every call of the function */
-    funcctx = SRF_PERCALL_SETUP();
-
-    call_cntr = funcctx->call_cntr;
-    max_calls = 1;
-    attinmeta = funcctx->attinmeta;
- 
-    if (call_cntr < max_calls)    /* do when there is more left to send */
-    {
-        char       **values;
-        HeapTuple    tuple;
-        Datum        result;
-
-        /*
-         * Prepare a values array for building the returned tuple.
-         * This should be an array of C strings which will
-         * be processed later by the type input functions.
-         */
-        values = (char **) palloc(3 * sizeof(char *));
-        values[0] = (char *) palloc(16 * sizeof(char));
-        values[1] = (char *) palloc(16 * sizeof(char));
-        values[2] = (char *) palloc(16 * sizeof(char));
-
-        snprintf(values[0], 16, "%d", 1*  PG_GETARG_INT32(0));
-        snprintf(values[1], 16, "%d", 2*  PG_GETARG_INT32(0));
-        snprintf(values[2], 16, "%d", 3*  PG_GETARG_INT32(0));
-
-        /* build a tuple */
-        tuple = BuildTupleFromCStrings(attinmeta, values);
-
-        /* make the tuple into a datum */
-        result = HeapTupleGetDatum(tuple);
-
-        SRF_RETURN_NEXT(funcctx, result);
-    }
-    else    /* do when there is no more left */
-    {
-        SRF_RETURN_DONE(funcctx);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/output/badplperl.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/output/badplperl.err b/src/bin/gpmapreduce/test/output/badplperl.err
deleted file mode 100644
index d72f56b..0000000
--- a/src/bin/gpmapreduce/test/output/badplperl.err
+++ /dev/null
@@ -1,10 +0,0 @@
--- start_matchsubs
--- m/mapreduce_\d+_run/
--- s/mapreduce_\d+/mapreduce_DUMMY/
--- m/\(\w+.\w+:[0-9]+\)$/
--- s/\(\w+.\w+:[0-9]+\)$/\(file:line\)/
--- end_matchsubs
-ERROR:  creation of Perl function failed
-DETAIL:  syntax error at line 23, near "}GABLECK"
-syntax error at line 26, near "; }"
-Error: Object creation Failure

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/output/badplperl.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/output/badplperl.out b/src/bin/gpmapreduce/test/output/badplperl.out
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/builtin_1_init.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/builtin_1_init.sql b/src/bin/gpmapreduce/test/sql/builtin_1_init.sql
deleted file mode 100644
index a49285a..0000000
--- a/src/bin/gpmapreduce/test/sql/builtin_1_init.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-CREATE TYPE wordsplit_out AS (key text, value int4);
-
-CREATE FUNCTION wordsplit_1(text) returns setof wordsplit_out as '$libdir/gpmrdemo', 'wordsplit' language C;
-CREATE FUNCTION wordsplit_2(IN value text, OUT key text, OUT value int4) returns setof record as '$libdir/gpmrdemo', 'wordsplit' language C;
-
-CREATE FUNCTION myadd(int8, int4) returns int8 as '$libdir/gpmrdemo', 'int4_accum' language C;
-CREATE FUNCTION mysum(int8, int8) returns int8 as '$libdir/gpmrdemo', 'int8_add' language C;
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/input_done.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/input_done.sql b/src/bin/gpmapreduce/test/sql/input_done.sql
deleted file mode 100644
index c227896..0000000
--- a/src/bin/gpmapreduce/test/sql/input_done.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-select * from output.qualified order by a;
-
-drop table input.qualified;
-drop table output.qualified;
-drop schema input cascade;
-drop schema output cascade;

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/input_init.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/input_init.sql b/src/bin/gpmapreduce/test/sql/input_init.sql
deleted file mode 100644
index 6c7bf64..0000000
--- a/src/bin/gpmapreduce/test/sql/input_init.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-create schema input;
-create schema output;
-create table input.qualified(a int, b text) distributed by (a);
-insert into input.qualified values(1, 'one');
-insert into input.qualified values(2, 'two');

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/kmeans_done.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/kmeans_done.sql b/src/bin/gpmapreduce/test/sql/kmeans_done.sql
deleted file mode 100644
index 8a183ea..0000000
--- a/src/bin/gpmapreduce/test/sql/kmeans_done.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-select * from termfreqs order by key;
-
-drop table if exists termfreqs;

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/member_kw_done.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/member_kw_done.sql b/src/bin/gpmapreduce/test/sql/member_kw_done.sql
deleted file mode 100644
index 62ca173..0000000
--- a/src/bin/gpmapreduce/test/sql/member_kw_done.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-select * from member_keywords_1;
-
-select * from member_keywords_2;
-
-drop table if exists member_keywords_1;
-drop table if exists member_keywords_2;
-drop table if exists member_summary;
-drop table if exists keywords;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/member_kw_init.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/member_kw_init.sql b/src/bin/gpmapreduce/test/sql/member_kw_init.sql
deleted file mode 100644
index a00de43..0000000
--- a/src/bin/gpmapreduce/test/sql/member_kw_init.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-create table member_summary (member_id int, text text) distributed by (member_id);
-create table keywords (keyword_id int, keyword text) distributed by (keyword_id);
-
-insert into member_summary values
-  (1, 'Interested in software development and software profiling');
-
-insert into keywords values (100, 'software engineer');
-
-insert into keywords values (101, 'software development');
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/overwrite_retval_multiple_done.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/overwrite_retval_multiple_done.sql b/src/bin/gpmapreduce/test/sql/overwrite_retval_multiple_done.sql
deleted file mode 100644
index 1574b99..0000000
--- a/src/bin/gpmapreduce/test/sql/overwrite_retval_multiple_done.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop table simple;
-
-drop function tran(value int, value int);
-
-drop function retcomposite(IN integer, OUT integer, OUT integer, OUT integer);

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/overwrite_retval_multiple_init.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/overwrite_retval_multiple_init.sql b/src/bin/gpmapreduce/test/sql/overwrite_retval_multiple_init.sql
deleted file mode 100644
index 39416a8..0000000
--- a/src/bin/gpmapreduce/test/sql/overwrite_retval_multiple_init.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-create table simple(m int,n int) distributed randomly;
-insert into simple values (1,10);
-insert into simple values (2,20);
-insert into simple values (2,21);
-insert into simple values (2,22);
-insert into simple values (3,30);
-insert into simple values (4,40);
-insert into simple values (5,50);
-insert into simple values (5,50);
-insert into simple values (10,100);
-insert into simple values (2,21);
-
-create or replace function tran (value int, value int) returns int language 'C' as '$libdir/gpmrdemo', 'tran';
-
-CREATE OR REPLACE FUNCTION retcomposite(IN integer,
-OUT f1 integer, OUT integer, OUT f3 integer)
-RETURNS SETOF record
-AS '$libdir/gpmrdemo', 'retcomposite'
-LANGUAGE C IMMUTABLE STRICT;

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/overwrite_retval_single_done.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/overwrite_retval_single_done.sql b/src/bin/gpmapreduce/test/sql/overwrite_retval_single_done.sql
deleted file mode 100644
index 64d21bb..0000000
--- a/src/bin/gpmapreduce/test/sql/overwrite_retval_single_done.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop table simple;
-
-drop function tran(value int, value int);
-
-drop function final(IN integer, OUT integer);

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/overwrite_retval_single_init.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/overwrite_retval_single_init.sql b/src/bin/gpmapreduce/test/sql/overwrite_retval_single_init.sql
deleted file mode 100644
index ef37c76..0000000
--- a/src/bin/gpmapreduce/test/sql/overwrite_retval_single_init.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-create table simple(m int,n int) distributed randomly;
-insert into simple values (1,10);
-insert into simple values (2,20);
-insert into simple values (2,21);
-insert into simple values (2,22);
-insert into simple values (3,30);
-insert into simple values (4,40);
-insert into simple values (5,50);
-insert into simple values (5,50);
-insert into simple values (10,100);
-insert into simple values (2,21);
-
-create function tran (value int, value int) returns int language 'C' as '$libdir/gpmrdemo', 'tran';
-
-CREATE OR REPLACE FUNCTION final(IN integer,
-OUT integer)
-RETURNS integer
-AS '$libdir/gpmrdemo', 'final'
-LANGUAGE C IMMUTABLE STRICT;

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/overwrite_retval_table_done.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/overwrite_retval_table_done.sql b/src/bin/gpmapreduce/test/sql/overwrite_retval_table_done.sql
deleted file mode 100644
index a01811f..0000000
--- a/src/bin/gpmapreduce/test/sql/overwrite_retval_table_done.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-drop table simple;
-
-drop function tran(value int, value int, out integer);
-
-drop function retcomposite(IN integer);

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/overwrite_retval_table_init.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/overwrite_retval_table_init.sql b/src/bin/gpmapreduce/test/sql/overwrite_retval_table_init.sql
deleted file mode 100644
index 01c3c2d..0000000
--- a/src/bin/gpmapreduce/test/sql/overwrite_retval_table_init.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-create table simple(m int,n int) distributed randomly;
-insert into simple values (1,10);
-insert into simple values (2,20);
-insert into simple values (2,21);
-insert into simple values (2,22);
-insert into simple values (3,30);
-insert into simple values (4,40);
-insert into simple values (5,50);
-insert into simple values (5,50);
-insert into simple values (10,100);
-insert into simple values (2,21);
-
-create or replace function tran (value int, value int, out ret integer) returns integer language 'C' as '$libdir/gpmrdemo', 'tran';
-
-CREATE OR REPLACE FUNCTION retcomposite(IN integer)
-RETURNS TABLE(x integer, y integer, z integer)
-AS '$libdir/gpmrdemo', 'retcomposite'
-LANGUAGE C IMMUTABLE STRICT;

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/unload_done.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/unload_done.sql b/src/bin/gpmapreduce/test/sql/unload_done.sql
deleted file mode 100644
index 71fa14a..0000000
--- a/src/bin/gpmapreduce/test/sql/unload_done.sql
+++ /dev/null
@@ -1 +0,0 @@
-drop table if exists unload_test;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/sql/unload_init.sql
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/sql/unload_init.sql b/src/bin/gpmapreduce/test/sql/unload_init.sql
deleted file mode 100644
index 5add471..0000000
--- a/src/bin/gpmapreduce/test/sql/unload_init.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-create table unload_test (f1 int, f2 text , f3 text) distributed by (f1);
-
-copy unload_test from stdin;
-1	one	uno
-2	two	dos
-3	three	treis
-4	four	cuatro
-5	\N	\N
-6	null	null
-7	text with space	"text" with 'quotes'
-\.

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/yml/kmeans.yml
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/yml/kmeans.yml b/src/bin/gpmapreduce/test/yml/kmeans.yml
deleted file mode 100644
index b915c57..0000000
--- a/src/bin/gpmapreduce/test/yml/kmeans.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-%YAML 1.1
----  
-VERSION:   1.0.0.1
-
-DEFINE:
-  - INPUT:
-      NAME: blogdata
-      FILE: maple:/Users/cwelton/dev/cdb2/main/src/bin/gpmapreduce/test/data/blognormal.txt
-      DELIMITER: ';'
-      COLUMNS:
-        - blog text
-        - term text
-        - value float
-        
-  - MAP:
-      NAME: termvalue
-      PARAMETERS: [blog,term,value]
-      LANGUAGE: python
-      RETURNS: [key text,value float]
-      MODE: SINGLE
-      FUNCTION: |
-        return {'key': term, 'value': value}
-      
-  - REDUCE:
-      NAME: min_and_max
-      TRANSITION: mm_trans
-      FINALIZE: unpack_mm
-
-  - TRANSITION:
-      NAME: mm_trans
-      LANGUAGE: python
-      FUNCTION: |
-        if state==None:
-          min=max=0
-        else:
-          [min,max] = state.split(',')
-        if value < min:
-          min = value
-        if value > max: 
-          max = value 
-        return str(min)+","+str(max)
-
-  - FINALIZE:
-      NAME: unpack_mm
-      LANGUAGE: python
-      RETURNS: [min, max]
-      MODE: SINGLE
-      FUNCTION: |
-         a = state.split(',')
-         return {'min':a[0], 'max':a[1]}
-         
-  - OUTPUT:
-      NAME: termfreqs_table
-      TABLE: termfreqs
-      MODE: REPLACE
-         
-EXECUTE:
-  - RUN:
-      SOURCE: blogdata
-      MAP: termvalue
-      REDUCE: min_and_max
-      TARGET: termfreqs_table
\ No newline at end of file


[09/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
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


[06/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/yaml-0.1.1/Makefile
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/yaml-0.1.1/Makefile b/src/bin/gpmapreduce/yaml-0.1.1/Makefile
deleted file mode 100644
index 05e9d78..0000000
--- a/src/bin/gpmapreduce/yaml-0.1.1/Makefile
+++ /dev/null
@@ -1,632 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-srcdir = .
-top_srcdir = .
-
-pkgdatadir = $(datadir)/yaml
-pkglibdir = $(libdir)/yaml
-pkgincludedir = $(includedir)/yaml
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i386-apple-darwin9.4.0
-host_triplet = i386-apple-darwin9.4.0
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure config/config.guess config/config.sub \
-	config/depcomp config/install-sh config/ltmain.sh \
-	config/missing
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run autoconf
-AUTOHEADER = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run autoheader
-AUTOMAKE = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run automake-1.9
-AWK = awk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DOXYGEN = false
-DOXYGEN_FALSE = 
-DOXYGEN_TRUE = #
-ECHO = /bin/echo
-ECHO_C = \c
-ECHO_N = 
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-F77 = gfortran
-FFLAGS = -g -O2
-GREP = /usr/bin/grep
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAKEINFO = ${SHELL} /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/missing --run makeinfo
-OBJEXT = o
-PACKAGE = yaml
-PACKAGE_BUGREPORT = http://pyyaml.org/newticket?component=libyaml
-PACKAGE_NAME = yaml
-PACKAGE_STRING = yaml 0.1.1
-PACKAGE_TARNAME = yaml
-PACKAGE_VERSION = 0.1.1
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 0.1.1
-YAML_LT_AGE = 0
-YAML_LT_CURRENT = 1
-YAML_LT_RELEASE = 0
-YAML_LT_REVISION = 0
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = gfortran
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i386-apple-darwin9.4.0
-build_alias = 
-build_cpu = i386
-build_os = darwin9.4.0
-build_vendor = apple
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = i386-apple-darwin9.4.0
-host_alias = 
-host_cpu = i386
-host_os = darwin9.4.0
-host_vendor = apple
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = /Users/cwelton/Desktop/mapred3/yaml-0.1.1/config/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = $(install_sh) -d
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-SUBDIRS = include src . tests
-EXTRA_DIST = README LICENSE doc/doxygen.cfg
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/config $(distdir)/doc
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-	maintainer-clean-local
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-local maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am
-
-
-maintainer-clean-local:
-	-rm -f aclocal.m4 config.h.in configure config/*
-	-find ${builddir} -name Makefile.in -exec rm -f '{}' ';'
-
-.PHONY: bootstrap
-bootstrap: maintainer-clean
-	./bootstrap
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:


[12/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/data/raw.txt
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/data/raw.txt b/src/bin/gpmapreduce/test/data/raw.txt
deleted file mode 100644
index e8682b2..0000000
--- a/src/bin/gpmapreduce/test/data/raw.txt
+++ /dev/null
@@ -1,1408 +0,0 @@
-This is a file that is intented to test how map reduce handles raw text data.
-It includes a number of characters designed to make things more difficult
-for external tables.
-	This line has a tab in it - the default delimiter
-	Letters: abcdefghijklmnopqrstuvwxyzABCDEFGHIJKMLNOPQRSTUVWXYZ  (clar)
-	Numbers: 0123456789. +-*/=                                   (clar)
-	Punctuation: `~!@#$%^&*()_-=+\|'";:,<.>/?                      (clar)
-	Symbols: æ≤≥π¥ƒ©ç®¬÷≠«åø´¨ˆ∂˙†˜ß–Ω√∑µ∫≈˚∆œ…                    (clar)
-	Symbols2: `⁄€‹›fifl‡°·‚”’»±¿Ò‰Ç˝ÏÁ∏˘¯ÆÅØ´¨ˆÎÓˇ˜Í—¸◊„Âı˛ÔŒÚ      (clar)
-Next line is empty:
-
-Here's a list from html
-€  	   	&euro;
-  	&#32;
-! 	&#33; 	 
-" 	&#34; 	&quot;
-# 	&#35; 	 
-$ 	&#36; 	 
-% 	&#37; 	 
-& 	&#38; 	&amp;
-' 	&#39; 	 
-( 	&#40; 	 
-) 	&#41; 	 
-* 	&#42; 	 
-+ 	&#43; 	 
-, 	&#44; 	 
-- 	&#45; 	 
-. 	&#46; 	 
-/ 	&#47; 	 
-0 	&#48; 	 
-1 	&#49; 	 
-2 	&#50; 	 
-3 	&#51; 	 
-4 	&#52; 	 
-5 	&#53; 	 
-6 	&#54; 	 
-7 	&#55; 	 
-8 	&#56; 	 
-9 	&#57; 	 
-: 	&#58; 	 
-; 	&#59; 	 
-< 	&#60; 	&lt;
-= 	&#61; 	 
-> 	&#62; 	&gt;
-? 	&#63; 	 
-@ 	&#64; 	 
-A 	&#65; 	 
-B 	&#66; 	 
-C 	&#67; 	 
-D 	&#68; 	 
-E 	&#69; 	 
-F 	&#70; 	 
-G 	&#71; 	 
-H 	&#72; 	 
-I 	&#73; 	 
-J 	&#74; 	 
-K 	&#75; 	 
-L 	&#76; 	 
-M 	&#77; 	 
-N 	&#78; 	 
-O 	&#79; 	 
-P 	&#80; 	 
-Q 	&#81; 	 
-R 	&#82; 	 
-S 	&#83; 	 
-T 	&#84; 	 
-U 	&#85; 	 
-V 	&#86; 	 
-W 	&#87; 	 
-X 	&#88; 	 
-Y 	&#89; 	 
-Z 	&#90; 	 
-[ 	&#91; 	 
-\ 	&#92; 	 
-] 	&#93; 	 
-^ 	&#94; 	 
-_ 	&#95; 	 
-` 	&#96; 	 
-a 	&#97; 	 
-b 	&#98; 	 
-c 	&#99; 	 
-d 	&#100; 	 
-e 	&#101; 	 
-f 	&#102; 	 
-g 	&#103; 	 
-h 	&#104; 	 
-i 	&#105; 	 
-j 	&#106; 	 
-k 	&#107; 	 
-l 	&#108; 	 
-m 	&#109; 	 
-n 	&#110; 	 
-o 	&#111; 	 
-p 	&#112; 	 
-q 	&#113; 	 
-r 	&#114; 	 
-s 	&#115; 	 
-t 	&#116; 	 
-u 	&#117; 	 
-v 	&#118; 	 
-w 	&#119; 	 
-x 	&#120; 	 
-y 	&#121; 	 
-z 	&#122; 	 
-{ 	&#123; 	 
-| 	&#124; 	 
-} 	&#125; 	 
-~ 	&#126; 	 
- 	&#160; 	&nbsp;
-¡ 	&#161; 	&iexcl;
-¢ 	&#162; 	&cent;
-£ 	&#163; 	&pound;
-¤ 	&#164; 	&curren;
-¥ 	&#165; 	&yen;
-¦ 	&#166; 	&brvbar;
-§ 	&#167; 	&sect;
-¨ 	&#168; 	&uml;
-© 	&#169; 	&copy;
-ª 	&#170; 	&ordf;
-« 	&#171; 	 
-¬ 	&#172; 	&not;
-­ 	&#173; 	&shy;
-® 	&#174; 	&reg;
-¯ 	&#175; 	&macr;
-° 	&#176; 	&deg;
-± 	&#177; 	&plusmn;
-² 	&#178; 	&sup2;
-³ 	&#179; 	&sup3;
-´ 	&#180; 	&acute;
-µ 	&#181; 	&micro;
-¶ 	&#182; 	&para;
-· 	&#183; 	&middot;
-¸ 	&#184; 	&cedil;
-¹ 	&#185; 	&sup1;
-º 	&#186; 	&ordm;
-» 	&#187; 	&raquo;
-¼ 	&#188; 	&frac14;
-½ 	&#189; 	&frac12;
-¾ 	&#190; 	&frac34;
-¿ 	&#191; 	&iquest;
-À 	&#192; 	&Agrave;
-Á 	&#193; 	&Aacute;
-Â 	&#194; 	Â
-Ã 	&#195; 	&Atilde;
-Ä 	&#196; 	&Auml;
-Å 	&#197 	&Aring;
-Æ 	&#198; 	&AElig;
-Ç 	&#199; 	&Ccedil;
-È 	&#200; 	&Egrave;
-É 	&#201; 	&Eacute;
-Ê 	&#202; 	&Ecirc;
-Ë 	&#203; 	Ë
-Ì 	&#204; 	&Igrave;
-Í 	&#205; 	&Iacute;
-Î 	&#206; 	&Icirc;
-Ï 	&#207; 	&Iuml;
-Ð 	&#208; 	&ETH;
-Ñ 	&#209; 	&Ntilde;
-Ò 	&#210; 	&Ograve;
-Ó 	&#211; 	&Oacute;
-Ô 	&#212; 	&Ocirc;
-Õ 	&#213; 	&Otilde;
-Ö 	&#214; 	&Ouml;
-× 	&#215; 	&times;
-Ø 	&#216; 	&Oslash;
-Ù 	&#217; 	&Ugrave;
-Ú 	&#218; 	&Uacute;
-Û 	&#219; 	&Ucirc;
-Ü 	&#220; 	&Uuml;
-Ý 	&#221; 	&Yacute;
-Þ 	&#222; 	&THORN;
-ß 	&#223; 	&szlig;
-à 	&#224; 	&agrave;
-á 	&#225; 	&aacute;
-â 	&#226; 	&acirc;
-ã 	&#227; 	&atilde;
-ä 	&#228; 	&auml;
-å 	&#229; 	&aring;
-æ 	&#230; 	&aelig;
-ç 	&#231; 	&ccedil;
-è 	&#232; 	&egrave;
-é 	&#233; 	&eacute;
-ê 	&#234; 	&ecirc;
-ë 	&#235; 	&euml;
-ì 	&#236; 	&igrave;
-í 	&#237 	&iacute;
-î 	&#238; 	&icirc;
-ï 	&#239; 	&iuml;
-ð 	&#240; 	&eth;
-ñ 	&#241; 	&ntilde;
-ò 	&#242; 	&ograve;
-ó 	&#243; 	&oacute;
-ô 	&#244; 	&ocirc;
-õ 	&#245; 	&otilde;
-ö 	&#246; 	&ouml;
-÷ 	&#247; 	&divide;
-ø 	&#248; 	&oslash;
-ù 	&#249; 	&ugrave;
-ú 	&#250; 	&uacute;
-û 	&#251; 	&ucirc;
-ü 	&#252; 	&uuml;
-ý 	&#253; 	&yacute;
-þ 	&#254; 	&thorn;
-ÿ 	&#255; 	 
-Ā 	&#256; 	 
-ā 	&#257; 	 
-Ă 	&#258; 	 
-ă 	&#259; 	 
-Ą 	&#260; 	 
-ą 	&#261; 	 
-Ć 	&#262; 	 
-ć 	&#263; 	 
-Ĉ 	&#264; 	 
-ĉ 	&#265; 	 
-Ċ 	&#266; 	 
-ċ 	&#267; 	 
-Č 	&#268; 	 
-č 	&#269; 	 
-Ď 	&#270; 	 
-ď 	&#271; 	 
-Đ 	&#272; 	 
-đ 	&#273; 	 
-Ē 	&#274; 	 
-ē 	&#275; 	 
-Ĕ 	&#276; 	 
-ĕ 	&#277 	 
-Ė 	&#278; 	 
-ė 	&#279; 	 
-Ę 	&#280; 	 
-ę 	&#281; 	 
-Ě 	&#282; 	 
-ě 	&#283; 	 
-Ĝ 	&#284; 	 
-ĝ 	&#285; 	 
-Ğ 	&#286; 	 
-ğ 	&#287; 	 
-Ġ 	&#288; 	 
-ġ 	&#289; 	 
-Ģ 	&#290; 	 
-ģ 	&#291; 	 
-Ĥ 	&#292; 	 
-ĥ 	&#293; 	 
-Ħ 	&#294; 	 
-ħ 	&#295; 	 
-Ĩ 	&#296; 	 
-ĩ 	&#297; 	 
-Ī 	&#298; 	 
-ī 	&#299; 	 
-Ĭ 	&#300; 	 
-ĭ 	&#301; 	 
-Į 	&#302; 	 
-į 	&#303; 	 
-İ 	&#304; 	 
-ı 	&#305; 	 
-IJ 	&#306; 	 
-ij 	&#307; 	 
-Ĵ 	&#308; 	 
-ĵ 	&#309; 	 
-Ķ 	&#310; 	 
-ķ 	&#311; 	 
-ĸ 	&#312; 	 
-Ĺ 	&#313; 	 
-ĺ 	&#314; 	 
-Ļ 	&#315; 	 
-ļ 	&#316; 	 
-Ľ 	&#317 	 
-ľ 	&#318; 	 
-Ŀ 	&#319; 	 
-ŀ 	&#320; 	 
-Ł 	&#321; 	 
-ł 	&#322; 	 
-Ń 	&#323; 	 
-ń 	&#324; 	 
-Ņ 	&#325; 	 
-ņ 	&#326; 	 
-Ň 	&#327; 	 
-ň 	&#328; 	 
-ʼn 	&#329; 	 
-Ŋ 	&#330; 	 
-ŋ 	&#331; 	 
-Ō 	&#332; 	 
-ō 	&#333; 	 
-Ŏ 	&#334; 	 
-ŏ 	&#335; 	 
-Ő 	&#336; 	 
-ő 	&#337; 	 
-Π	&#338; 	 
-œ 	&#339; 	 
-Ŕ 	&#340; 	 
-ŕ 	&#341; 	 
-Ŗ 	&#342; 	 
-ŗ 	&#343; 	 
-Ř 	&#344; 	 
-ř 	&#345; 	 
-Ś 	&#346; 	 
-ś 	&#347; 	 
-Ŝ 	&#348; 	 
-ŝ 	&#349; 	 
-Ş 	&#350; 	 
-ş 	&#351; 	 
-Š 	&#352; 	 
-š 	&#353; 	 
-Ţ 	&#354; 	 
-ţ 	&#355; 	 
-Ť 	&#356; 	 
-ť 	&#357 	 
-Ŧ 	&#358; 	 
-ŧ 	&#359; 	 
-Ũ 	&#360; 	 
-ũ 	&#361; 	 
-Ū 	&#362; 	 
-ū 	&#363; 	 
-Ŭ 	&#364; 	 
-ŭ 	&#365; 	 
-Ů 	&#366; 	 
-ů 	&#367; 	 
-Ű 	&#368; 	 
-ű 	&#369; 	 
-Ų 	&#370; 	 
-ų 	&#371; 	 
-Ŵ 	&#372; 	 
-ŵ 	&#373; 	 
-Ŷ 	&#374; 	 
-ŷ 	&#375; 	 
-Ÿ 	&#376; 	 
-Ź 	&#377; 	 
-ź 	&#378; 	 
-Ż 	&#379; 	 
-ż 	&#380; 	 
-Ž 	&#381; 	 
-ž 	&#382; 	 
-ſ 	&#383; 	 
-Ŕ 	&#340; 	 
-ŕ 	&#341; 	 
-Ŗ 	&#342; 	 
-ŗ 	&#343; 	 
-Ř 	&#344; 	 
-ř 	&#345; 	 
-Ś 	&#346; 	 
-ś 	&#347; 	 
-Ŝ 	&#348; 	 
-ŝ 	&#349; 	 
-Ş 	&#350; 	 
-ş 	&#351; 	 
-Š 	&#352; 	 
-š 	&#353; 	 
-Ţ 	&#354; 	 
-ţ 	&#355; 	 
-Ť 	&#356; 	 
-ť 	&#577; 	 
-Ŧ 	&#358; 	 
-ŧ 	&#359; 	 
-Ũ 	&#360; 	 
-ũ 	&#361; 	 
-Ū 	&#362; 	 
-ū 	&#363; 	 
-Ŭ 	&#364; 	 
-ŭ 	&#365; 	 
-Ů 	&#366; 	 
-ů 	&#367; 	 
-Ű 	&#368; 	 
-ű 	&#369; 	 
-Ų 	&#370; 	 
-ų 	&#371; 	 
-Ŵ 	&#372; 	 
-ŵ 	&#373; 	 
-Ŷ 	&#374; 	 
-ŷ 	&#375; 	 
-Ÿ 	&#376; 	 
-Ź 	&#377 	 
-ź 	&#378; 	 
-Ż 	&#379; 	 
-ż 	&#380; 	 
-Ž 	&#381; 	 
-ž 	&#382; 	 
-ſ 	&#383;
-Korean Alphabet
-	12593	ㄱ	
-	12596	ㄴ	
-	12599	ㄷ	
-	12601	ㄹ	
-	12609	ㅁ	
-	12610	ㅂ	
-	12613	ㅅ	
-	12673	ㆁ	
-	12616	ㅈ	
-	12618	ㅊ	         (clar)
-	12619	ㅋ	
-	12620	ㅌ	
-	12621	ㅍ	
-	12622	ㅎ	
-	12623	ㅏ	         (clar)
-	12625	ㅑ	
-	12627	ㅓ	
-	12629	ㅕ	
-	12631	ㅗ	
-	12635	ㅛ	
-	12636	ㅜ	
-	12640	ㅠ	
-	12641	ㅡ	
-	12643	ㅣ	
-Some Japanese Kanji
-一 	one 	ichi, itsu 	hito-tsu
-二 	two 	ni, ji 	futa-tsu
-三 	three 	san  	mit-tsu
-四 	four 	shi or yon 	yot-tsu
-五 	five 	go 	itsu-tsu
-六 	six 	roku 	mut-tsu
-七 	seven 	shichi 	nana-tsu
-八 	eight 	hachi 	yat-tsu
-九 	nine 	ku or kyū 	kokono-tsu
-十 	ten 	jū 	tō
-百 	hundred 	hyaku 	momo
-千 	thousand 	sen 	chi
-上 	top 	jō 	ue
-下 	below 	ka or ge 	shita
-左 	left 	sa 	hidari
-右 	right 	u or yū 	migi
-中 	inside, middle 	chū 	naka              (clar)
-大 	large 	dai 	ō-kii
-小 	small 	shō 	chii-sai
-月 	month; moon 	gatsu or getsu 	tsuki
-日 	day; sun 	nichi 	hi
-年 	year 	nen 	toshi
-早 	early 	sō 	haya-i
-木 	tree 	moku 	ki
-林 	woods 	rin 	hayashi
-山 	mountain 	san 	yama
-川 	river 	sen 	kawa
-土 	soil 	do 	tsuchi
-空 	sky 	kū 	sora
-田 	rice paddy 	den 	ta
-天 	heaven; sky 	ten 	ama
-生 	life 	sei 	i-kiru
-花 	flower 	ka 	hana
-草 	grass 	sō 	kusa
-虫 	insect 	chū 	mushi
-犬 	dog 	ken 	inu
-人 	person 	jin or nin 	hito
-名 	name 	mei or myō 	na
-女 	female 	jo or nyo 	on'na
-男 	male 	dan 	otoko
-子 	child 	shi or su 	ko
-目 	eye 	moku 	me
-耳 	ear 	ji or jō 	mimi
-口 	mouth 	kō 	kuchi
-手 	hand 	shu 	te
-足 	foot or leg 	soku 	ashi
-見 	see 	ken 	mi-ru
-音 	sound 	on 	ne or oto
-力 	power 	riki or ryoku 	chikara             (clar)
-気 	spirit 	ki 	iki
-円 	circle; yen 	en 	maru
-入 	enter 	nyū 	hai-ru or i-ru
-出 	exit 	shutsu 	de-ru
-立 	stand up 	ritsu 	ta-tsu
-休 	rest 	kyū 	yasu-mu
-先 	previous 	sen 	saki
-夕 	evening 	seki 	yū
-本 	book 	hon 	moto
-文 	writing 	bun or mon 	fumi
-字 	character 	ji
-学 	study 	gaku 	mana-bu
-校 	school 	kō
-村 	village 	son 	mura
-町 	town 	chō 	machi
-森 	forest 	shin 	mori
-正 	correct 	sei 	tada-shii
-水 	water 	sui 	mizu
-火 	fire 	ka 	hi
-玉 	ball 	gyoku 	tama
-王 	king 	ō
-石 	stone 	seki 	ishi
-竹 	bamboo 	chiku 	take
-糸 	thread 	shi 	ito
-貝 	shellfish 		kai
-車 	wheeled vehicle 	sha 	kuruma
-金 	gold 	kin 	kane
-雨 	rain 	u 	ame
-赤 	red 	seki 	aka
-青 	blue 	sei 	ao
-白 	white 	haku 	shiro
-数 	number 	sū 	kazu
-多 	many,much 	ta 	ō-i
-少 	a few, a little 	shō 	suku-nai,suko-shi
-万 	ten thousand 	man 	yorozu
-半 	half 	han 	naka-ba
-形 	shape 	kei 	katachi
-太 	fat 	ta 	futo-i
-細 	thin 	sai 	hoso-i
-広 	wide 	kō 	hiro-i
-長 	long 	chō 	naga-i
-点 	point 	ten
-丸 	circle 	gan 	maru
-交 	mix 	kō 	maji-waru
-光 	light 	kō 	hikari
-角 	angle,corner 	kaku 	kado,tsuno,sumi
-計 	measure 	kei 	haka-ru
-直 	straight,correct 	choku,jiki 	tada-chi,nao-su
-線 	line 	sen
-矢 	arrow 	shi 	ya
-弱 	weak 	jaku 	yowa-i
-強 	strong 	kyō 	tsuyo-i
-高 	tall or high 	kō 	taka-i
-同 	same 	dō 	ona-ji
-親 	parent 	shin 	oya
-母 	mother 	bo 	haha,kaa
-父 	father 	fu 	chichi,tou
-姉 	older sister 	shi 	ane
-兄 	older brother 	kei 	ani
-弟 	younger brother 	tei 	otouto
-妹 	younger sister 	mai 	imōto
-自 	oneself 	ji or shi 	mizuka-ra
-友 	friend 	yū 	tomo
-体 	body 	tai 	karada
-毛 	hair 	mō 	ke
-頭 	head 	tō 	atama
-顔 	face 	gan 	kao
-首 	neck 	shu 	kubi
-心 	heart 	shin 	kokoro
-時 	time 	ji 	toki
-曜 	weekday 	yō
-朝 	morning 	chō 	asa
-昼 	daytime 	chū 	hiru
-夜 	night 	ya 	yoru
-分 	minute; understand 	fun,bun 	wa-karu
-週 	week  	shū
-春 	spring 	shun 	haru
-夏 	summer 	ka 	natsu
-秋 	autumn 	shū 	aki
-冬 	winter 	tō 	fuyu
-今 	now 	kon 	ima
-新 	new 	shin 	atara-shii
-古 	old 	ko 	furu-i
-間 	interval 	kan,ken 	ma,aida
-方 	direction 	hō 	kata
-北 	north 	hoku 	kita
-南 	south 	nan 	minami
-東 	east 	tō 	higashi,azuma
-西 	west 	sei or sai 	nishi
-遠 	far  	en 	tō-i
-近 	near 	kin 	chika-i
-前 	in front 	zen 	mae
-後 	behind 	go,kou 	nochi,ushi-ro,ato
-内 	inside 	nai 	uchi
-外 	outside 	gai or ge 	soto,hoka,hazu-su
-場 	place 	jō 	ba
-地 	ground 	chi or ji
-国 	country 	koku 	kuni
-園 	garden 	en 	sono
-谷 	valley 	koku 	tani
-野 	field 	ya 	no
-原 	field, origin 	gen 	hara
-里 	village 	ri 	sato
-市 	city 	shi 	ichi
-京 	capital 	kyō or kei
-風 	wind 	fū 	kaze
-雪 	snow 	setsu 	yuki
-雲 	cloud 	un 	kumo
-池 	pond 	chi 	ike
-海 	sea 	kai 	umi
-岩 	rock 	gan 	iwa
-星 	star 	sei 	hoshi
-室 	room 	shitsu 	muro
-戸 	door 	ko 	to or be
-家 	house 	ka or ke 	ie
-寺 	Buddhist temple 	ji 	tera
-通 	pass through 	tsū 	tō-ru
-門 	gates 	mon 	kado
-道 	road 	dō 	michi
-話 	talk 	wa 	hanashi
-言 	say 	gen,gon 	i-u,koto
-答 	answer 	tō 	kota-eru
-声 	voice 	sei 	koe
-聞 	hear 	bun or mon 	ki-ku
-語 	language 	go 	kata-ru
-読 	read 	doku 	yo-mu
-書 	write 	sho 	ka-ku
-記 	write down 	ki 	shiru-su
-紙 	paper  	shi 	kami
-画 	picture 	ga or kaku
-絵 	picture 	kai 	e
-図 	drawing 	zu 	haka-ru
-工 	craft 	kō or ku
-教 	teach 	kyō 	oshi-eru
-晴 	fine 	sei 	hare
-思 	think 	shi 	omo-u
-考 	think about 	kō 	kanga-eru
-知 	know 	chi 	shi-ru
-才 	ability 	sai,zai 	wazukani,zae
-理 	reason 	ri 	kotowari
-算 	calculate 	san
-作 	make 	saku 	tsuku-ru
-元 	origin 	gen or gan 	moto
-食 	eat,meal 	shoku 	ta-beru,ku-u
-肉 	meat 	niku
-馬 	horse 	ba 	uma or ma
-牛 	cow 	gyū 	ushi
-魚 	fish 	gyo 	uo or sakana
-鳥 	bird 	chō 	tori
-羽 	feather 	u 	ha or hane
-鳴 	chirp 	mei 	na-ku
-麦 	wheat 	baku 	mugi
-米 	rice 	bei or mai 	kome
-茶 	tea 	cha or sa
-色 	colour 	shoku 	iro
-黄 	yellow 	ō 	ki
-黒 	black 	koku 	kuro
-来 	come 	rai 	ku-ru
-行 	go 	kō or gyō 	i-ku,yu-ku,okonau
-帰 	return home 	ki 	kae-ru
-歩 	walk 	ho 	aru-ku,ayu-mu
-走 	run 	sō 	hashi-ru
-止 	stop 	shi 	to-maru
-活 	active 	katsu 	i-kiru
-店 	store 	ten 	mise
-買 	buy 	bai 	ka-u
-売 	sell 	bai 	u-ru
-午 	noon, 	go 	uma
-汽 	steam 	ki
-弓 	bow 	kyū 	yumi
-回 	-times, to revolve 	kai
-会 	association 	kai 	e
-組 	association, team 	so 	kumi
-船 	ship 	sen 	fune
-明 	bright 	mei 	aka-rui
-社 	company 	sha 	yashiro
-切 	cut 	setsu 	ki-ru
-電 	electricity 	den
-毎 	every 	mai
-合 	fit 	gō 	a-u
-当 	hit 	tō 	a-taru
-台 	base 	dai or tai
-楽 	pleasure 	raku 	tano-shii
-公 	public 	kou 	ōyake
-引 	pull 	in 	hi-ku
-科 	section 	ka
-歌 	song 	ka 	uta
-刀 	sword 	tō 	katana
-番 	number 	ban
-用 	use 	yō 	mochi-iru
-何 	what 	ka 	nani or nan
-丁 	pair 	chō
-世 	world 	sei or se 	yo
-両 	both 	ryō
-主 	master 	shu 	nushi or omo
-乗 	ride 	jō 	no-ru
-予 	in advance 	yo 	
-事 	abstract thing 	ji 	koto
-仕 	serve 	shi 	tsuka-eru
-他 	other 	ta 	hoka
-代 	substitute 	dai or tai 	kawa-ru or yo
-住 	dwell 	jū 	su-mu
-使 	use 	shi 	tsuka-u
-係 	person in charge 	kei 	kakari or kaka-ru
-倍 	double 	bai
-全 	whole 	zen 	matta-ku
-具 	tool 	gu
-写 	copy 	sha 	utsu-su
-列 	row 	retsu
-助 	help 	jo 	tasu-keru
-勉 	diligence 	ben
-動 	move 	dō 	ugo-ku
-勝 	win 	shō 	ka-tsu
-化 	disguise 	ka 	ba-keru
-区 	ward 	ku
-医 	doctor 	i
-去 	leave 	kyo or ko 	sa-ru
-反 	anti- 	han 	so-ru
-取 	take 	shu 	to-ru
-受 	receive 	ju 	u-keru
-号 	number 	gō
-向 	face(v.) 	kō 	mu-kau
-君 	you 	kun 	kimi
-味 	flavor 	mi 	aji or aji-wau
-命 	life 	mei 	inochi
-和 	peace, sum 	wa
-品 	article 	hin 	shina
-員 	member 	in
-商 	commerce 	shō
-問 	question 	mon 	to-u or ton
-坂 	slope 		saka
-央 	center 	ō
-始 	begin 	shi 	haji-meru
-委 	committee 	i
-守 	protect 	shu 	mamo-ru
-安 	cheap 	an 	yasu-i
-定 	fix 	tei or jō 	sada-meru
-実 	fruit or content 	jitsu 	mi or mino-ru
-客 	guest 	kyaku
-宮 	Shinto shrine or prince(princess) 	kyū 	miya
-宿 	inn 	shuku 	yado or yado-ru
-寒 	cold 	kan 	samu-i
-対 	opposite 	tai
-局 	office 	kyoku
-屋 	premise 	oku 	ya
-岸 	shore 	gan 	kishi
-島 	island 	tō 	shima
-州 	state 	shū
-帳 	account book 	chō
-平 	flat 	hei or byō 	tai-ra or hira
-幸 	happiness 	kō 	saiwa-i or shiawa-se
-度 	degrees 	do
-庫 	warehouse 	ko
-庭 	garden 	tei 	niwa
-式 	style 	shiki
-役 	role 	yaku
-待 	wait 	tai 	ma-tsu
-急 	hurry 	kyū 	iso-gu
-息 	breath 	soku 	iki
-悪 	bad 	aku 	waru-i
-悲 	sad 	hi 	kana-shii
-想 	thought 	sō
-意 	idea 	i
-感 	feel 	kan
-所 	place 	sho 	tokoro
-打 	hit 	da 	u-tsu
-投 	throw 	tō 	na-geru
-拾 	pick up 		hiro-u
-持 	hold 	ji 	mo-tsu
-指 	finger 	shi 	yubi or sa-su
-放 	release 	hō 	hana-su
-整 	put in order 	sei 	totono-eru
-旅 	trip 	ryo 	tabi
-族 	tribe 	zoku
-昔 	long ago 		mukashi
-昭 	clear 	shō
-暑 	hot 	sho 	atsu-i
-暗 	dark 	an 	kura-i
-曲 	sheet music / crooked 	kyoku 	ma-garu
-有 	be 	yū 	a-ru
-服 	clothes 	fuku
-期 	period of time 	ki
-板 	board 	han or ban 	ita
-柱 	pillar 	chū 	hashira
-根 	root 	kon 	ne
-植 	plant 	shoku 	u-eru
-業 	business 	gyō
-様 	appearance or Mr(Mrs,Ms) 	yō 	sama
-横 	side 	ō 	yoko
-橋 	bridge 	kyō 	hashi
-次 	next 	ji 	tsugi or tsu-gu
-歯 	tooth 	shi 	ha
-死 	death 	shi 	shi-nu
-氷 	ice 	hyō 	kōri
-決 	decide 	ketsu 	ki-meru
-油 	oil 	yu 	abura
-波 	wave 	ha 	nami
-注 	pour 	chū 	soso-gu
-泳 	swim 	ei 	oyo-gu
-洋 	ocean, western 	yō
-流 	stream 	ryū 	naga-reru
-消 	extinguish 	shō 	ki-eru or ke-su
-深 	deep 	shin 	fuka-i
-温 	warm 	on 	atata-kai
-港 	harbor 	kō 	minato
-湖 	lake 	ko 	mizūmi
-湯 	hot water 	tō 	yu
-漢 	China 	kan
-炭 	charcoal 	tan 	sumi
-物 	thing 	butsu or motsu 	mono
-球 	ball 	kyū 	tama
-由 	reason 	yū or yu  	yoshi
-申 	say 		mō-su
-界 	world 	kai
-畑 	agricultural field 		hata or hatake
-病 	sick 	byō 	yamai
-発 	departure 	hatsu
-登 	climb 	tō or to 	nobo-ru
-皮 	skin 	hi 	kawa
-皿 	dish 		sara
-相 	mutual 	sō 	ai
-県 	prefecture 	ken
-真 	true 	shin 	ma
-着 	wear or arrive 	chaku 	ki-ru or tsu-ku
-短 	short 	tan 	mijika-i
-研 	sharpen 	ken 	to-gu
-礼 	thanks 	rei
-神 	god(s) 	shin or jin 	kami
-祭 	festival 	sai 	matsu-ri
-福 	luck 	fuku
-秒 	second 	byō
-究 	research 	kyū
-章 	chapter 	shō
-童 	juvenile 	dō
-笛 	whistle 	teki 	fue
-第 	ordinal number prefix 	dai
-筆 	writing brush 	hitsu 	fude
-等 	class 	tō 	hito-shii
-箱 	box 		hako
-級 	rank 	kyū
-終 	end 	shū 	o-waru
-緑 	green 	ryoku 	midori
-練 	practice 	ren 	ne-ru
-羊 	sheep 	yō 	hitsuji
-美 	beauty 	bi 	utsuku-shii
-習 	learn 	shū 	nara-u
-者 	someone 	sha 	mono
-育 	nurture 	iku 	soda-tsu
-苦 	suffer 	ku 	kuru-shii or niga-i
-荷 	luggage 	ka 	ni
-落 	fall 	raku 	o-chiru
-葉 	leaf 	yō 	ha
-薬 	medicine 	yaku 	kusuri
-血 	blood 	ketsu 	chi
-表 	list or surface 	hyō 	omote or arawa-su
-詩 	poem 	shi
-調 	investigate 	chō 	shira-beru
-談 	discuss 	dan
-豆 	beans 	tō or zu 	mame
-負 	lose 	fu 	ma-keru or o-u
-起 	wake up 	ki 	o-kiru
-路 	road 	ro 	ji
-身 	body 	shin 	mi
-転 	revolve 	ten 	koro-bu
-軽 	light 	kei 	karu-i
-農 	farming 	nō
-返 	return 	hen 	kae-su
-追 	follow 	tsui 	o-u
-送 	send 	sō 	oku-ru
-速 	fast 	soku 	haya-i
-進 	advance 	shin 	susu-mu
-遊 	play 	yū 	aso-bu
-運 	carry 	un 	hako-bu
-部 	part 	bu
-都 	metropolis 	to or tsu 	miyako
-配 	distribute 	hai 	kuba-ru
-酒 	rice wine 	shu 	sake or saka
-重 	heavy 	jū or chō 	omo-i or kasa-neru
-鉄 	iron 	tetsu
-銀 	silver 	gin
-開 	open 	kai 	hira-ku or a-ku
-院 	institution 	in
-陽 	sunshine 	yō
-階 	floor of a building 	kai
-集 	collect 	shū 	atsu-maru
-面 	face 	men  	omo-te or tsura
-題 	topic 	dai
-飲 	drink 	in 	no-mu
-館 	public building 	kan
-駅 	station 	eki
-鼻 	nose 	bi 	hana
-不 	not 	fu or bu
-争 	conflict 	sō 	araso-u
-付 	attach 	fu 	tsu-ku
-令 	orders 	rei
-以 	since 	i
-仲 	go-between 		naka
-伝 	transmit 	den 	tsuta-eru
-位 	rank 	i 	kurai
-低 	low 	tei 	hiku-i
-例 	example 	rei 	tato-eru
-便 	convenience 	ben or bin 	tayo-ri
-信 	trust 	shin
-倉 	storage 	sō 	kura
-候 	climate 	kō
-借 	borrow 	shaku 	ka-riru
-停 	halt 	tei
-健 	healthy 	ken
-側 	side 	soku 	kawa
-働 	work 	dō 	hatara-ku
-億 	hundred million 	oku
-兆 	portent or trillion 	chō 	kiza-shi
-児 	child 	ji
-共 	together 	kyō 	tomo
-兵 	soldier 	hei or hyō 	tsuwamono
-典 	code 	ten
-冷 	cool 	rei 	tsume-tai or hi-eru or sa-meru
-初 	first 	sho 	hatsu or haji-me
-別 	separate 	betsu 	waka-reru
-利 	profit 	ri
-刷 	printing 	satsu 	su-ru
-副 	vice- 	fuku
-功 	achievement 	kō
-加 	add 	ka 	kuwa-eru
-努 	toil 	do 	tsuto-meru
-労 	labor 	rō 	negira-u
-勇 	courage 	yū 	isa-mu
-包 	wrap 	hō 	tsutsu-mu
-卒 	graduate 	sotsu
-協 	cooperation 	kyō
-単 	simple 	tan
-博 	Dr. 	haku
-印 	mark 	in 	shirushi
-参 	participate 	san 	mai-ru
-史 	history 	shi
-司 	director 	shi
-各 	each 	kaku
-告 	tell 	koku 	tsu-geru
-周 	circumference 	shū 	mawa-ri
-唱 	chant 	shō 	tona-eru
-喜 	rejoice 	ki 	yoroko-bu
-器 	container 	ki 	utsuwa
-囲 	surround 	i 	kako-u
-固 	harden 	ko 	kata-maru
-型 	model 	kei 	kata
-堂 	public chamber 	dō
-塩 	salt 	en 	shio
-士 	gentleman 	shi
-変 	change 	hen 	ka-waru
-夫 	husband 	fu fuu bu 	otto
-失 	lose 	shitsu 	ushina-u
-好 	like 	kō 	su-ku or kono-mu
-季 	seasons 	ki
-孫 	grandchild 	son 	mago
-完 	perfect 	kan
-官 	government official 	kan
-害 	harm 	gai
-察 	guess 	satsu
-巣 	nest 	sō 	su
-差 	distinction 	sa
-希 	hope 	ki 	mare
-席 	seat 	seki
-帯 	sash 	tai 	obi
-底 	bottom 	tei 	soko
-府 	urban prefecture 	fu
-康 	ease 	kō
-建 	build 	ken 	ta-teru
-径 	diameter 	kei
-徒 	junior 	to
-得 	acquire 	toku 	e-ru
-必 	without fail 	hitsu 	kanara-zu
-念 	thought 	nen
-愛 	love  	ai
-成 	become 	sei 	na-ru
-戦 	war 	sen 	ikusa or tataka-u
-折 	fold 	setsu 	o-ru
-挙 	raise 	kyo 	a-geru
-改 	reformation 	kai 	arata-meru
-救 	salvation 	kyū 	suku-u
-敗 	failure 	hai 	yabu-reru
-散 	scatter 	san 	chi-ru
-料 	fee 	ryō
-旗 	national flag 	hata
-昨 	previous 	saku
-景 	scenery 	kei
-最 	most 	sai 	mo or motto-mo
-望 	hope 	bō 	nozo-mu
-未 	un- 	mi 	ima-da
-末 	end 	matsu 	sue
-札 	tag 	satsu 	huda
-材 	lumber 	zai
-束 	bundle 	soku 	taba or tsuka
-松 	pine 	shō 	matsu
-果 	fruit, accomplish 	ka 	ha-tasu
-栄 	prosperity 	ei 	saka-eru
-案 	plan 	an
-梅 	apricot 	bai 	ume
-械 	contraption 	kai
-極 	poles 	kyoku 	kiwa-meru
-標 	signpost 	hyō
-機 	machine 	ki
-欠 	lack 	ketsu 	ka-keru
-歴 	curriculum 	reki
-残 	remainder 	zan 	noko-ru
-殺 	kill 	satsu 	koro-su
-毒 	poison 	doku
-氏 	family name 	shi 	uji
-民 	people 	min 	tami
-求 	request 	kyū 	moto-mu
-治 	govern 	chi 	osa-meru
-法 	method 	hō
-泣 	cry 	kyū 	na-ku
-浅 	shallow 	sen 	asa-i
-浴 	bathe 	yoku 	abi-ru
-清 	pure 	sei 	kiyo-raka
-満 	full 	man 	mi-chiru
-漁 	fishing 	ryō 	asa-ru
-灯 	lamp 	tō 	tomo-su
-無 	nothing 	mu 	na-i
-然 	so 	zen 	shika-shi
-焼 	bake 	shō 	ya-ku
-照 	illuminate 	shō 	te-rasu
-熱 	heat 	netsu 	atsu-i
-牧 	breed 	boku 	maki
-特 	special 	toku
-産 	give birth 	san 	u-mu
-的 	target 	teki 	mato
-省 	government ministry 	sho or sei 	habu-ku
-祝 	celebrate 	shuku 	iwa-u
-票 	ballot 	hyō
-種 	kind or seed 	shu 	tane or kusa
-積 	accumulate 	seki 	tsu-mu
-競 	emulate 	kyō 	kiso-u
-笑 	laugh 	shō 	wara-u
-管 	pipe 	kan 	kuda
-節 	node 	setsu 	fushi
-粉 	flour 	fun 	ko or kona
-紀 	chronicle 	ki
-約 	promise 	yaku
-結 	tie 	ketsu 	musu-bu or yu-u
-給 	salary 	kyū 	tama-u
-続 	continue 	zoku 	tsudu-ku
-置 	put 	chi 	o-ku
-老 	old man 	rō 	o-iru
-胃 	stomach 	i
-脈 	vein 	myaku
-腸 	intestines 	chō
-臣 	retainer 	shin
-航 	cruise 	kō
-良 	good 	ryō 	yo-i
-芸 	art 	gei
-芽 	bud 	ga 	me
-英 	England 	ei
-菜 	vegetable 	sai 	na
-街 	city 	gai 	machi
-衣 	clothes 	i
-要 	need 	yō 	i-ru
-覚 	memorize 	kaku 	obo-eru or sa-meru
-観 	observe 	kan 	mi-ru
-訓 	instruction 	kun
-試 	test 	shi 	kokoromi-ru
-説 	theory 	setsu 	to-ku
-課 	section 	ka
-議 	deliberation 	gi
-象 	elephant 	zō or shō 	
-貨 	freight 	ka
-貯 	savings 	cho 	ta-meru
-費 	expense 	hi 	tsui-yasu
-賞 	prize 	shō
-軍 	army 	gun
-輪 	wheel 	rin 	wa
-辞 	resign 	ji 	ya-meru
-辺 	environs 	hen 	ata-ri
-連 	take along 	ren 	tsu-reru or tsura-neru
-達 	attain 	tachi
-選 	choose 	sen 	era-bu
-郡 	county 	gun
-量 	quantity 	ryō
-録 	record 	roku
-鏡 	mirror 	kyō 	kagami
-関 	related 	kan
-陸 	land 	riku
-隊 	group 	tai
-静 	quiet 	sei 	shizu-ka
-順 	obey 	jun
-願 	request 	gan 	nega-u
-類 	sort 	rui
-飛 	fly 	hi 	to-bu
-飯 	meal 	han 	meshi
-養 	foster 	yō 	yashina-u
-験 	test 	ken
-久 	long time 	kyū 	hisa
-仏 	Buddha 	hutsu or butsu 	hotoke
-仮 	sham 	ka or ke 	kari
-件 	affair 	ken
-任 	responsibility 	nin 	maka-seru
-似 	becoming 	ji 	ni-ru
-余 	too much 	yo 	ama-ru
-価 	value 	ka 	atai
-保 	preserve 	ho 	tamo-tsu
-修 	discipline 	shū 	osa-meru
-俵 	straw bag 	hyō 	tawara
-個 	individual 	ko
-備 	provide 	bi 	sona-eru
-像 	statue 	zō
-再 	again 	sai 	futata-bi
-刊 	publish 	kan
-判 	judge 	han 	waka-ru
-制 	control 	sei
-券 	ticket 	ken
-則 	rule 	soku 	notto-ru
-効 	effect 	kō
-務 	duty 	mu 	tsuto-meru
-勢 	power 	sei 	ikio-i
-厚 	thick 	kō 	atsu-i
-句 	phrase 	ku
-可 	possible 	ka
-営 	manage 	ei 	itona-mu
-因 	cause 	in 	yo-ru
-団 	group 	dan
-圧 	pressure 	atsu
-在 	exist 	zai 	a-ru
-均 	level 	kin
-基 	foundation 	ki 	moto-duku
-報 	report 	hō 	muku-iru
-境 	boundary 	kyō 	sakai
-墓 	grave 	bo 	haka
-増 	increase 	zō 	ma-su or fu-eru
-夢 	dream 	mu 	yume
-妻 	wife 	sai 	tsuma
-婦 	lady 	fu
-容 	contain 	yō
-寄 	approach 	ki 	yo-ru
-富 	rich 	fu 	tomi
-導 	guide 	dō 	michibi-ku
-居 	reside 	kyo 	i-ru
-属 	belong 	zoku
-布 	linen 	fu 	nuno
-師 	expert 	shi
-常 	normal 	jō 	tsune
-幹 	tree-trunk 	kan 	miki
-序 	preface 	jo
-弁 	valve 	ben
-張 	stretch 	chō 	ha-ru
-往 	journey 	ō
-復 	repeating 	fuku
-徳 	virtue 	toku
-志 	intention 	shi 	kokorozashi
-応 	respond 	ō
-快 	cheerful 	kai 	kokoroyo-i
-性 	gender 	sei or shō 	saga
-恩 	grace 	on
-情 	feelings 	jō 	nasa-ke
-態 	condition 	tai
-慣 	accustomed 	kan 	na-reru
-承 	acquiesce 	shō 	uketamawa-ru
-技 	skill 	gi 	waza
-招 	beckon 	shō 	mane-ku
-授 	instruct 	ju 	sazu-keru
-採 	pick 	sai 	to-ru
-接 	contact 	setsu
-提 	present 	tei 	sa-geru
-損 	loss 	son 	soko-neru
-支 	branch 	shi 	sasa-eru
-政 	politics 	sei 	matsurigoto
-故 	circumstances 	ko 	yue
-敵 	enemy 	teki 	kataki
-断 	cut off 	dan 	ta-tsu
-旧 	old times 	kyū
-易 	easy 	eki 	yasa-shii
-暴 	outburst 	bō 	aba-ku
-条 	clause 	jō
-枝 	branch 	shi 	eda
-査 	investigate 	sa
-格 	status 	kaku
-桜 	cherry 	ō 	sakura
-検 	examine 	ken
-構 	construct 	kō 	kama-eru
-武 	military 	bu
-比 	compare 	hi 	kura-beru
-永 	eternity 	ei 	naga-i
-河 	river 	ga 	kawa
-液 	fluid 	eki
-混 	mix 	kon 	maza-ru
-減 	decrease 	gen 	he-ru
-測 	fathom 	soku 	haka-ru
-準 	standard 	jun
-演 	perform 	en
-潔 	undefiled 	ketsu 	isagiyo-i
-災 	disaster 	sai 	wazawa-i
-燃 	burn 	nen 	mo-eru
-版 	printing block 	han
-犯 	crime 	han 	oka-su
-状 	form 	jō
-独 	alone 	doku 	hito-ri
-率 	rate 	ritsu 	hikii-ru
-現 	appear 	gen 	arawa-reru
-留 	detain 	ryū ru 	todo-maru
-略 	abbreviation 	ryaku
-益 	benefit 	eki
-眼 	eyeball 	gan 	me
-破 	rend 	ha 	yabu-ru
-確 	certain 	kaku 	tashi-ka
-示 	indicate 	shi 	shime-su
-祖 	ancestor 	so
-禁 	prohibition 	kin
-移 	shift 	i 	utsu-ru
-程 	extent 	tei 	hodo
-税 	tax 	zei
-築 	fabricate 	chiku 	kizu-ku
-精 	refined 	sei
-素 	elementary 	su 	moto
-経 	manage 	kei 	he-ru
-統 	unite 	tō 	su-beru
-絶 	discontinue 	zetsu 	ta-tsu
-綿 	cotton 	men 	wata
-総 	whole 	sō
-編 	compile 	hen 	a-mu
-績 	exploits 	seki
-織 	weave 	shiki 	o-ru
-罪 	guilt 	zai 	tsumi
-群 	flock 	gun 	mu-reru
-義 	righteousness 	gi
-耕 	till 	kō 	tagaya-su
-職 	employment 	shoku
-肥 	fertilizer 	hi 	ko-yasu
-能 	ability 	nō
-興 	entertain 	kyō 	oko-su
-舌 	tongue 	zetsu 	shita
-舎 	cottage 	sha
-術 	art 	jutsu 	sube
-衛 	defense 	ei
-製 	manufacture 	sei
-複 	duplicate 	fuku
-規 	rule 	ki
-解 	untie 	ge or kai 	to-ku
-設 	establish 	setsu 	mouke-ru
-許 	permit 	kyo 	yuru-su
-証 	evidence 	shō
-評 	evaluate 	hyō
-講 	lecture 	kō
-謝 	apologize 	sha 	ayama-ru
-識 	discriminating 	shiki
-護 	safeguard 	go 	mamo-ru
-豊 	bountiful 	hō 	yuta-ka
-財 	wealth 	zai
-貧 	poor 	hin 	mazushi-i
-責 	blame 	seki 	se-meru
-貸 	lend 	tai 	ka-su
-貿 	trade 	bō
-賀 	congratulations 	ga
-資 	resources 	shi
-賛 	approve 	san
-質 	quality 	shitsu
-輸 	transport 	yu
-述 	mention 	jutsu 	no-beru
-迷 	astray 	mei 	mayo-u
-退 	retreat 	tai 	shirizo-ku
-逆 	inverted 	gyaku 	sakara-u
-造 	create 	zō 	tsuku-ru
-過 	go beyond 	ka 	ayama-chi
-適 	suitable 	teki
-酸 	acid 	san
-鉱 	mineral 	kō
-銅 	copper 	dō
-銭 	coin 	sen 	zeni
-防 	prevent 	bō 	fuse-gu
-限 	limit 	gen 	kagi-ru
-険 	precipitous 	ken
-際 	occasion 	sai 	kiwa
-雑 	miscellaneous 	zatsu
-非 	negative 	hi 	ara-zu
-預 	deposit 	yo 	azu-keru
-領 	territory 	ryō
-額 	amount 	gaku 	hitai
-飼 	domesticate 	shi 	ka-u
-並 	row 	hei 	nami or nara-bu
-乱 	riot 	ran 	mida-reru
-乳 	milk 	nyū 	chichi
-亡 	deceased 	bō 	na-kunaru
-仁 	kindness 	jin
-供 	offer 	kyō or ku 	tomo
-俳 	actor 	hai
-値 	value 	chi 	atai
-傷 	wound 	shō 	kizu
-優 	superior 	yū 	yasa-shii
-党 	political party 	tō
-冊 	counter for books 	satsu
-処 	dispose 	sho
-刻 	engrave 	koku 	kiza-mu
-割 	divide 	katsu 	wa-ru
-創 	create 	sō 	tsuku-ru
-劇 	drama 	geki
-勤 	diligence 	kin 	tsuto-meru
-危 	dangerous 	ki 	aya-ui
-卵 	egg 	ran 	tamago
-厳 	strict 	gen 	kibi-shii
-収 	take in 	shū 	osa-meru
-后 	queen 	gō 	kisaki
-否 	negate 	hi 	ina or iya
-吸 	suck 	kyū 	su-u
-呼 	call 	ko 	yo-bu
-善 	good 	zen 	yo-i
-困 	become distressed 	kon 	koma-ru
-垂 	droop 	choku 	ta-reru
-城 	castle 	jō 	shiro
-域 	range 	iki
-奏 	play music 	sō 	kana-deru
-奮 	stirred up 	hun 	huru-u
-姿 	shape 	shi 	sugata
-存 	suppose 	son
-孝 	filial piety 	kō
-宅 	home 	taku 	ie
-宇 	eaves 	u
-宗 	religion 	shū 	sō
-宙 	mid-air 	chū
-宝 	treasure 	hō 	takara
-宣 	proclaim 	sen 	notama-u
-密 	secrecy 	mitsu
-寸 	measurement 	sun
-専 	specialty 	sen 	moppa-ra
-射 	shoot 	sha 	i-ru
-将 	leader 	shō
-尊 	revered 	son
-就 	concerning 	shū 	tsu-ku
-尺 	measure of length 	shaku
-届 	deliver 	todo-ku
-展 	expand 	ten
-層 	stratum 	sō
-己 	self 	ko 	onore
-巻 	scroll 	kan 	ma-ku
-幕 	curtain 	baku 	maku
-干 	dry 	kan 	ho-su
-幼 	infancy 	yō 	osana-i
-庁 	government office 	chō
-座 	sit 	za 	suwa-ru
-延 	prolong 	en 	no-basu
-律 	rhythm 	ritsu
-従 	obey 	jū 	shitaga-u
-忘 	forget 	bō 	wasu-reru
-忠 	loyalty 	chū
-憲 	constitution 	ken
-我 	ego 	ga 	ware
-批 	criticism 	hi
-担 	shouldering 	tan 	nina-u
-拝 	worship 	hai 	oga-mu
-拡 	broaden 	kaku 	hiro-geru
-捨 	throw away 	sha 	su-teru
-探 	grope 	tan 	saga-su
-推 	infer 	sui
-揮 	command 	ki
-操 	maneuver 	sō 	ayatsu-ru
-敬 	respect 	kei 	uyama-u
-映 	reflect 	ei 	utsu-ru
-晩 	nightfall 	ban
-暖 	warmth 	dan 	atata-kai
-暮 	livelihood 	bo 	ku-rasu
-朗 	melodious 	rō 	hoga-raka
-机 	desk 	ki 	tsukue
-枚 	sheet of... 	mai
-染 	dye 	sen 	so-meru
-株 	stocks 	kabu
-棒 	rod 	bō
-模 	imitation 	mo
-権 	rights 	ken
-樹 	trees 	ju 	ki
-欲 	longing 	yoku 	ho-shii
-段 	steps 	dan
-沿 	run alongside 	en 	so-u
-泉 	fountain 	sen 	izumi
-洗 	wash 	sen 	ara-u
-派 	sect 	ha
-済 	settle 	sai 	su-mu
-源 	origin 	gen 	minamoto
-潮 	tide 	cho 	shio
-激 	violent 	geki 	hage-shii
-灰 	ashes 	hai
-熟 	ripen 	juku 	u-reru
-片 	one-sided 	hen 	kata
-班 	group 	han
-異 	uncommon 	i 	koto-naru
-疑 	doubt 	gi 	utaga-u
-痛 	pain 	tsū 	ita-i
-皇 	emperor 	kō 	ō
-盛 	prosper 	sei 	mo-ru
-盟 	alliance 	mei
-看 	watch over 	kan
-砂 	sand 	sa or sha 	suna
-磁 	magnet 	ji
-私 	me 	shi 	watakushi or watashi
-秘 	secret 	hi
-穀 	cereal 	koku
-穴 	hole 	ketsu 	ana
-窓 	window 	sō 	mado
-筋 	muscle 	kin 	suji
-策 	scheme 	saku
-簡 	simplicity 	kan
-糖 	sugar 	tō
-系 	lineage 	kei
-紅 	deep red 	kō 	beni or kurenai
-納 	settlement 	nō 	osa-meru
-純 	genuine 	jun
-絹 	silk 	ken 	kinu
-縦 	vertical 	ju 	tate
-縮 	shrink 	shuku 	chidi-mu
-署 	government office 	sho
-翌 	the following 	yoku
-聖 	holy 	sei
-肺 	lung 	hai
-背 	back 	hai 	se
-胸 	bosom 	kyō 	mune
-脳 	brain 	nō
-腹 	abdomen 	fuku 	hara
-臓 	entrails 	zō
-臨 	lookover 	rin 	nozo-mu
-至 	climax 	shi 	ita-ru
-若 	young 	jaku 	waka-i
-著 	renowned 	cho
-蒸 	steam 	jō 	mu-su
-蔵 	warehouse 	zō 	kura
-蚕 	silkworm 	kaiko
-衆 	masses 	shū
-裁 	judge 	sai 	saba-ku
-装 	attire 	sō or shō 	yosoo-u
-裏 	back 	ri 	ura
-補 	supplement 	ho 	ogina-u
-視 	look at 	shi 	mi-ru
-覧 	perusal 	ran
-討 	chastise 	tō 	u-tsu
-訪 	visit 	hō 	otozu-reru
-訳 	translate 	yaku 	wake
-詞 	poetry 	shi 	kotoba
-誌 	document 	shi
-認 	recognize 	nin 	mito-meru
-誕 	born 	tan
-誠 	sincerity 	sei 	makoto
-誤 	mistake 	go 	ayama-ru
-論 	theory 	ron
-諸 	everything 	sho 	moro
-警 	guard against 	kei
-貴 	precious 	ki
-賃 	fare 	chin
-遺 	bequeath 	i
-郵 	mail 	yū
-郷 	home town 	kyō 	gō
-針 	needle 	shin 	hari
-鋼 	steel 	kō 	hagane
-閉 	closed 	hei 	shi-meru
-閣 	tall 	kaku
-降 	descend 	kō 	o-riru
-陛 	majesty 	hei
-除 	exclude 	jo 	nozo-ku
-障 	hurt 	shō 	sawa-ru
-難 	difficult 	nan 	muzuka-shii
-革 	leather 	kaku 	kawa
-頂 	place on the head 	chō 	itada-ku
-骨 	bone 	kotsu 	hone

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/data/smalldoc.txt
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/data/smalldoc.txt b/src/bin/gpmapreduce/test/data/smalldoc.txt
deleted file mode 100644
index ce82e7c..0000000
--- a/src/bin/gpmapreduce/test/data/smalldoc.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-hello world 
-this tests the hello world of map reduce word count 
-because of that we want some words to occur 
-more than once words like hello 
-so hello world hello lets do that count thing 

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/data/www.small.dat
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/data/www.small.dat b/src/bin/gpmapreduce/test/data/www.small.dat
deleted file mode 100644
index bc3b8a5..0000000
--- a/src/bin/gpmapreduce/test/data/www.small.dat
+++ /dev/null
@@ -1,417 +0,0 @@
-0|1
-0|0
-0|2
-0|3
-0|4
-0|5
-0|6
-0|7
-0|8
-0|9
-0|10
-0|11
-0|12
-0|13
-0|14
-0|15
-0|16
-1|17
-1|18
-1|19
-1|20
-1|21
-1|22
-1|24
-1|25
-1|26
-1|28
-1|30
-1|0
-1|7
-1|33
-1|35
-1|37
-1|39
-3|0
-3|41
-3|14
-3|43
-4|0
-4|11
-4|46
-4|48
-4|50
-4|52
-4|54
-4|56
-4|58
-4|60
-4|62
-4|64
-4|66
-4|68
-4|14
-4|71
-4|73
-4|75
-4|76
-4|78
-4|80
-5|83
-5|0
-5|86
-5|88
-6|0
-6|89
-6|92
-6|93
-6|95
-6|98
-6|100
-6|105
-6|107
-6|108
-6|109
-6|14
-6|110
-6|37
-6|116
-6|38
-6|118
-6|119
-6|120
-6|39
-6|121
-6|122
-6|123
-7|25
-7|0
-7|6
-7|8
-7|45
-7|129
-7|133
-7|134
-7|135
-7|33
-7|138
-7|139
-7|14
-7|140
-7|144
-7|37
-7|145
-7|149
-7|150
-7|151
-7|80
-7|82
-7|121
-8|0
-8|40
-8|3
-8|153
-8|46
-8|154
-8|155
-8|14
-8|141
-8|70
-8|150
-8|156
-9|0
-9|12
-9|131
-9|157
-9|134
-9|158
-9|159
-9|160
-9|161
-9|162
-9|163
-9|164
-9|14
-9|165
-9|166
-9|167
-9|168
-10|44
-10|0
-10|169
-10|40
-10|4
-10|6
-10|9
-10|46
-10|170
-10|171
-10|172
-10|173
-10|174
-10|175
-10|176
-10|177
-10|178
-10|179
-10|180
-10|181
-10|182
-10|183
-10|184
-10|185
-10|186
-10|187
-10|188
-10|134
-10|189
-10|190
-10|51
-10|191
-10|192
-10|193
-10|194
-10|33
-10|195
-10|196
-10|197
-10|63
-10|198
-10|199
-10|200
-10|201
-10|35
-10|202
-10|203
-10|14
-10|204
-10|205
-10|206
-10|207
-10|140
-10|141
-10|15
-10|70
-10|208
-10|71
-10|209
-10|210
-10|144
-10|211
-10|212
-10|72
-10|74
-10|213
-10|37
-10|214
-10|215
-10|145
-10|216
-10|217
-10|16
-10|218
-10|219
-10|38
-10|220
-11|44
-11|0
-11|221
-11|222
-11|40
-11|6
-11|9
-11|153
-11|46
-11|155
-11|171
-11|223
-11|103
-11|224
-11|225
-11|189
-11|51
-11|226
-11|162
-11|163
-11|63
-11|136
-11|137
-11|227
-11|202
-11|107
-11|68
-11|228
-11|229
-11|230
-11|231
-11|232
-11|69
-11|36
-11|138
-11|14
-11|205
-11|206
-11|70
-11|111
-11|233
-11|210
-11|234
-11|212
-11|72
-11|73
-11|235
-11|74
-11|214
-11|215
-11|216
-11|217
-11|151
-11|152
-11|156
-12|236
-12|237
-13|238
-13|239
-14|0
-15|0
-15|169
-15|4
-15|202
-15|141
-15|70
-15|240
-15|241
-15|242
-15|243
-15|244
-15|245
-15|246
-16|247
-16|248
-16|249
-16|250
-16|251
-16|252
-16|253
-16|254
-16|255
-16|256
-16|257
-17|1
-17|258
-17|259
-17|260
-17|261
-17|262
-17|263
-17|264
-17|265
-17|266
-18|1
-18|267
-18|268
-19|1
-19|17
-19|19
-19|20
-19|21
-19|23
-19|24
-19|25
-19|27
-19|269
-19|270
-19|271
-19|272
-19|273
-19|274
-19|275
-19|276
-19|277
-19|278
-19|279
-19|280
-19|281
-19|282
-19|283
-19|284
-19|285
-19|286
-19|287
-19|288
-19|289
-19|290
-19|291
-19|292
-19|293
-19|294
-19|295
-19|296
-19|297
-19|298
-19|299
-19|300
-19|301
-19|302
-19|303
-19|304
-19|305
-19|306
-19|307
-19|308
-19|309
-19|310
-19|311
-19|312
-19|313
-19|314
-19|315
-19|316
-19|317
-19|318
-19|319
-19|320
-19|321
-19|322
-19|323
-19|324
-19|325
-19|326
-19|327
-19|328
-19|329
-19|330
-19|331
-19|332
-19|333
-19|334
-19|335
-19|336
-19|337
-19|338
-19|339
-19|340
-19|341
-19|342
-19|343
-19|344
-19|345
-19|29
-19|346
-19|347
-19|348
-19|349
-19|0
-19|350
-19|351
-20|17
-20|19
-20|20
-20|21
-20|23
-20|24
-20|25
-20|27
-20|29
-20|352
-20|353

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/data/xml.dat
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/data/xml.dat b/src/bin/gpmapreduce/test/data/xml.dat
deleted file mode 100644
index 0528d5a..0000000
--- a/src/bin/gpmapreduce/test/data/xml.dat
+++ /dev/null
@@ -1,8 +0,0 @@
-  1 | <list><item>2</item><item>3</item><item>5</item></list>
-  2 | <list/>
-  3 | <list><item>8</item><item>9</item><item>100</item><item>5</item></list>
-  4 | <list/>
-  5 | <list><item>8</item></list>
-  6 | <list/>
-  7 | <list/>
-  8 | <list/>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/DEFAULT.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/DEFAULT.err b/src/bin/gpmapreduce/test/expected/DEFAULT.err
deleted file mode 100644
index 4fda072..0000000
--- a/src/bin/gpmapreduce/test/expected/DEFAULT.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\)/
--- m|file://([^/]*)/|
--- s|file://([^/]*)/|file://HOSTNAME/|
--- end_matchsubs

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/DEFAULT.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/DEFAULT.out b/src/bin/gpmapreduce/test/expected/DEFAULT.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/access_frequency.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/access_frequency.1 b/src/bin/gpmapreduce/test/expected/access_frequency.1
deleted file mode 100644
index 5f42fca..0000000
--- a/src/bin/gpmapreduce/test/expected/access_frequency.1
+++ /dev/null
@@ -1,88 +0,0 @@
-/|2
-/%22index.php|2
-//|4
-///|3
-////|1
-///////|1
-//admin/editor2/spaw_control.class.php|2
-//admin/index.php|3
-//administrator/components/com_remository/admin.remository.php|1
-//akocomments.php|2
-//amember/plugins/payment/secpay/secpay.inc.php|1
-//bemarket/postscript/postscript.php|1
-//claroline//exercice//testheaderpage.php|1
-//claroline/phpbb/page_tail.php|1
-//components/com_rsgallery/rsgallery.html.php|1
-//include/monitoring/engine/MakeXML.php|1
-//login.php|1
-//mambots/content/multithumb/multithumb.php|9
-//modules/cjaycontent/admin/editor2/spaw_control.class.php|5
-//modules/vwar/convert/mvcw_conver.php|2
-//myfunctions/mygallerybrowser.php|8
-//nuseo/admin/nuseo_admin_d.php|1
-//rsgallery.html.php|5
-//skin/zero_vote/ask_password.php|1
-//wwwstat.html/admin_events.php|1
-/FormTools1_5_0/global/templates/admin_page_open.php|2
-/admin/%22index.php|2
-/admin//|4
-/admin///|3
-/admin////|1
-/admin///////|1
-/admin//admin/editor2/spaw_control.class.php|2
-/admin//admin/index.php|3
-/admin//administrator/components/com_remository/admin.remository.php|1
-/admin//akocomments.php|2
-/admin//amember/plugins/payment/secpay/secpay.inc.php|1
-/admin//bemarket/postscript/postscript.php|1
-/admin//claroline//exercice//testheaderpage.php|1
-/admin//claroline/phpbb/page_tail.php|1
-/admin//components/com_rsgallery/rsgallery.html.php|1
-/admin//include/monitoring/engine/MakeXML.php|1
-/admin//login.php|1
-/admin//mambots/content/multithumb/multithumb.php|9
-/admin//modules/cjaycontent/admin/editor2/spaw_control.class.php|5
-/admin//modules/vwar/convert/mvcw_conver.php|2
-/admin//myfunctions/mygallerybrowser.php|8
-/admin//nuseo/admin/nuseo_admin_d.php|1
-/admin//rsgallery.html.php|5
-/admin//skin/zero_vote/ask_password.php|1
-/admin//wwwstat.html/admin_events.php|1
-/admin/FormTools1_5_0/global/templates/admin_page_open.php|2
-/admin/access_log/%22index.php|1
-/admin/access_log//modules/cjaycontent/admin/editor2/spaw_control.class.php|5
-/admin/access_log//rsgallery.html.php|3
-/admin/access_log/components/com_hashcash/server.php|2
-/admin/access_log/convert/mvcw.php|4
-/admin/access_log/index.php|17
-/admin/access_log/modules/vwar/convert/mvcw_conver.php|5
-/admin/admin.php|1
-/admin/admin/admin.php|1
-/admin/admin/editeur/spaw_control.class.php|5
-/admin/admin/editor2/spaw_control.class.php|1
-/admin/affichearticles.php3|1
-/admin/components/com_hashcash/server.php|2
-/admin/components/com_rsgallery/rsgallery.html.php|3
-/admin/config.inc.php|1
-/admin/convert/mvcw.php|6
-/admin/editeur/spaw_control.class.php|5
-/admin/editor2/spaw_control.class.php|1
-/admin/errors.php|4
-/admin/index.php|31
-/admin/index2.php|1
-/admin/mambots/content/multithumb/multithumb.php|1
-/admin/modules/mod_stats.php|2
-/admin/modules/vwar/convert/mvcw_conver.php|11
-/admin/spaw_control.class.php|1
-/affichearticles.php3|1
-/components/com_hashcash/server.php|2
-/components/com_rsgallery/rsgallery.html.php|3
-/config.inc.php|1
-/convert/mvcw.php|5
-/errors.php|4
-/index.php|33
-/index2.php|1
-/modules/mod_stats.php|2
-/modules/vwar/convert/mvcw_conver.php|14
-/robots.txt|1
-/spaw_control.class.php|1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/access_frequency.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/access_frequency.err b/src/bin/gpmapreduce/test/expected/access_frequency.err
deleted file mode 100644
index 3e2d63d..0000000
--- a/src/bin/gpmapreduce/test/expected/access_frequency.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_70892_run_1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/access_frequency.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/access_frequency.out b/src/bin/gpmapreduce/test/expected/access_frequency.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/bad.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/bad.err b/src/bin/gpmapreduce/test/expected/bad.err
deleted file mode 100644
index 061ee31..0000000
--- a/src/bin/gpmapreduce/test/expected/bad.err
+++ /dev/null
@@ -1,333 +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
-Error: Greenplum MapReduce document must begin with a YAML MAPPING, at line 8
-Error: DOCUMENT: Missing VERSION, at line 4
-Error: Greenplum MapReduce document must begin with a YAML MAPPING, at line 16
-Error: DOCUMENT: Missing VERSION, at line 11
-Error: Invalid Document Attribute, at line 17
-Error: Invalid Document Attribute, at line 18
-Error: Invalid Document Attribute, at line 19
-Error: Invalid Document Attribute, at line 20
-Error: Invalid Document Attribute, at line 21
-Error: Invalid Document Attribute, at line 22
-Error: Invalid Document Attribute, at line 23
-Error: DOCUMENT: Missing VERSION, at line 16
-Error: Invalid VERSION format, at line 29
-Error: PORT must be an integer value, at line 33
-Error: DEFINE must be a YAML LIST, at line 34
-Error: EXECUTE must be a YAML LIST, at line 35
-Error: DOCUMENT: Missing VERSION, at line 28
-Error: VERSION must be a scalar value, at line 41
-Error: DATABASE must be a scalar value, at line 42
-Error: USER must be a scalar value, at line 43
-Error: HOST must be a scalar value, at line 44
-Error: PORT must be an integer value, at line 45
-Error: Scalar value 'list' found in DEFINE, at line 46
-Error: Scalar value 'list' found in EXECUTE, at line 47
-Error: DOCUMENT: Missing VERSION, at line 40
-Error: VERSION must be a scalar value, at line 51
-Error: DATABASE must be a scalar value, at line 52
-Error: USER must be a scalar value, at line 53
-Error: HOST must be a scalar value, at line 54
-Error: PORT must be an integer value, at line 55
-Error: DEFINE must be a YAML LIST, at line 56
-Error: EXECUTE must be a YAML LIST, at line 57
-Error: DOCUMENT: Missing VERSION, at line 50
-Error: List element found in DEFINE, at line 62
-Error: List element found in EXECUTE, at line 63
-Error: INPUT must contain a YAML MAPPING, at line 69
-Error: INPUT: Missing NAME, at line 69
-Error: INPUT: Missing FILE, GPFDIST, TABLE, QUERY, or EXEC, at line 69
-Error: OUTPUT must contain a YAML MAPPING, at line 70
-Error: OUTPUT: Missing NAME, at line 70
-Error: OUTPUT: Missing FILE or TABLE, at line 70
-Error: FUNCTION must contain a YAML MAPPING, at line 71
-Error: MAP: Missing NAME, at line 71
-Error: REDUCE must contain a YAML MAPPING, at line 72
-Error: REDUCE: Missing NAME, at line 72
-Error: REDUCE: Missing TRANSITION, at line 72
-Error: FUNCTION must contain a YAML MAPPING, at line 73
-Error: TRANSITION: Missing NAME, at line 73
-Error: FUNCTION must contain a YAML MAPPING, at line 74
-Error: CONSOLIDATE: Missing NAME, at line 74
-Error: FUNCTION must contain a YAML MAPPING, at line 75
-Error: FINALIZE: Missing NAME, at line 75
-Error: TASK must contain a YAML MAPPING, at line 76
-Error: TASK: Missing NAME, at line 76
-Error: TASK: Missing SOURCE, at line 76
-Error: RUN must contain a YAML MAPPING, at line 78
-Error: RUN: Missing SOURCE, at line 78
-Error: INPUT must contain a YAML MAPPING, at line 85
-Error: INPUT: Missing NAME, at line 85
-Error: INPUT: Missing FILE, GPFDIST, TABLE, QUERY, or EXEC, at line 85
-Error: OUTPUT must contain a YAML MAPPING, at line 86
-Error: OUTPUT: Missing NAME, at line 86
-Error: OUTPUT: Missing FILE or TABLE, at line 86
-Error: FUNCTION must contain a YAML MAPPING, at line 87
-Error: MAP: Missing NAME, at line 87
-Error: REDUCE must contain a YAML MAPPING, at line 88
-Error: REDUCE: Missing NAME, at line 88
-Error: REDUCE: Missing TRANSITION, at line 88
-Error: FUNCTION must contain a YAML MAPPING, at line 89
-Error: TRANSITION: Missing NAME, at line 89
-Error: FUNCTION must contain a YAML MAPPING, at line 90
-Error: CONSOLIDATE: Missing NAME, at line 90
-Error: FUNCTION must contain a YAML MAPPING, at line 91
-Error: FINALIZE: Missing NAME, at line 91
-Error: TASK must contain a YAML MAPPING, at line 92
-Error: TASK: Missing NAME, at line 92
-Error: TASK: Missing SOURCE, at line 92
-Error: RUN must contain a YAML MAPPING, at line 94
-Error: RUN: Missing SOURCE, at line 94
-Error: Invalid DEFINE Attribute, at line 100
-Error: 'id' is not a valid DEFINE element, at line 101
-Error: '100' is not a valid DEFINE element, at line 102
-Error: '1.0.0.1' is not a valid DEFINE element, at line 103
-Error: 'a string' is not a valid DEFINE element, at line 104
-Error: YAML LIST element found in DEFINE, at line 105
-Error: YAML MAPPING element found in DEFINE, at line 106
-Error: Invalid EXECUTE Attribute, at line 108
-Error: 'id' is not a valid EXECUTE element, at line 109
-Error: '100' is not a valid EXECUTE element, at line 110
-Error: '1.0.0.1' is not a valid EXECUTE element, at line 111
-Error: 'a string' is not a valid EXECUTE element, at line 112
-Error: YAML LIST element found in EXECUTE, at line 113
-Error: YAML MAPPING element found in EXECUTE, at line 114
-Error: Invalid INPUT Attribute, at line 121
-Error: id is not a valid INPUT attribute, at line 122
-Error: 100 is not a valid INPUT attribute, at line 123
-Error: 1.0.0.1 is not a valid INPUT attribute, at line 124
-Error: a string is not a valid INPUT attribute, at line 125
-Error: YAML LIST element found in INPUT, at line 126
-Error: YAML MAPPING element found in INPUT, at line 127
-Error: INPUT: Missing NAME, at line 120
-Error: INPUT: Missing FILE, GPFDIST, TABLE, QUERY, or EXEC, at line 120
-Error: Invalid OUTPUT Attribute, at line 129
-Error: id is not a valid OUTPUT attribute, at line 130
-Error: 100 is not a valid OUTPUT attribute, at line 131
-Error: 1.0.0.1 is not a valid OUTPUT attribute, at line 132
-Error: a string is not a valid OUTPUT attribute, at line 133
-Error: YAML LIST element found in OUTPUT, at line 134
-Error: YAML MAPPING element found in OUTPUT, at line 135
-Error: OUTPUT: Missing NAME, at line 128
-Error: OUTPUT: Missing FILE or TABLE, at line 128
-Error: Invalid FUNCTION Attribute, at line 137
-Error: id is not a valid FUNCTION attribute, at line 138
-Error: 100 is not a valid FUNCTION attribute, at line 139
-Error: 1.0.0.1 is not a valid FUNCTION attribute, at line 140
-Error: a string is not a valid FUNCTION attribute, at line 141
-Error: YAML LIST element found in FUNCTION, at line 142
-Error: YAML MAPPING element found in FUNCTION, at line 143
-Error: MAP: Missing NAME, at line 136
-Error: Invalid REDUCE Attribute, at line 145
-Error: id is not a valid REDUCER attribute, at line 146
-Error: 100 is not a valid REDUCER attribute, at line 147
-Error: 1.0.0.1 is not a valid REDUCER attribute, at line 148
-Error: a string is not a valid REDUCER attribute, at line 149
-Error: YAML LIST element found in REDUCE, at line 150
-Error: YAML MAPPING element found in REDUCE, at line 151
-Error: REDUCE: Missing NAME, at line 144
-Error: REDUCE: Missing TRANSITION, at line 144
-Error: Invalid FUNCTION Attribute, at line 153
-Error: id is not a valid FUNCTION attribute, at line 154
-Error: 100 is not a valid FUNCTION attribute, at line 155
-Error: 1.0.0.1 is not a valid FUNCTION attribute, at line 156
-Error: a string is not a valid FUNCTION attribute, at line 157
-Error: YAML LIST element found in FUNCTION, at line 158
-Error: YAML MAPPING element found in FUNCTION, at line 159
-Error: TRANSITION: Missing NAME, at line 152
-Error: Invalid FUNCTION Attribute, at line 161
-Error: id is not a valid FUNCTION attribute, at line 162
-Error: 100 is not a valid FUNCTION attribute, at line 163
-Error: 1.0.0.1 is not a valid FUNCTION attribute, at line 164
-Error: a string is not a valid FUNCTION attribute, at line 165
-Error: YAML LIST element found in FUNCTION, at line 166
-Error: YAML MAPPING element found in FUNCTION, at line 167
-Error: CONSOLIDATE: Missing NAME, at line 160
-Error: Invalid FUNCTION Attribute, at line 169
-Error: id is not a valid FUNCTION attribute, at line 170
-Error: 100 is not a valid FUNCTION attribute, at line 171
-Error: 1.0.0.1 is not a valid FUNCTION attribute, at line 172
-Error: a string is not a valid FUNCTION attribute, at line 173
-Error: YAML LIST element found in FUNCTION, at line 174
-Error: YAML MAPPING element found in FUNCTION, at line 175
-Error: FINALIZE: Missing NAME, at line 168
-Error: Invalid TASK Attribute, at line 177
-Error: id is not a valid TASK attribute, at line 178
-Error: 100 is not a valid TASK attribute, at line 179
-Error: 1.0.0.1 is not a valid TASK attribute, at line 180
-Error: a string is not a valid TASK attribute, at line 181
-Error: YAML LIST element found in TASK, at line 182
-Error: YAML MAPPING element found in TASK, at line 183
-Error: TASK: Missing NAME, at line 176
-Error: TASK: Missing SOURCE, at line 176
-Error: Invalid RUN Attribute, at line 186
-Error: id is not a valid RUN attribute, at line 187
-Error: 100 is not a valid RUN attribute, at line 188
-Error: 1.0.0.1 is not a valid RUN attribute, at line 189
-Error: a string is not a valid RUN attribute, at line 190
-Error: YAML LIST element found in RUN, at line 191
-Error: YAML MAPPING element found in RUN, at line 192
-Error: RUN: Missing SOURCE, at line 185
-Error: INPUT: Invalid NAME, at line 201
-Error: INPUT: Invalid NAME, at line 204
-Error: INPUT: Invalid NAME, at line 207
-Error: INPUT: Invalid NAME, at line 210
-Error: INPUT: Invalid NAME, at line 213
-Error: INPUT 'input_columns_empty': Invalid COLUMNS, at line 220
-Error: INPUT 'input_columns_mapping': Invalid COLUMNS, at line 224
-Error: INPUT 'input_table_empty': Invalid TABLE, at line 229
-Error: INPUT 'input_table_empty': Invalid TABLE, at line 229
-Error: INPUT 'input_table_string': Invalid TABLE, at line 232
-Error: INPUT 'input_table_string': Invalid TABLE, at line 232
-Error: INPUT 'input_table_number': Invalid TABLE, at line 235
-Error: INPUT 'input_table_number': Invalid TABLE, at line 235
-Error: INPUT 'input_table_list': Invalid TABLE, at line 238
-Error: INPUT 'input_table_list': Invalid TABLE, at line 238
-Error: INPUT 'input_table_mapping': Invalid TABLE, at line 241
-Error: INPUT 'input_table_mapping': Invalid TABLE, at line 241
-Error: INPUT 'input_file_empty': Invalid FILE, at line 246
-Error: INPUT 'input_file_mapping': Invalid FILE, at line 249
-Error: INPUT 'input_query_empty': Invalid QUERY, at line 254
-Error: INPUT 'input_query_list': Invalid QUERY, at line 257
-Error: INPUT 'input_query_mapping': Invalid QUERY, at line 260
-Error: INPUT 'input_exec_empty': Invalid EXEC, at line 265
-Error: INPUT 'input_exec_list': Invalid EXEC, at line 268
-Error: INPUT 'input_exec_mapping': Invalid EXEC, at line 271
-Error: INPUT 'input_gpfdist_empty': Invalid GPFDIST, at line 276
-Error: INPUT 'input_gpfdist_mapping': Invalid GPFDIST, at line 279
-Error: INPUT 'input_format_empty': Duplicate FORMAT, at line 285
-Error: INPUT 'input_format_list': Duplicate FORMAT, at line 289
-Error: INPUT 'input_format_mapping': Duplicate FORMAT, at line 293
-Error: INPUT 'input_delimiter_empty': Invalid DELIMITER, at line 299
-Error: INPUT 'input_delimiter_list': Invalid DELIMITER, at line 303
-Error: INPUT 'input_delimiter_mapping': Invalid DELIMITER, at line 307
-Error: INPUT 'input_null_empty': Invalid NULL, at line 313
-Error: INPUT 'input_null_list': Invalid NULL, at line 317
-Error: INPUT 'input_null_mapping': Invalid NULL, at line 321
-Error: INPUT 'input_quote_empty': Invalid QUOTE, at line 327
-Error: INPUT 'input_quote_list': Invalid QUOTE, at line 331
-Error: INPUT 'input_quote_mapping': Invalid QUOTE, at line 335
-Error: INPUT 'input_escape_empty': Invalid ESCAPE, at line 341
-Error: INPUT 'input_escape_list': Invalid ESCAPE, at line 345
-Error: INPUT 'input_escape_mapping': Invalid ESCAPE, at line 349
-Error: INPUT 'input_encoding_empty': Invalid ENCODING, at line 355
-Error: INPUT 'input_encoding_list': Invalid ENCODING, at line 359
-Error: INPUT 'input_encoding_mapping': Invalid ENCODING, at line 363
-Error: INPUT 'input_error_limit_empty': Invalid ERROR_LIMIT, at line 369
-Error: INPUT 'input_error_limit_empty': Invalid ERROR_LIMIT, at line 373
-Error: INPUT 'input_error_limit_list': Invalid ERROR_LIMIT, at line 377
-Error: INPUT 'input_error_limit_mapping': Invalid ERROR_LIMIT, at line 381
-Error: OUTPUT: Invalid NAME, at line 385
-Error: OUTPUT: Invalid NAME, at line 388
-Error: OUTPUT: Invalid NAME, at line 391
-Error: OUTPUT: Invalid NAME, at line 394
-Error: OUTPUT: Invalid NAME, at line 397
-Error: OUTPUT 'output_table_empty': Invalid TABLE, at line 403
-Error: OUTPUT 'output_table_empty': Invalid TABLE, at line 403
-Error: OUTPUT 'output_table_string': Invalid TABLE, at line 406
-Error: OUTPUT 'output_table_string': Invalid TABLE, at line 406
-Error: OUTPUT 'output_table_number': Invalid TABLE, at line 409
-Error: OUTPUT 'output_table_number': Invalid TABLE, at line 409
-Error: OUTPUT 'output_table_list': Invalid TABLE, at line 412
-Error: OUTPUT 'output_table_list': Invalid TABLE, at line 412
-Error: OUTPUT 'output_table_mapping': Invalid TABLE, at line 415
-Error: OUTPUT 'output_table_mapping': Invalid TABLE, at line 415
-Error: OUTPUT 'output_file_empty': Invalid FILE, at line 420
-Error: OUTPUT 'output_file_mapping': Invalid FILE, at line 429
-Error: OUTPUT 'output_file_list': Invalid FILE, at line 432
-Error: OUTPUT 'output_format_empty': Duplicate FORMAT, at line 438
-Error: OUTPUT 'output_format_mapping': Duplicate FORMAT, at line 442
-Error: OUTPUT 'output_format_list': Duplicate FORMAT, at line 446
-Error: OUTPUT 'output_delimiter_empty': Invalid DELIMITER, at line 452
-Error: OUTPUT 'output_delimiter_mapping': Invalid DELIMITER, at line 456
-Error: OUTPUT 'output_delimiter_list': Invalid DELIMITER, at line 460
-Error: OUTPUT 'output_mode_empty': Invalid MODE, at line 466
-Error: OUTPUT 'output_mode_mapping': Invalid MODE, at line 470
-Error: OUTPUT 'output_mode_list': Invalid MODE, at line 474
-Error: MAP: Invalid NAME, at line 478
-Error: MAP: Invalid NAME, at line 482
-Error: MAP: Invalid NAME, at line 486
-Error: MAP: Invalid NAME, at line 490
-Error: MAP: Invalid NAME, at line 494
-Error: MAP 'map_language_empty': Invalid LANGUAGE, at line 501
-Error: MAP 'map_language_mapping': Invalid LANGUAGE, at line 505
-Error: MAP 'map_language_list': Invalid LANGUAGE, at line 509
-Error: MAP 'map_function_empty': Invalid FUNCTION, at line 516
-Error: MAP 'map_function_mapping': Invalid FUNCTION, at line 520
-Error: MAP 'map_function_list': Invalid FUNCTION, at line 524
-Error: MAP 'map_mode_empty': Invalid MODE, at line 531
-Error: MAP 'map_mode_mapping': Invalid MODE, at line 536
-Error: MAP 'map_mode_list': Invalid MODE, at line 541
-Error: MAP 'map_parameters_empty': Invalid PARAMETERS, at line 565
-Error: MAP 'map_parameters_mapping': Invalid PARAMETERS, at line 570
-Error: MAP 'map_returns_empty': Invalid RETURNS, at line 577
-Error: MAP 'map_returns_mapping': Invalid RETURNS, at line 582
-Error: TRANSITION: Invalid NAME, at line 586
-Error: TRANSITION: Invalid NAME, at line 590
-Error: TRANSITION: Invalid NAME, at line 594
-Error: TRANSITION: Invalid NAME, at line 598
-Error: TRANSITION: Invalid NAME, at line 602
-Error: TRANSITION 'transition_language_empty': Invalid LANGUAGE, at line 609
-Error: TRANSITION 'transition_language_mapping': Invalid LANGUAGE, at line 613
-Error: TRANSITION 'transition_language_list': Invalid LANGUAGE, at line 617
-Error: TRANSITION 'transition_function_empty': Invalid FUNCTION, at line 624
-Error: TRANSITION 'transition_function_mapping': Invalid FUNCTION, at line 628
-Error: TRANSITION 'transition_function_list': Invalid FUNCTION, at line 632
-Error: TRANSITION 'transition_mode_empty': Invalid MODE, at line 639
-Error: TRANSITION 'transition_mode_mapping': Invalid MODE, at line 644
-Error: TRANSITION 'transition_mode_list': Invalid MODE, at line 649
-Error: TRANSITION 'transition_parameters_empty': Invalid PARAMETERS, at line 673
-Error: TRANSITION 'transition_parameters_mapping': Invalid PARAMETERS, at line 678
-Error: TRANSITION 'transition_insufficient_parameters': requires at least 2 input parameters [state, arg1, ...], at line 679
-Error: TRANSITION 'transition_returns_empty': Invalid RETURNS, at line 690
-Error: TRANSITION 'transition_returns_mapping': Invalid RETURNS, at line 695
-Error: TRANSITION 'transition_returns_extra_values': requires exactly one output parameter [state], at line 696
-Error: CONSOLIDATE: Invalid NAME, at line 704
-Error: CONSOLIDATE: Invalid NAME, at line 708
-Error: CONSOLIDATE: Invalid NAME, at line 712
-Error: CONSOLIDATE: Invalid NAME, at line 716
-Error: CONSOLIDATE: Invalid NAME, at line 720
-Error: CONSOLIDATE 'consolidate_language_empty': Invalid LANGUAGE, at line 727
-Error: CONSOLIDATE 'consolidate_language_mapping': Invalid LANGUAGE, at line 731
-Error: CONSOLIDATE 'consolidate_language_list': Invalid LANGUAGE, at line 735
-Error: CONSOLIDATE 'consolidate_function_empty': Invalid FUNCTION, at line 742
-Error: CONSOLIDATE 'consolidate_function_mapping': Invalid FUNCTION, at line 746
-Error: CONSOLIDATE 'consolidate_function_list': Invalid FUNCTION, at line 750
-Error: CONSOLIDATE 'consolidate_mode_empty': Invalid MODE, at line 757
-Error: CONSOLIDATE 'consolidate_mode_mapping': Invalid MODE, at line 762
-Error: CONSOLIDATE 'consolidate_mode_list': Invalid MODE, at line 767
-Error: CONSOLIDATE 'consolidate_parameters_empty': Invalid PARAMETERS, at line 791
-Error: CONSOLIDATE 'consolidate_parameters_mapping': Invalid PARAMETERS, at line 796
-Error: CONSOLIDATE 'consolidate_parameters_insufficient': requires exactly 2 input parameters [state1, state2], at line 797
-Error: CONSOLIDATE 'consolidate_parameters_extra': requires exactly 2 input parameters [state1, state2], at line 802
-Error: CONSOLIDATE 'consolidate_returns_empty': Invalid RETURNS, at line 813
-Error: CONSOLIDATE 'consolidate_returns_mapping': Invalid RETURNS, at line 818
-Error: CONSOLIDATE 'consolidate_returns_extra': requires exactly one output parameter [state], at line 819
-Error: FINALIZE: Invalid NAME, at line 827
-Error: FINALIZE: Invalid NAME, at line 831
-Error: FINALIZE: Invalid NAME, at line 835
-Error: FINALIZE: Invalid NAME, at line 839
-Error: FINALIZE: Invalid NAME, at line 843
-Error: FINALIZE 'finalize_language_empty': Invalid LANGUAGE, at line 850
-Error: FINALIZE 'finalize_language_mapping': Invalid LANGUAGE, at line 854
-Error: FINALIZE 'finalize_language_list': Invalid LANGUAGE, at line 858
-Error: FINALIZE 'finalize_function_empty': Invalid FUNCTION, at line 865
-Error: FINALIZE 'finalize_function_mapping': Invalid FUNCTION, at line 869
-Error: FINALIZE 'finalize_function_list': Invalid FUNCTION, at line 873
-Error: FINALIZE 'finalize_mode_empty': Invalid MODE, at line 880
-Error: FINALIZE 'finalize_mode_mapping': Invalid MODE, at line 885
-Error: FINALIZE 'finalize_mode_list': Invalid MODE, at line 890
-Error: FINALIZE 'finalize_parameters_empty': Invalid PARAMETERS, at line 914
-Error: FINALIZE 'finalize_parameters_mapping': Invalid PARAMETERS, at line 919
-Error: FINALIZE 'finalize_parameters_extra': requires exactly 1 input parameter [state], at line 920
-Error: FINALIZE 'finalize_returns_empty': Invalid RETURNS, at line 931
-Error: FINALIZE 'finalize_returns_mapping': Invalid RETURNS, at line 936
-Error: parse failure
-gpmapreduce retcode=0

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/bad.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/bad.out b/src/bin/gpmapreduce/test/expected/bad.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/badflow.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/badflow.err b/src/bin/gpmapreduce/test/expected/badflow.err
deleted file mode 100644
index cb224cf..0000000
--- a/src/bin/gpmapreduce/test/expected/badflow.err
+++ /dev/null
@@ -1,24 +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
-Error: INPUT: Invalid NAME, at line 27
-Error: INPUT: Invalid NAME, at line 34
-Error: INPUT: Invalid NAME, at line 41
-Error: INPUT: Invalid NAME, at line 47
-Error: INPUT: Invalid NAME, at line 55
-Error: mapping is not a valid INPUT attribute, at line 56
-Error: INPUT: Invalid NAME, at line 66
-Error: Multiple objects in one list element, at line 67
-Error: INPUT: Invalid NAME, at line 76
-Error: Invalid Document Attribute, at line 77
-Error: DOCUMENT: Missing VERSION, at line 5
-Error: INPUT: Invalid NAME, at line 92
-Error: YAML syntax error - did not find expected key while parsing a block mapping, at line 93
-Error: DOCUMENT: Missing VERSION, at line 79
-Error: parse failure
-gpmapreduce retcode=0

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/badflow.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/badflow.out b/src/bin/gpmapreduce/test/expected/badflow.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/badplperl.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/badplperl.err b/src/bin/gpmapreduce/test/expected/badplperl.err
deleted file mode 100644
index fc9804b..0000000
--- a/src/bin/gpmapreduce/test/expected/badplperl.err
+++ /dev/null
@@ -1,18 +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
-ERROR:  creation of Perl function failed
-DETAIL:  'require' trapped by operation mask at line 10.
-Error: Object creation Failure
-mapreduce_30882_run_1
-ERROR:  Perl function "mapreduce_30882_badpl_map" failed (plperl.c:1199)  (seg1 slice1 maple.local:60001 pid=30884) (cdbdisp.c:1457)
-DETAIL:  
-	 badplmap: die die die at line 27.
-	 External table mapreduce_30882_indirectory, line 1 of file://maple.local/views/dev-full/main/src/bin/gpmapreduce/test/data/access_log2: ""
-Error: Execution Failure
-gpmapreduce retcode=0

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/badplperl.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/badplperl.out b/src/bin/gpmapreduce/test/expected/badplperl.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/badplpython.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/badplpython.err b/src/bin/gpmapreduce/test/expected/badplpython.err
deleted file mode 100644
index 4369f90..0000000
--- a/src/bin/gpmapreduce/test/expected/badplpython.err
+++ /dev/null
@@ -1,21 +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_30962_run_1
-ERROR:  PL/Python: could not compile function "mapreduce_30962_badpy_map" (plpython.c:3170)  (seg0 slice1 maple.local:60000 pid=30963) (cdbdisp.c:1457)
-DETAIL:  
-	 <type 'exceptions.SyntaxError'>: EOL while scanning string literal (mapreduce_30962_badpy_map, line 14)
-	 External table mapreduce_30962_indirectory, line 1 of file://maple.local/views/dev-full/main/src/bin/gpmapreduce/test/data/access_log: ""
-Error: Execution Failure
-mapreduce_30967_run_1
-ERROR:  PL/Python: PL/Python function "mapreduce_30967_badpy_map" failed (plpython.c:3170)  (seg0 slice1 maple.local:60000 pid=30968) (cdbdisp.c:1457)
-DETAIL:  
-	 <type 'exceptions.Exception'>: error at runtime (mapreduce_30967_badpy_map, line 1)
-	 External table mapreduce_30967_indirectory, line 1 of file://maple.local/views/dev-full/main/src/bin/gpmapreduce/test/data/access_log: ""
-Error: Execution Failure
-gpmapreduce retcode=0

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/badplpython.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/badplpython.out b/src/bin/gpmapreduce/test/expected/badplpython.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/badref.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/badref.err b/src/bin/gpmapreduce/test/expected/badref.err
deleted file mode 100644
index 71d64e3..0000000
--- a/src/bin/gpmapreduce/test/expected/badref.err
+++ /dev/null
@@ -1,51 +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_31046_run_1
-ERROR:  Could not assign a segment database for "file://invalidhost/path/to/file". There isn't a valid primary segment database on host "invalidhost"
-Error: Execution Failure
-mapreduce_31049_run_1
-ERROR:  could not translate host name "invalidhost", port "8080" to address: nodename nor servname provided, or not known (cdbutil.c:757)  (seg0 slice1 maple.local:60000 pid=31050) (cdbdisp.c:1457)
-Error: Execution Failure
-mapreduce_31055_run_1
-NOTICE:  gfile stat /dev/null/badfile failure: Not a directory  (seg0 slice1 maple.local:60000 pid=31056)
-NOTICE:  fstream unable to open file /dev/null/badfile  (seg0 slice1 maple.local:60000 pid=31056)
-ERROR:  could not open "file://maple.local/dev/null/badfile" for reading: 404 file not found  (seg0 slice1 maple.local:60000 pid=31056)
-Error: Execution Failure
-mapreduce_31058_run_1
-NOTICE:  gfile stat /badfile failure: No such file or directory  (seg0 slice1 maple.local:60000 pid=31059)
-NOTICE:  fstream unable to open file /badfile  (seg0 slice1 maple.local:60000 pid=31059)
-ERROR:  could not open "file://maple.local/badfile" for reading: 404 file not found  (seg0 slice1 maple.local:60000 pid=31059)
-Error: Execution Failure
-mapreduce_31061_run_1
-ERROR:  external table mapreduce_31061_input_bad_exec command ended with error. sh: /dev/null: Permission denied  (seg0 slice1 maple.local:60000 pid=31062)
-DETAIL:  Command: execute:/dev/null
-Error: Execution Failure
-Error: INPUT 'input_bad_table': Table 'invalid_table' not found, at line 56
-Error: Object creation Failure
-Error: RUN 'mapreduce_31071_run_1': SOURCE 'map_not_input' is neither an INPUT nor a TASK, at line 70
-Error: Object Resolution Failure
-Error: RUN 'mapreduce_31072_run_1': TARGET 'map_not_output' is not defined in document, at line 83
-Error: Object Resolution Failure
-Error: TRANSITION 'invalid_transition': No such function, at line 90
-Error: Object creation Failure
-Error: CONSOLIDATE 'invalid_consolidate': No such function, at line 97
-Error: Object creation Failure
-Error: FINALIZE 'invalid_finalize': No such function, at line 105
-Error: Object creation Failure
-Error: TRANSITION 'generate_series': Ambiguous function, supply a function prototype for disambiguation, at line 113
-Error: Object creation Failure
-Error: TASK 'badref_task': SOURCE 'invalid_input' not found in document, at line 120
-Error: Object Resolution Failure
-Error: MAP 'invalid_map': No such function, at line 131
-Error: Object creation Failure
-Error: RUN 'mapreduce_31079_run_1': SOURCE 'invalid_input' not found in document, at line 142
-Error: Object Resolution Failure
-Error: RUN 'mapreduce_31080_run_1': TARGET 'invalid_output' is not defined in document, at line 152
-Error: Object Resolution Failure
-gpmapreduce retcode=0

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/badref.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/badref.out b/src/bin/gpmapreduce/test/expected/badref.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/builtin_1.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_1.1 b/src/bin/gpmapreduce/test/expected/builtin_1.1
deleted file mode 100644
index df07f92..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_1.1
+++ /dev/null
@@ -1,26 +0,0 @@
-because|1
-count|2
-do|1
-hello|5
-lets|1
-like|1
-map|1
-more|1
-occur|1
-of|2
-once|1
-reduce|1
-so|1
-some|1
-tests|1
-than|1
-that|2
-the|1
-thing|1
-this|1
-to|1
-want|1
-we|1
-word|1
-words|2
-world|3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_1.2
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_1.2 b/src/bin/gpmapreduce/test/expected/builtin_1.2
deleted file mode 100644
index df07f92..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_1.2
+++ /dev/null
@@ -1,26 +0,0 @@
-because|1
-count|2
-do|1
-hello|5
-lets|1
-like|1
-map|1
-more|1
-occur|1
-of|2
-once|1
-reduce|1
-so|1
-some|1
-tests|1
-than|1
-that|2
-the|1
-thing|1
-this|1
-to|1
-want|1
-we|1
-word|1
-words|2
-world|3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_1.3
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_1.3 b/src/bin/gpmapreduce/test/expected/builtin_1.3
deleted file mode 100644
index df07f92..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_1.3
+++ /dev/null
@@ -1,26 +0,0 @@
-because|1
-count|2
-do|1
-hello|5
-lets|1
-like|1
-map|1
-more|1
-occur|1
-of|2
-once|1
-reduce|1
-so|1
-some|1
-tests|1
-than|1
-that|2
-the|1
-thing|1
-this|1
-to|1
-want|1
-we|1
-word|1
-words|2
-world|3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_1.4
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_1.4 b/src/bin/gpmapreduce/test/expected/builtin_1.4
deleted file mode 100644
index df07f92..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_1.4
+++ /dev/null
@@ -1,26 +0,0 @@
-because|1
-count|2
-do|1
-hello|5
-lets|1
-like|1
-map|1
-more|1
-occur|1
-of|2
-once|1
-reduce|1
-so|1
-some|1
-tests|1
-than|1
-that|2
-the|1
-thing|1
-this|1
-to|1
-want|1
-we|1
-word|1
-words|2
-world|3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_1.5
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_1.5 b/src/bin/gpmapreduce/test/expected/builtin_1.5
deleted file mode 100644
index df07f92..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_1.5
+++ /dev/null
@@ -1,26 +0,0 @@
-because|1
-count|2
-do|1
-hello|5
-lets|1
-like|1
-map|1
-more|1
-occur|1
-of|2
-once|1
-reduce|1
-so|1
-some|1
-tests|1
-than|1
-that|2
-the|1
-thing|1
-this|1
-to|1
-want|1
-we|1
-word|1
-words|2
-world|3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_1.6
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_1.6 b/src/bin/gpmapreduce/test/expected/builtin_1.6
deleted file mode 100644
index df07f92..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_1.6
+++ /dev/null
@@ -1,26 +0,0 @@
-because|1
-count|2
-do|1
-hello|5
-lets|1
-like|1
-map|1
-more|1
-occur|1
-of|2
-once|1
-reduce|1
-so|1
-some|1
-tests|1
-than|1
-that|2
-the|1
-thing|1
-this|1
-to|1
-want|1
-we|1
-word|1
-words|2
-world|3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_1.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_1.err b/src/bin/gpmapreduce/test/expected/builtin_1.err
deleted file mode 100644
index 96ea2f5..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_1.err
+++ /dev/null
@@ -1,14 +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_40092_run_1
-mapreduce_40092_run_2
-mapreduce_40097_run_1
-mapreduce_40097_run_2
-mapreduce_40102_run_1
-mapreduce_40102_run_2

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_1.init.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_1.init.out b/src/bin/gpmapreduce/test/expected/builtin_1.init.out
deleted file mode 100644
index 7daf0cc..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_1.init.out
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE TYPE
-CREATE FUNCTION
-CREATE FUNCTION
-CREATE FUNCTION
-CREATE FUNCTION

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_1.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_1.out b/src/bin/gpmapreduce/test/expected/builtin_1.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/builtin_function.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_function.err b/src/bin/gpmapreduce/test/expected/builtin_function.err
deleted file mode 100644
index 153d799..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_function.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\)/
--- end_matchsubs
-mapreduce_65092_run_1
-mapreduce_65092_run_2
-mapreduce_65092_run_3
-mapreduce_65092_run_4
-mapreduce_65092_run_5

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_function.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_function.out b/src/bin/gpmapreduce/test/expected/builtin_function.out
deleted file mode 100644
index 76c25b2..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_function.out
+++ /dev/null
@@ -1,125 +0,0 @@
-key|value
----+-----
- -3|   -1
- -3|    0
- -3|    1
- -2|   -1
- -2|    0
- -2|    1
- -1|   -1
- -1|    0
- -1|    1
-  0|   -1
-  0|    0
-  0|    1
-  1|   -1
-  1|    0
-  1|    1
-  2|   -1
-  2|    0
-  2|    1
-  3|   -1
-  3|    0
-  3|    1
-(21 rows)
-
-key|value        
----+-------------
-  0|hello world-1
-  0|hello world0 
-  0|hello world1 
-  1|hello world-1
-  1|hello world-1
-  1|hello world0 
-  1|hello world0 
-  1|hello world1 
-  1|hello world1 
-  2|hello world-1
-  2|hello world-1
-  2|hello world0 
-  2|hello world0 
-  2|hello world1 
-  2|hello world1 
-  3|hello world-1
-  3|hello world-1
-  3|hello world0 
-  3|hello world0 
-  3|hello world1 
-  3|hello world1 
-(21 rows)
-
-               key
-------------------
--0.989992496600445
--0.989992496600445
--0.989992496600445
--0.989992496600445
--0.989992496600445
--0.989992496600445
--0.416146836547142
--0.416146836547142
--0.416146836547142
--0.416146836547142
--0.416146836547142
--0.416146836547142
-  0.54030230586814
-  0.54030230586814
-  0.54030230586814
-  0.54030230586814
-  0.54030230586814
-  0.54030230586814
-                 1
-                 1
-                 1
-(21 rows)
-
-value
------
-   12
-   12
-   12
-   12
-   12
-   12
-   12
-   12
-   12
-   12
-   12
-   12
-   12
-   12
-   13
-   13
-   13
-   13
-   13
-   13
-   13
-(21 rows)
-
-value        
--------------
-ello world-1 
-ello world-1 
-ello world0  
-ello world0  
-ello world1  
-ello world1  
-hello world-1
-hello world-1
-hello world-1
-hello world0 
-hello world0 
-hello world0 
-hello world1 
-hello world1 
-hello world1 
-llo world-1  
-llo world-1  
-llo world0   
-llo world0   
-llo world1   
-llo world1   
-(21 rows)
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_reducer.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_reducer.err b/src/bin/gpmapreduce/test/expected/builtin_reducer.err
deleted file mode 100644
index 1425df1..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_reducer.err
+++ /dev/null
@@ -1,22 +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
-Error: REDUCE 'SUM': Missing TRANSITION, at line 144
-WARNING: unset parameter - SUM(value => NULL)
-ERROR:  function sum(unknown) is not unique
-LINE 2: SELECT x, y, SUM(NULL) as value
-                     ^
-HINT:  Could not choose a best candidate function. You may need to add explicit type casts.
-Error: Object creation Failure
-WARNING: unset parameter - COUNT(value => NULL)
-mapreduce_65600_run_1
-mapreduce_65603_run_1
-mapreduce_65603_run_2
-mapreduce_65603_run_3
-mapreduce_65603_run_4
-mapreduce_65603_run_5
-mapreduce_65603_run_6
-mapreduce_65606_run_1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/builtin_reducer.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/builtin_reducer.out b/src/bin/gpmapreduce/test/expected/builtin_reducer.out
deleted file mode 100644
index 45688cd..0000000
--- a/src/bin/gpmapreduce/test/expected/builtin_reducer.out
+++ /dev/null
@@ -1,82 +0,0 @@
-x|y|value
--+-+-----
-1|0|    0
-1|1|    0
-1|2|    0
-2|0|    0
-2|1|    0
-2|2|    0
-3|0|    0
-3|1|    0
-3|2|    0
-4|0|    0
-4|1|    0
-4|2|    0
-5|0|    0
-5|1|    0
-5|2|    0
-(15 rows)
-
-key|value
----+-----
-  1|    3
-  2|    3
-  3|    3
-  4|    3
-  5|    3
-(5 rows)
-
-key|value
----+-----
-  1|    0
-  2|    0
-  3|    0
-  4|    0
-  5|    0
-(5 rows)
-
-key|value
----+-----
-  1|    2
-  2|    2
-  3|    2
-  4|    2
-  5|    2
-(5 rows)
-
-key|value
----+-----
-  1|    3
-  2|    3
-  3|    3
-  4|    3
-  5|    3
-(5 rows)
-
-key|value
----+-----
-  1|    1
-  2|    1
-  3|    1
-  4|    1
-  5|    1
-(5 rows)
-
-key|                 value
----+----------------------
-  1|1.00000000000000000000
-  2|1.00000000000000000000
-  3|1.00000000000000000000
-  4|1.00000000000000000000
-  5|1.00000000000000000000
-(5 rows)
-
-x|value
--+-----
-1|    3
-2|    3
-3|    3
-4|    3
-5|    3
-(5 rows)
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/c_function.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/c_function.1 b/src/bin/gpmapreduce/test/expected/c_function.1
deleted file mode 100644
index df07f92..0000000
--- a/src/bin/gpmapreduce/test/expected/c_function.1
+++ /dev/null
@@ -1,26 +0,0 @@
-because|1
-count|2
-do|1
-hello|5
-lets|1
-like|1
-map|1
-more|1
-occur|1
-of|2
-once|1
-reduce|1
-so|1
-some|1
-tests|1
-than|1
-that|2
-the|1
-thing|1
-this|1
-to|1
-want|1
-we|1
-word|1
-words|2
-world|3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/c_function.2
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/c_function.2 b/src/bin/gpmapreduce/test/expected/c_function.2
deleted file mode 100644
index df07f92..0000000
--- a/src/bin/gpmapreduce/test/expected/c_function.2
+++ /dev/null
@@ -1,26 +0,0 @@
-because|1
-count|2
-do|1
-hello|5
-lets|1
-like|1
-map|1
-more|1
-occur|1
-of|2
-once|1
-reduce|1
-so|1
-some|1
-tests|1
-than|1
-that|2
-the|1
-thing|1
-this|1
-to|1
-want|1
-we|1
-word|1
-words|2
-world|3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/c_function.3
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/c_function.3 b/src/bin/gpmapreduce/test/expected/c_function.3
deleted file mode 100644
index df07f92..0000000
--- a/src/bin/gpmapreduce/test/expected/c_function.3
+++ /dev/null
@@ -1,26 +0,0 @@
-because|1
-count|2
-do|1
-hello|5
-lets|1
-like|1
-map|1
-more|1
-occur|1
-of|2
-once|1
-reduce|1
-so|1
-some|1
-tests|1
-than|1
-that|2
-the|1
-thing|1
-this|1
-to|1
-want|1
-we|1
-word|1
-words|2
-world|3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/c_function.4
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/c_function.4 b/src/bin/gpmapreduce/test/expected/c_function.4
deleted file mode 100644
index df07f92..0000000
--- a/src/bin/gpmapreduce/test/expected/c_function.4
+++ /dev/null
@@ -1,26 +0,0 @@
-because|1
-count|2
-do|1
-hello|5
-lets|1
-like|1
-map|1
-more|1
-occur|1
-of|2
-once|1
-reduce|1
-so|1
-some|1
-tests|1
-than|1
-that|2
-the|1
-thing|1
-this|1
-to|1
-want|1
-we|1
-word|1
-words|2
-world|3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/c_function.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/c_function.err b/src/bin/gpmapreduce/test/expected/c_function.err
deleted file mode 100644
index ca796ec..0000000
--- a/src/bin/gpmapreduce/test/expected/c_function.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_71341_run_1
-mapreduce_71341_run_2
-mapreduce_71341_run_3
-mapreduce_71341_run_4

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/c_function.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/c_function.out b/src/bin/gpmapreduce/test/expected/c_function.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/columns.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/columns.1 b/src/bin/gpmapreduce/test/expected/columns.1
deleted file mode 100644
index f0abf9b..0000000
--- a/src/bin/gpmapreduce/test/expected/columns.1
+++ /dev/null
@@ -1,5 +0,0 @@
-91.142.213.11|//claroline//exercice//testheaderpage.php?rootSys=http://h1.ripway.com/iff/safe.txt?|1
-91.142.213.11|//claroline/phpbb/page_tail.php?includePath=http://h1.ripway.com/iff/safe.txt?|1
-91.142.213.11|/admin//claroline//exercice//testheaderpage.php?rootSys=http://h1.ripway.com/iff/safe.txt?|1
-91.142.213.11|/admin//claroline/phpbb/page_tail.php?includePath=http://h1.ripway.com/iff/safe.txt?|1
-91.142.213.11|4

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/columns.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/columns.err b/src/bin/gpmapreduce/test/expected/columns.err
deleted file mode 100644
index f6f53d2..0000000
--- a/src/bin/gpmapreduce/test/expected/columns.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_71438_run_1
-mapreduce_71438_run_2

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/columns.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/columns.out b/src/bin/gpmapreduce/test/expected/columns.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/graph.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/graph.1 b/src/bin/gpmapreduce/test/expected/graph.1
deleted file mode 100644
index 9c919e4..0000000
--- a/src/bin/gpmapreduce/test/expected/graph.1
+++ /dev/null
@@ -1,20 +0,0 @@
-0|17
-1|17
-3|4
-4|21
-5|4
-6|23
-7|23
-8|12
-9|17
-10|77
-11|55
-12|2
-13|2
-14|1
-15|13
-16|11
-17|10
-18|3
-19|94
-20|11



[11/17] incubator-hawq git commit: HAWQ-100. Code Cleanup: gpmapreduce.

Posted by rl...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/graph.2
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/graph.2 b/src/bin/gpmapreduce/test/expected/graph.2
deleted file mode 100644
index 43c444c..0000000
--- a/src/bin/gpmapreduce/test/expected/graph.2
+++ /dev/null
@@ -1,308 +0,0 @@
-0|14
-1|4
-2|1
-3|2
-4|3
-5|1
-6|4
-7|2
-8|2
-9|3
-10|1
-11|2
-12|2
-13|1
-14|9
-15|2
-16|2
-17|3
-18|1
-19|3
-20|3
-21|3
-22|1
-23|2
-24|3
-25|4
-26|1
-27|2
-28|1
-29|2
-30|1
-33|3
-35|2
-36|1
-37|4
-38|2
-39|2
-40|3
-41|1
-43|1
-44|2
-45|1
-46|4
-48|1
-50|1
-51|2
-52|1
-54|1
-56|1
-58|1
-60|1
-62|1
-63|2
-64|1
-66|1
-68|2
-69|1
-70|4
-71|2
-72|2
-73|2
-74|2
-75|1
-76|1
-78|1
-80|2
-82|1
-83|1
-86|1
-88|1
-89|1
-92|1
-93|1
-95|1
-98|1
-100|1
-103|1
-105|1
-107|2
-108|1
-109|1
-110|1
-111|1
-116|1
-118|1
-119|1
-120|1
-121|2
-122|1
-123|1
-129|1
-131|1
-133|1
-134|3
-135|1
-136|1
-137|1
-138|2
-139|1
-140|2
-141|3
-144|2
-145|2
-149|1
-150|2
-151|2
-152|1
-153|2
-154|1
-155|2
-156|2
-157|1
-158|1
-159|1
-160|1
-161|1
-162|2
-163|2
-164|1
-165|1
-166|1
-167|1
-168|1
-169|2
-170|1
-171|2
-172|1
-173|1
-174|1
-175|1
-176|1
-177|1
-178|1
-179|1
-180|1
-181|1
-182|1
-183|1
-184|1
-185|1
-186|1
-187|1
-188|1
-189|2
-190|1
-191|1
-192|1
-193|1
-194|1
-195|1
-196|1
-197|1
-198|1
-199|1
-200|1
-201|1
-202|3
-203|1
-204|1
-205|2
-206|2
-207|1
-208|1
-209|1
-210|2
-211|1
-212|2
-213|1
-214|2
-215|2
-216|2
-217|2
-218|1
-219|1
-220|1
-221|1
-222|1
-223|1
-224|1
-225|1
-226|1
-227|1
-228|1
-229|1
-230|1
-231|1
-232|1
-233|1
-234|1
-235|1
-236|1
-237|1
-238|1
-239|1
-240|1
-241|1
-242|1
-243|1
-244|1
-245|1
-246|1
-247|1
-248|1
-249|1
-250|1
-251|1
-252|1
-253|1
-254|1
-255|1
-256|1
-257|1
-258|1
-259|1
-260|1
-261|1
-262|1
-263|1
-264|1
-265|1
-266|1
-267|1
-268|1
-269|1
-270|1
-271|1
-272|1
-273|1
-274|1
-275|1
-276|1
-277|1
-278|1
-279|1
-280|1
-281|1
-282|1
-283|1
-284|1
-285|1
-286|1
-287|1
-288|1
-289|1
-290|1
-291|1
-292|1
-293|1
-294|1
-295|1
-296|1
-297|1
-298|1
-299|1
-300|1
-301|1
-302|1
-303|1
-304|1
-305|1
-306|1
-307|1
-308|1
-309|1
-310|1
-311|1
-312|1
-313|1
-314|1
-315|1
-316|1
-317|1
-318|1
-319|1
-320|1
-321|1
-322|1
-323|1
-324|1
-325|1
-326|1
-327|1
-328|1
-329|1
-330|1
-331|1
-332|1
-333|1
-334|1
-335|1
-336|1
-337|1
-338|1
-339|1
-340|1
-341|1
-342|1
-343|1
-344|1
-345|1
-346|1
-347|1
-348|1
-349|1
-350|1
-351|1
-352|1
-353|1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/graph.3
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/graph.3 b/src/bin/gpmapreduce/test/expected/graph.3
deleted file mode 100644
index d2e1c01..0000000
--- a/src/bin/gpmapreduce/test/expected/graph.3
+++ /dev/null
@@ -1,417 +0,0 @@
-0|0
-0|1
-0|2
-0|3
-0|4
-0|5
-0|6
-0|7
-0|8
-0|9
-0|10
-0|11
-0|12
-0|13
-0|14
-0|15
-0|16
-1|0
-1|7
-1|17
-1|18
-1|19
-1|20
-1|21
-1|22
-1|24
-1|25
-1|26
-1|28
-1|30
-1|33
-1|35
-1|37
-1|39
-3|0
-3|14
-3|41
-3|43
-4|0
-4|11
-4|14
-4|46
-4|48
-4|50
-4|52
-4|54
-4|56
-4|58
-4|60
-4|62
-4|64
-4|66
-4|68
-4|71
-4|73
-4|75
-4|76
-4|78
-4|80
-5|0
-5|83
-5|86
-5|88
-6|0
-6|14
-6|37
-6|38
-6|39
-6|89
-6|92
-6|93
-6|95
-6|98
-6|100
-6|105
-6|107
-6|108
-6|109
-6|110
-6|116
-6|118
-6|119
-6|120
-6|121
-6|122
-6|123
-7|0
-7|6
-7|8
-7|14
-7|25
-7|33
-7|37
-7|45
-7|80
-7|82
-7|121
-7|129
-7|133
-7|134
-7|135
-7|138
-7|139
-7|140
-7|144
-7|145
-7|149
-7|150
-7|151
-8|0
-8|3
-8|14
-8|40
-8|46
-8|70
-8|141
-8|150
-8|153
-8|154
-8|155
-8|156
-9|0
-9|12
-9|14
-9|131
-9|134
-9|157
-9|158
-9|159
-9|160
-9|161
-9|162
-9|163
-9|164
-9|165
-9|166
-9|167
-9|168
-10|0
-10|4
-10|6
-10|9
-10|14
-10|15
-10|16
-10|33
-10|35
-10|37
-10|38
-10|40
-10|44
-10|46
-10|51
-10|63
-10|70
-10|71
-10|72
-10|74
-10|134
-10|140
-10|141
-10|144
-10|145
-10|169
-10|170
-10|171
-10|172
-10|173
-10|174
-10|175
-10|176
-10|177
-10|178
-10|179
-10|180
-10|181
-10|182
-10|183
-10|184
-10|185
-10|186
-10|187
-10|188
-10|189
-10|190
-10|191
-10|192
-10|193
-10|194
-10|195
-10|196
-10|197
-10|198
-10|199
-10|200
-10|201
-10|202
-10|203
-10|204
-10|205
-10|206
-10|207
-10|208
-10|209
-10|210
-10|211
-10|212
-10|213
-10|214
-10|215
-10|216
-10|217
-10|218
-10|219
-10|220
-11|0
-11|6
-11|9
-11|14
-11|36
-11|40
-11|44
-11|46
-11|51
-11|63
-11|68
-11|69
-11|70
-11|72
-11|73
-11|74
-11|103
-11|107
-11|111
-11|136
-11|137
-11|138
-11|151
-11|152
-11|153
-11|155
-11|156
-11|162
-11|163
-11|171
-11|189
-11|202
-11|205
-11|206
-11|210
-11|212
-11|214
-11|215
-11|216
-11|217
-11|221
-11|222
-11|223
-11|224
-11|225
-11|226
-11|227
-11|228
-11|229
-11|230
-11|231
-11|232
-11|233
-11|234
-11|235
-12|236
-12|237
-13|238
-13|239
-14|0
-15|0
-15|4
-15|70
-15|141
-15|169
-15|202
-15|240
-15|241
-15|242
-15|243
-15|244
-15|245
-15|246
-16|247
-16|248
-16|249
-16|250
-16|251
-16|252
-16|253
-16|254
-16|255
-16|256
-16|257
-17|1
-17|258
-17|259
-17|260
-17|261
-17|262
-17|263
-17|264
-17|265
-17|266
-18|1
-18|267
-18|268
-19|0
-19|1
-19|17
-19|19
-19|20
-19|21
-19|23
-19|24
-19|25
-19|27
-19|29
-19|269
-19|270
-19|271
-19|272
-19|273
-19|274
-19|275
-19|276
-19|277
-19|278
-19|279
-19|280
-19|281
-19|282
-19|283
-19|284
-19|285
-19|286
-19|287
-19|288
-19|289
-19|290
-19|291
-19|292
-19|293
-19|294
-19|295
-19|296
-19|297
-19|298
-19|299
-19|300
-19|301
-19|302
-19|303
-19|304
-19|305
-19|306
-19|307
-19|308
-19|309
-19|310
-19|311
-19|312
-19|313
-19|314
-19|315
-19|316
-19|317
-19|318
-19|319
-19|320
-19|321
-19|322
-19|323
-19|324
-19|325
-19|326
-19|327
-19|328
-19|329
-19|330
-19|331
-19|332
-19|333
-19|334
-19|335
-19|336
-19|337
-19|338
-19|339
-19|340
-19|341
-19|342
-19|343
-19|344
-19|345
-19|346
-19|347
-19|348
-19|349
-19|350
-19|351
-20|17
-20|19
-20|20
-20|21
-20|23
-20|24
-20|25
-20|27
-20|29
-20|352
-20|353

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/graph.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/graph.err b/src/bin/gpmapreduce/test/expected/graph.err
deleted file mode 100644
index 89bd27d..0000000
--- a/src/bin/gpmapreduce/test/expected/graph.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
-mapreduce_71514_run_1
-mapreduce_71514_run_2
-mapreduce_71514_run_3

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/graph.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/graph.out b/src/bin/gpmapreduce/test/expected/graph.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/grep.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/grep.1 b/src/bin/gpmapreduce/test/expected/grep.1
deleted file mode 100644
index 87bf766..0000000
--- a/src/bin/gpmapreduce/test/expected/grep.1
+++ /dev/null
@@ -1,4 +0,0 @@
-clar|91.142.213.11 - - [11/Feb/2008:00:18:16 +0900] "GET /admin//claroline//exercice//testheaderpage.php?rootSys=http://h1.ripway.com/iff/safe.txt? HTTP/1.1" 302 301
-clar|91.142.213.11 - - [11/Feb/2008:00:18:18 +0900] "GET //claroline//exercice//testheaderpage.php?rootSys=http://h1.ripway.com/iff/safe.txt? HTTP/1.1" 302 301
-clar|91.142.213.11 - - [11/Feb/2008:00:19:33 +0900] "GET /admin//claroline/phpbb/page_tail.php?includePath=http://h1.ripway.com/iff/safe.txt? HTTP/1.1" 302 301
-clar|91.142.213.11 - - [11/Feb/2008:00:19:36 +0900] "GET //claroline/phpbb/page_tail.php?includePath=http://h1.ripway.com/iff/safe.txt? HTTP/1.1" 302 301

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/grep.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/grep.err b/src/bin/gpmapreduce/test/expected/grep.err
deleted file mode 100644
index 6833c54..0000000
--- a/src/bin/gpmapreduce/test/expected/grep.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_71604_run_1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/grep.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/grep.out b/src/bin/gpmapreduce/test/expected/grep.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/grep_raw.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/grep_raw.err b/src/bin/gpmapreduce/test/expected/grep_raw.err
deleted file mode 100644
index 3137f24..0000000
--- a/src/bin/gpmapreduce/test/expected/grep_raw.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_71678_run_1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/grep_raw.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/grep_raw.out b/src/bin/gpmapreduce/test/expected/grep_raw.out
deleted file mode 100644
index ccd45f9..0000000
--- a/src/bin/gpmapreduce/test/expected/grep_raw.out
+++ /dev/null
@@ -1,13 +0,0 @@
-key |value                                                                                                                               
-----+------------------------------------------------------------------------------------------------------------------------------------
-clar|	12618	ㅊ	         (clar)                                                                                                          
-clar|	12623	ㅏ	         (clar)                                                                                                          
-clar|	Letters: abcdefghijklmnopqrstuvwxyzABCDEFGHIJKMLNOPQRSTUVWXYZ  (clar)                                                              
-clar|	Numbers: 0123456789. +-*/=                                   (clar)                                                               
-clar|	Punctuation: `~!@#$%^&*()_-=+\|'";:,<.>/?                      (clar)                                                              
-clar|	Symbols2: `⁄€‹›fifl‡°·‚”’»±¿Ò‰Ç˝ÏÁ∏˘¯ÆÅØ´¨ˆÎÓˇ˜Í—¸◊„Âı˛ÔŒÚ      (clar)
-clar|	Symbols: æ≤≥π¥ƒ©ç®¬÷≠«åø´¨ˆ∂˙†˜ß–Ω√∑µ∫≈˚∆œ…                    (clar)                
-clar|中 	inside, middle 	chū 	naka              (clar)                                                                                 
-clar|力 	power 	riki or ryoku 	chikara             (clar)                                                                               
-(9 rows)
-

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/input.1
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/input.1 b/src/bin/gpmapreduce/test/expected/input.1
deleted file mode 100644
index f164ed7..0000000
--- a/src/bin/gpmapreduce/test/expected/input.1
+++ /dev/null
@@ -1,417 +0,0 @@
-0	0
-0	1
-0	10
-0	11
-0	12
-0	13
-0	14
-0	15
-0	16
-0	2
-0	3
-0	4
-0	5
-0	6
-0	7
-0	8
-0	9
-1	0
-1	17
-1	18
-1	19
-1	20
-1	21
-1	22
-1	24
-1	25
-1	26
-1	28
-1	30
-1	33
-1	35
-1	37
-1	39
-1	7
-10	0
-10	134
-10	14
-10	140
-10	141
-10	144
-10	145
-10	15
-10	16
-10	169
-10	170
-10	171
-10	172
-10	173
-10	174
-10	175
-10	176
-10	177
-10	178
-10	179
-10	180
-10	181
-10	182
-10	183
-10	184
-10	185
-10	186
-10	187
-10	188
-10	189
-10	190
-10	191
-10	192
-10	193
-10	194
-10	195
-10	196
-10	197
-10	198
-10	199
-10	200
-10	201
-10	202
-10	203
-10	204
-10	205
-10	206
-10	207
-10	208
-10	209
-10	210
-10	211
-10	212
-10	213
-10	214
-10	215
-10	216
-10	217
-10	218
-10	219
-10	220
-10	33
-10	35
-10	37
-10	38
-10	4
-10	40
-10	44
-10	46
-10	51
-10	6
-10	63
-10	70
-10	71
-10	72
-10	74
-10	9
-11	0
-11	103
-11	107
-11	111
-11	136
-11	137
-11	138
-11	14
-11	151
-11	152
-11	153
-11	155
-11	156
-11	162
-11	163
-11	171
-11	189
-11	202
-11	205
-11	206
-11	210
-11	212
-11	214
-11	215
-11	216
-11	217
-11	221
-11	222
-11	223
-11	224
-11	225
-11	226
-11	227
-11	228
-11	229
-11	230
-11	231
-11	232
-11	233
-11	234
-11	235
-11	36
-11	40
-11	44
-11	46
-11	51
-11	6
-11	63
-11	68
-11	69
-11	70
-11	72
-11	73
-11	74
-11	9
-12	236
-12	237
-13	238
-13	239
-14	0
-15	0
-15	141
-15	169
-15	202
-15	240
-15	241
-15	242
-15	243
-15	244
-15	245
-15	246
-15	4
-15	70
-16	247
-16	248
-16	249
-16	250
-16	251
-16	252
-16	253
-16	254
-16	255
-16	256
-16	257
-17	1
-17	258
-17	259
-17	260
-17	261
-17	262
-17	263
-17	264
-17	265
-17	266
-18	1
-18	267
-18	268
-19	0
-19	1
-19	17
-19	19
-19	20
-19	21
-19	23
-19	24
-19	25
-19	269
-19	27
-19	270
-19	271
-19	272
-19	273
-19	274
-19	275
-19	276
-19	277
-19	278
-19	279
-19	280
-19	281
-19	282
-19	283
-19	284
-19	285
-19	286
-19	287
-19	288
-19	289
-19	29
-19	290
-19	291
-19	292
-19	293
-19	294
-19	295
-19	296
-19	297
-19	298
-19	299
-19	300
-19	301
-19	302
-19	303
-19	304
-19	305
-19	306
-19	307
-19	308
-19	309
-19	310
-19	311
-19	312
-19	313
-19	314
-19	315
-19	316
-19	317
-19	318
-19	319
-19	320
-19	321
-19	322
-19	323
-19	324
-19	325
-19	326
-19	327
-19	328
-19	329
-19	330
-19	331
-19	332
-19	333
-19	334
-19	335
-19	336
-19	337
-19	338
-19	339
-19	340
-19	341
-19	342
-19	343
-19	344
-19	345
-19	346
-19	347
-19	348
-19	349
-19	350
-19	351
-20	17
-20	19
-20	20
-20	21
-20	23
-20	24
-20	25
-20	27
-20	29
-20	352
-20	353
-3	0
-3	14
-3	41
-3	43
-4	0
-4	11
-4	14
-4	46
-4	48
-4	50
-4	52
-4	54
-4	56
-4	58
-4	60
-4	62
-4	64
-4	66
-4	68
-4	71
-4	73
-4	75
-4	76
-4	78
-4	80
-5	0
-5	83
-5	86
-5	88
-6	0
-6	100
-6	105
-6	107
-6	108
-6	109
-6	110
-6	116
-6	118
-6	119
-6	120
-6	121
-6	122
-6	123
-6	14
-6	37
-6	38
-6	39
-6	89
-6	92
-6	93
-6	95
-6	98
-7	0
-7	121
-7	129
-7	133
-7	134
-7	135
-7	138
-7	139
-7	14
-7	140
-7	144
-7	145
-7	149
-7	150
-7	151
-7	25
-7	33
-7	37
-7	45
-7	6
-7	8
-7	80
-7	82
-8	0
-8	14
-8	141
-8	150
-8	153
-8	154
-8	155
-8	156
-8	3
-8	40
-8	46
-8	70
-9	0
-9	12
-9	131
-9	134
-9	14
-9	157
-9	158
-9	159
-9	160
-9	161
-9	162
-9	163
-9	164
-9	165
-9	166
-9	167
-9	168

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/input.2
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/input.2 b/src/bin/gpmapreduce/test/expected/input.2
deleted file mode 100644
index 1db3271..0000000
--- a/src/bin/gpmapreduce/test/expected/input.2
+++ /dev/null
@@ -1,417 +0,0 @@
-0|0
-0|1
-0|10
-0|11
-0|12
-0|13
-0|14
-0|15
-0|16
-0|2
-0|3
-0|4
-0|5
-0|6
-0|7
-0|8
-0|9
-1|0
-1|17
-1|18
-1|19
-1|20
-1|21
-1|22
-1|24
-1|25
-1|26
-1|28
-1|30
-1|33
-1|35
-1|37
-1|39
-1|7
-10|0
-10|134
-10|14
-10|140
-10|141
-10|144
-10|145
-10|15
-10|16
-10|169
-10|170
-10|171
-10|172
-10|173
-10|174
-10|175
-10|176
-10|177
-10|178
-10|179
-10|180
-10|181
-10|182
-10|183
-10|184
-10|185
-10|186
-10|187
-10|188
-10|189
-10|190
-10|191
-10|192
-10|193
-10|194
-10|195
-10|196
-10|197
-10|198
-10|199
-10|200
-10|201
-10|202
-10|203
-10|204
-10|205
-10|206
-10|207
-10|208
-10|209
-10|210
-10|211
-10|212
-10|213
-10|214
-10|215
-10|216
-10|217
-10|218
-10|219
-10|220
-10|33
-10|35
-10|37
-10|38
-10|4
-10|40
-10|44
-10|46
-10|51
-10|6
-10|63
-10|70
-10|71
-10|72
-10|74
-10|9
-11|0
-11|103
-11|107
-11|111
-11|136
-11|137
-11|138
-11|14
-11|151
-11|152
-11|153
-11|155
-11|156
-11|162
-11|163
-11|171
-11|189
-11|202
-11|205
-11|206
-11|210
-11|212
-11|214
-11|215
-11|216
-11|217
-11|221
-11|222
-11|223
-11|224
-11|225
-11|226
-11|227
-11|228
-11|229
-11|230
-11|231
-11|232
-11|233
-11|234
-11|235
-11|36
-11|40
-11|44
-11|46
-11|51
-11|6
-11|63
-11|68
-11|69
-11|70
-11|72
-11|73
-11|74
-11|9
-12|236
-12|237
-13|238
-13|239
-14|0
-15|0
-15|141
-15|169
-15|202
-15|240
-15|241
-15|242
-15|243
-15|244
-15|245
-15|246
-15|4
-15|70
-16|247
-16|248
-16|249
-16|250
-16|251
-16|252
-16|253
-16|254
-16|255
-16|256
-16|257
-17|1
-17|258
-17|259
-17|260
-17|261
-17|262
-17|263
-17|264
-17|265
-17|266
-18|1
-18|267
-18|268
-19|0
-19|1
-19|17
-19|19
-19|20
-19|21
-19|23
-19|24
-19|25
-19|269
-19|27
-19|270
-19|271
-19|272
-19|273
-19|274
-19|275
-19|276
-19|277
-19|278
-19|279
-19|280
-19|281
-19|282
-19|283
-19|284
-19|285
-19|286
-19|287
-19|288
-19|289
-19|29
-19|290
-19|291
-19|292
-19|293
-19|294
-19|295
-19|296
-19|297
-19|298
-19|299
-19|300
-19|301
-19|302
-19|303
-19|304
-19|305
-19|306
-19|307
-19|308
-19|309
-19|310
-19|311
-19|312
-19|313
-19|314
-19|315
-19|316
-19|317
-19|318
-19|319
-19|320
-19|321
-19|322
-19|323
-19|324
-19|325
-19|326
-19|327
-19|328
-19|329
-19|330
-19|331
-19|332
-19|333
-19|334
-19|335
-19|336
-19|337
-19|338
-19|339
-19|340
-19|341
-19|342
-19|343
-19|344
-19|345
-19|346
-19|347
-19|348
-19|349
-19|350
-19|351
-20|17
-20|19
-20|20
-20|21
-20|23
-20|24
-20|25
-20|27
-20|29
-20|352
-20|353
-3|0
-3|14
-3|41
-3|43
-4|0
-4|11
-4|14
-4|46
-4|48
-4|50
-4|52
-4|54
-4|56
-4|58
-4|60
-4|62
-4|64
-4|66
-4|68
-4|71
-4|73
-4|75
-4|76
-4|78
-4|80
-5|0
-5|83
-5|86
-5|88
-6|0
-6|100
-6|105
-6|107
-6|108
-6|109
-6|110
-6|116
-6|118
-6|119
-6|120
-6|121
-6|122
-6|123
-6|14
-6|37
-6|38
-6|39
-6|89
-6|92
-6|93
-6|95
-6|98
-7|0
-7|121
-7|129
-7|133
-7|134
-7|135
-7|138
-7|139
-7|14
-7|140
-7|144
-7|145
-7|149
-7|150
-7|151
-7|25
-7|33
-7|37
-7|45
-7|6
-7|8
-7|80
-7|82
-8|0
-8|14
-8|141
-8|150
-8|153
-8|154
-8|155
-8|156
-8|3
-8|40
-8|46
-8|70
-9|0
-9|12
-9|131
-9|134
-9|14
-9|157
-9|158
-9|159
-9|160
-9|161
-9|162
-9|163
-9|164
-9|165
-9|166
-9|167
-9|168

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/input.3
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/input.3 b/src/bin/gpmapreduce/test/expected/input.3
deleted file mode 100644
index 9c1bb66..0000000
--- a/src/bin/gpmapreduce/test/expected/input.3
+++ /dev/null
@@ -1,417 +0,0 @@
-0:0
-0:1
-0:10
-0:11
-0:12
-0:13
-0:14
-0:15
-0:16
-0:2
-0:3
-0:4
-0:5
-0:6
-0:7
-0:8
-0:9
-1:0
-1:17
-1:18
-1:19
-1:20
-1:21
-1:22
-1:24
-1:25
-1:26
-1:28
-1:30
-1:33
-1:35
-1:37
-1:39
-1:7
-10:0
-10:134
-10:14
-10:140
-10:141
-10:144
-10:145
-10:15
-10:16
-10:169
-10:170
-10:171
-10:172
-10:173
-10:174
-10:175
-10:176
-10:177
-10:178
-10:179
-10:180
-10:181
-10:182
-10:183
-10:184
-10:185
-10:186
-10:187
-10:188
-10:189
-10:190
-10:191
-10:192
-10:193
-10:194
-10:195
-10:196
-10:197
-10:198
-10:199
-10:200
-10:201
-10:202
-10:203
-10:204
-10:205
-10:206
-10:207
-10:208
-10:209
-10:210
-10:211
-10:212
-10:213
-10:214
-10:215
-10:216
-10:217
-10:218
-10:219
-10:220
-10:33
-10:35
-10:37
-10:38
-10:4
-10:40
-10:44
-10:46
-10:51
-10:6
-10:63
-10:70
-10:71
-10:72
-10:74
-10:9
-11:0
-11:103
-11:107
-11:111
-11:136
-11:137
-11:138
-11:14
-11:151
-11:152
-11:153
-11:155
-11:156
-11:162
-11:163
-11:171
-11:189
-11:202
-11:205
-11:206
-11:210
-11:212
-11:214
-11:215
-11:216
-11:217
-11:221
-11:222
-11:223
-11:224
-11:225
-11:226
-11:227
-11:228
-11:229
-11:230
-11:231
-11:232
-11:233
-11:234
-11:235
-11:36
-11:40
-11:44
-11:46
-11:51
-11:6
-11:63
-11:68
-11:69
-11:70
-11:72
-11:73
-11:74
-11:9
-12:236
-12:237
-13:238
-13:239
-14:0
-15:0
-15:141
-15:169
-15:202
-15:240
-15:241
-15:242
-15:243
-15:244
-15:245
-15:246
-15:4
-15:70
-16:247
-16:248
-16:249
-16:250
-16:251
-16:252
-16:253
-16:254
-16:255
-16:256
-16:257
-17:1
-17:258
-17:259
-17:260
-17:261
-17:262
-17:263
-17:264
-17:265
-17:266
-18:1
-18:267
-18:268
-19:0
-19:1
-19:17
-19:19
-19:20
-19:21
-19:23
-19:24
-19:25
-19:269
-19:27
-19:270
-19:271
-19:272
-19:273
-19:274
-19:275
-19:276
-19:277
-19:278
-19:279
-19:280
-19:281
-19:282
-19:283
-19:284
-19:285
-19:286
-19:287
-19:288
-19:289
-19:29
-19:290
-19:291
-19:292
-19:293
-19:294
-19:295
-19:296
-19:297
-19:298
-19:299
-19:300
-19:301
-19:302
-19:303
-19:304
-19:305
-19:306
-19:307
-19:308
-19:309
-19:310
-19:311
-19:312
-19:313
-19:314
-19:315
-19:316
-19:317
-19:318
-19:319
-19:320
-19:321
-19:322
-19:323
-19:324
-19:325
-19:326
-19:327
-19:328
-19:329
-19:330
-19:331
-19:332
-19:333
-19:334
-19:335
-19:336
-19:337
-19:338
-19:339
-19:340
-19:341
-19:342
-19:343
-19:344
-19:345
-19:346
-19:347
-19:348
-19:349
-19:350
-19:351
-20:17
-20:19
-20:20
-20:21
-20:23
-20:24
-20:25
-20:27
-20:29
-20:352
-20:353
-3:0
-3:14
-3:41
-3:43
-4:0
-4:11
-4:14
-4:46
-4:48
-4:50
-4:52
-4:54
-4:56
-4:58
-4:60
-4:62
-4:64
-4:66
-4:68
-4:71
-4:73
-4:75
-4:76
-4:78
-4:80
-5:0
-5:83
-5:86
-5:88
-6:0
-6:100
-6:105
-6:107
-6:108
-6:109
-6:110
-6:116
-6:118
-6:119
-6:120
-6:121
-6:122
-6:123
-6:14
-6:37
-6:38
-6:39
-6:89
-6:92
-6:93
-6:95
-6:98
-7:0
-7:121
-7:129
-7:133
-7:134
-7:135
-7:138
-7:139
-7:14
-7:140
-7:144
-7:145
-7:149
-7:150
-7:151
-7:25
-7:33
-7:37
-7:45
-7:6
-7:8
-7:80
-7:82
-8:0
-8:14
-8:141
-8:150
-8:153
-8:154
-8:155
-8:156
-8:3
-8:40
-8:46
-8:70
-9:0
-9:12
-9:131
-9:134
-9:14
-9:157
-9:158
-9:159
-9:160
-9:161
-9:162
-9:163
-9:164
-9:165
-9:166
-9:167
-9:168

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/input.4
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/input.4 b/src/bin/gpmapreduce/test/expected/input.4
deleted file mode 100644
index a222b22..0000000
--- a/src/bin/gpmapreduce/test/expected/input.4
+++ /dev/null
@@ -1,834 +0,0 @@
-0,0
-0,0
-0,1
-0,1
-0,10
-0,10
-0,11
-0,11
-0,12
-0,12
-0,13
-0,13
-0,14
-0,14
-0,15
-0,15
-0,16
-0,16
-0,2
-0,2
-0,3
-0,3
-0,4
-0,4
-0,5
-0,5
-0,6
-0,6
-0,7
-0,7
-0,8
-0,8
-0,9
-0,9
-1,0
-1,0
-1,17
-1,17
-1,18
-1,18
-1,19
-1,19
-1,20
-1,20
-1,21
-1,21
-1,22
-1,22
-1,24
-1,24
-1,25
-1,25
-1,26
-1,26
-1,28
-1,28
-1,30
-1,30
-1,33
-1,33
-1,35
-1,35
-1,37
-1,37
-1,39
-1,39
-1,7
-1,7
-10,0
-10,0
-10,134
-10,134
-10,14
-10,14
-10,140
-10,140
-10,141
-10,141
-10,144
-10,144
-10,145
-10,145
-10,15
-10,15
-10,16
-10,16
-10,169
-10,169
-10,170
-10,170
-10,171
-10,171
-10,172
-10,172
-10,173
-10,173
-10,174
-10,174
-10,175
-10,175
-10,176
-10,176
-10,177
-10,177
-10,178
-10,178
-10,179
-10,179
-10,180
-10,180
-10,181
-10,181
-10,182
-10,182
-10,183
-10,183
-10,184
-10,184
-10,185
-10,185
-10,186
-10,186
-10,187
-10,187
-10,188
-10,188
-10,189
-10,189
-10,190
-10,190
-10,191
-10,191
-10,192
-10,192
-10,193
-10,193
-10,194
-10,194
-10,195
-10,195
-10,196
-10,196
-10,197
-10,197
-10,198
-10,198
-10,199
-10,199
-10,200
-10,200
-10,201
-10,201
-10,202
-10,202
-10,203
-10,203
-10,204
-10,204
-10,205
-10,205
-10,206
-10,206
-10,207
-10,207
-10,208
-10,208
-10,209
-10,209
-10,210
-10,210
-10,211
-10,211
-10,212
-10,212
-10,213
-10,213
-10,214
-10,214
-10,215
-10,215
-10,216
-10,216
-10,217
-10,217
-10,218
-10,218
-10,219
-10,219
-10,220
-10,220
-10,33
-10,33
-10,35
-10,35
-10,37
-10,37
-10,38
-10,38
-10,4
-10,4
-10,40
-10,40
-10,44
-10,44
-10,46
-10,46
-10,51
-10,51
-10,6
-10,6
-10,63
-10,63
-10,70
-10,70
-10,71
-10,71
-10,72
-10,72
-10,74
-10,74
-10,9
-10,9
-11,0
-11,0
-11,103
-11,103
-11,107
-11,107
-11,111
-11,111
-11,136
-11,136
-11,137
-11,137
-11,138
-11,138
-11,14
-11,14
-11,151
-11,151
-11,152
-11,152
-11,153
-11,153
-11,155
-11,155
-11,156
-11,156
-11,162
-11,162
-11,163
-11,163
-11,171
-11,171
-11,189
-11,189
-11,202
-11,202
-11,205
-11,205
-11,206
-11,206
-11,210
-11,210
-11,212
-11,212
-11,214
-11,214
-11,215
-11,215
-11,216
-11,216
-11,217
-11,217
-11,221
-11,221
-11,222
-11,222
-11,223
-11,223
-11,224
-11,224
-11,225
-11,225
-11,226
-11,226
-11,227
-11,227
-11,228
-11,228
-11,229
-11,229
-11,230
-11,230
-11,231
-11,231
-11,232
-11,232
-11,233
-11,233
-11,234
-11,234
-11,235
-11,235
-11,36
-11,36
-11,40
-11,40
-11,44
-11,44
-11,46
-11,46
-11,51
-11,51
-11,6
-11,6
-11,63
-11,63
-11,68
-11,68
-11,69
-11,69
-11,70
-11,70
-11,72
-11,72
-11,73
-11,73
-11,74
-11,74
-11,9
-11,9
-12,236
-12,236
-12,237
-12,237
-13,238
-13,238
-13,239
-13,239
-14,0
-14,0
-15,0
-15,0
-15,141
-15,141
-15,169
-15,169
-15,202
-15,202
-15,240
-15,240
-15,241
-15,241
-15,242
-15,242
-15,243
-15,243
-15,244
-15,244
-15,245
-15,245
-15,246
-15,246
-15,4
-15,4
-15,70
-15,70
-16,247
-16,247
-16,248
-16,248
-16,249
-16,249
-16,250
-16,250
-16,251
-16,251
-16,252
-16,252
-16,253
-16,253
-16,254
-16,254
-16,255
-16,255
-16,256
-16,256
-16,257
-16,257
-17,1
-17,1
-17,258
-17,258
-17,259
-17,259
-17,260
-17,260
-17,261
-17,261
-17,262
-17,262
-17,263
-17,263
-17,264
-17,264
-17,265
-17,265
-17,266
-17,266
-18,1
-18,1
-18,267
-18,267
-18,268
-18,268
-19,0
-19,0
-19,1
-19,1
-19,17
-19,17
-19,19
-19,19
-19,20
-19,20
-19,21
-19,21
-19,23
-19,23
-19,24
-19,24
-19,25
-19,25
-19,269
-19,269
-19,27
-19,27
-19,270
-19,270
-19,271
-19,271
-19,272
-19,272
-19,273
-19,273
-19,274
-19,274
-19,275
-19,275
-19,276
-19,276
-19,277
-19,277
-19,278
-19,278
-19,279
-19,279
-19,280
-19,280
-19,281
-19,281
-19,282
-19,282
-19,283
-19,283
-19,284
-19,284
-19,285
-19,285
-19,286
-19,286
-19,287
-19,287
-19,288
-19,288
-19,289
-19,289
-19,29
-19,29
-19,290
-19,290
-19,291
-19,291
-19,292
-19,292
-19,293
-19,293
-19,294
-19,294
-19,295
-19,295
-19,296
-19,296
-19,297
-19,297
-19,298
-19,298
-19,299
-19,299
-19,300
-19,300
-19,301
-19,301
-19,302
-19,302
-19,303
-19,303
-19,304
-19,304
-19,305
-19,305
-19,306
-19,306
-19,307
-19,307
-19,308
-19,308
-19,309
-19,309
-19,310
-19,310
-19,311
-19,311
-19,312
-19,312
-19,313
-19,313
-19,314
-19,314
-19,315
-19,315
-19,316
-19,316
-19,317
-19,317
-19,318
-19,318
-19,319
-19,319
-19,320
-19,320
-19,321
-19,321
-19,322
-19,322
-19,323
-19,323
-19,324
-19,324
-19,325
-19,325
-19,326
-19,326
-19,327
-19,327
-19,328
-19,328
-19,329
-19,329
-19,330
-19,330
-19,331
-19,331
-19,332
-19,332
-19,333
-19,333
-19,334
-19,334
-19,335
-19,335
-19,336
-19,336
-19,337
-19,337
-19,338
-19,338
-19,339
-19,339
-19,340
-19,340
-19,341
-19,341
-19,342
-19,342
-19,343
-19,343
-19,344
-19,344
-19,345
-19,345
-19,346
-19,346
-19,347
-19,347
-19,348
-19,348
-19,349
-19,349
-19,350
-19,350
-19,351
-19,351
-20,17
-20,17
-20,19
-20,19
-20,20
-20,20
-20,21
-20,21
-20,23
-20,23
-20,24
-20,24
-20,25
-20,25
-20,27
-20,27
-20,29
-20,29
-20,352
-20,352
-20,353
-20,353
-3,0
-3,0
-3,14
-3,14
-3,41
-3,41
-3,43
-3,43
-4,0
-4,0
-4,11
-4,11
-4,14
-4,14
-4,46
-4,46
-4,48
-4,48
-4,50
-4,50
-4,52
-4,52
-4,54
-4,54
-4,56
-4,56
-4,58
-4,58
-4,60
-4,60
-4,62
-4,62
-4,64
-4,64
-4,66
-4,66
-4,68
-4,68
-4,71
-4,71
-4,73
-4,73
-4,75
-4,75
-4,76
-4,76
-4,78
-4,78
-4,80
-4,80
-5,0
-5,0
-5,83
-5,83
-5,86
-5,86
-5,88
-5,88
-6,0
-6,0
-6,100
-6,100
-6,105
-6,105
-6,107
-6,107
-6,108
-6,108
-6,109
-6,109
-6,110
-6,110
-6,116
-6,116
-6,118
-6,118
-6,119
-6,119
-6,120
-6,120
-6,121
-6,121
-6,122
-6,122
-6,123
-6,123
-6,14
-6,14
-6,37
-6,37
-6,38
-6,38
-6,39
-6,39
-6,89
-6,89
-6,92
-6,92
-6,93
-6,93
-6,95
-6,95
-6,98
-6,98
-7,0
-7,0
-7,121
-7,121
-7,129
-7,129
-7,133
-7,133
-7,134
-7,134
-7,135
-7,135
-7,138
-7,138
-7,139
-7,139
-7,14
-7,14
-7,140
-7,140
-7,144
-7,144
-7,145
-7,145
-7,149
-7,149
-7,150
-7,150
-7,151
-7,151
-7,25
-7,25
-7,33
-7,33
-7,37
-7,37
-7,45
-7,45
-7,6
-7,6
-7,8
-7,8
-7,80
-7,80
-7,82
-7,82
-8,0
-8,0
-8,14
-8,14
-8,141
-8,141
-8,150
-8,150
-8,153
-8,153
-8,154
-8,154
-8,155
-8,155
-8,156
-8,156
-8,3
-8,3
-8,40
-8,40
-8,46
-8,46
-8,70
-8,70
-9,0
-9,0
-9,12
-9,12
-9,131
-9,131
-9,134
-9,134
-9,14
-9,14
-9,157
-9,157
-9,158
-9,158
-9,159
-9,159
-9,160
-9,160
-9,161
-9,161
-9,162
-9,162
-9,163
-9,163
-9,164
-9,164
-9,165
-9,165
-9,166
-9,166
-9,167
-9,167
-9,168
-9,168

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/input.done.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/input.done.out b/src/bin/gpmapreduce/test/expected/input.done.out
deleted file mode 100644
index 002ee2a..0000000
--- a/src/bin/gpmapreduce/test/expected/input.done.out
+++ /dev/null
@@ -1,10 +0,0 @@
- a |  b  
----+-----
- 1 | one
- 2 | two
-(2 rows)
-
-DROP TABLE
-DROP TABLE
-DROP SCHEMA
-DROP SCHEMA

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/input.err
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/input.err b/src/bin/gpmapreduce/test/expected/input.err
deleted file mode 100644
index 872a544..0000000
--- a/src/bin/gpmapreduce/test/expected/input.err
+++ /dev/null
@@ -1,14 +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_48461_run_1
-mapreduce_48461_run_2
-mapreduce_48461_run_3
-mapreduce_48461_run_4
-mapreduce_48461_run_5
-DONE

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/input.init.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/input.init.out b/src/bin/gpmapreduce/test/expected/input.init.out
deleted file mode 100644
index b90800d..0000000
--- a/src/bin/gpmapreduce/test/expected/input.init.out
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE SCHEMA
-CREATE SCHEMA
-CREATE TABLE
-INSERT 0 1
-INSERT 0 1

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/4e392375/src/bin/gpmapreduce/test/expected/input.out
----------------------------------------------------------------------
diff --git a/src/bin/gpmapreduce/test/expected/input.out b/src/bin/gpmapreduce/test/expected/input.out
deleted file mode 100644
index e69de29..0000000