hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject incubator-hawq git commit: HAWQ-60. Add macro GPFXDIST to enable gpfdist transformation support and change doc gpfdist_help
Date Mon, 19 Oct 2015 02:05:35 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 285a8f466 -> 35e6832a2


HAWQ-60. Add macro GPFXDIST to enable gpfdist transformation support and change doc gpfdist_help


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

Branch: refs/heads/master
Commit: 35e6832a26b430e8f0fb9a3a2f28d8f8ac40ef99
Parents: 285a8f4
Author: Ming LI <mli@pivotal.io>
Authored: Thu Oct 15 16:07:32 2015 +0800
Committer: Jiali Yao <jyao@pivotal.io>
Committed: Mon Oct 19 10:03:42 2015 +0800

----------------------------------------------------------------------
 src/bin/gpfdist/Makefile |  8 ++++----
 tools/doc/gpfdist_help   | 22 ++++++++++++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/35e6832a/src/bin/gpfdist/Makefile
----------------------------------------------------------------------
diff --git a/src/bin/gpfdist/Makefile b/src/bin/gpfdist/Makefile
index 65d0439..3fc5fee 100644
--- a/src/bin/gpfdist/Makefile
+++ b/src/bin/gpfdist/Makefile
@@ -11,16 +11,16 @@ OBJS         = $(subst .c,.o,$(GPFDISTFILES))
 
 SHELL=bash
 GP_VERSION:=$(shell cat $(top_builddir)/VERSION)
-
 APR_CFG  := $(shell which apr-1-config)
 APR_DIR  := $(shell dirname $(APR_CFG))/../
-INCLUDES := $$($(APR_CFG) --includes) -I$(code_dir) -I$(CURDIR)/../../../src/include $(INCLUDES)
-CFLAGS   := $$($(APR_CFG) --cflags) -Wall $(GPFXDIST) $(CFLAGS)
-LIBS     := $$($(APR_CFG) --link-ld --libs) $(LIBS)
 
 # flag to include/exclude gpfdist transformation support
 GPFXDIST=-DGPFXDIST
 
+INCLUDES := $$($(APR_CFG) --includes) -I$(code_dir) -I$(CURDIR)/../../../src/include $(INCLUDES)
+CFLAGS   := $$($(APR_CFG) --cflags) -Wall $(GPFXDIST) $(CFLAGS)
+LIBS     := $$($(APR_CFG) --link-ld --libs) $(LIBS)
+
 sol10_sparc_32_CPPFLAGS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 sol9_sparc_32_CPPFLAGS  = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 sol8_sparc_32_CPPFLAGS  = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/35e6832a/tools/doc/gpfdist_help
----------------------------------------------------------------------
diff --git a/tools/doc/gpfdist_help b/tools/doc/gpfdist_help
index a411a95..9d8f7f3 100755
--- a/tools/doc/gpfdist_help
+++ b/tools/doc/gpfdist_help
@@ -7,7 +7,7 @@ SYNOPSIS
 *****************************************************
 
 
-gpfdist [-d <directory>] [-p <http_port>] [-l <log_file>] [-t <timeout>]
 
+gpfdist [-d <directory>] [-p <http_port>] [-l <log_file>] [-t <timeout>]
 [-c <config_file>]
 [-S] [-v | -V] [-m <maxlen>] [--ssl certificate_path]
 
 gpfdist [-? | --help] | --version
@@ -121,7 +121,25 @@ contain the following files:
 - The trusted certificate authorities, root.crt
 
 The root directory (/) cannot be specified as certificate_path.
- 
+
+-c <config_file>
+
+Configuration file for transformations.The option config_file specifies
+the location of the transformation configuration file, passed to gpload via -c.
+The gpfdist configuration is expected to be a YAML file with the following format:
+--- 
+VERSION: 1.0.0.1 
+TRANSFORMATIONS: 
+  transformname1:
+      TYPE:    input | output
+      COMMAND: command1
+      CONTENT: data | paths
+      SAFE:    posix-regex
+
+  transformname2: 
+      TYPE:    input | output
+      COMMAND: command2
+  ...
 
 -v (verbose)
 


Mime
View raw message