You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by wa...@apache.org on 2015/09/28 08:18:38 UTC
incubator-hawq git commit: HAWQ-9. fix the Makefile in gpopt
subdirectory.
Repository: incubator-hawq
Updated Branches:
refs/heads/master 69401baa4 -> 060161b74
HAWQ-9. fix the Makefile in gpopt subdirectory.
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/060161b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/060161b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/060161b7
Branch: refs/heads/master
Commit: 060161b749cc557bdbc5632eece47185d7a0c765
Parents: 69401ba
Author: Zhanwei Wang <wa...@apache.org>
Authored: Mon Sep 28 10:54:53 2015 +0800
Committer: Zhanwei Wang <wa...@apache.org>
Committed: Mon Sep 28 10:54:53 2015 +0800
----------------------------------------------------------------------
configure | 42 +++++++++++++++++++++++++++--
configure.in | 36 ++++++++++++++++++++++++-
src/Makefile.global.in | 7 +++++
src/backend/Makefile | 26 +++++++++++-------
src/backend/gpopt/Makefile | 44 +++++++++++++++++++++++++++----
src/backend/gpopt/config/Makefile | 7 ++---
src/backend/gpopt/gpopt.mk | 24 +++++++++++------
src/backend/gpopt/relcache/Makefile | 3 ---
src/backend/gpopt/translate/Makefile | 7 ++---
src/backend/gpopt/utils/Makefile | 5 +---
10 files changed, 159 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/060161b7/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 26efce6..dad68b7 100755
--- a/configure
+++ b/configure
@@ -726,6 +726,11 @@ with_perl
with_tcl
enable_thread_safety
INCLUDES
+ORCA_DEPENDS_OPTIMIZER_VER
+ORCA_DEPENDS_LIBGPOS_VER
+ORCA_DEPENDS_XERCES_VER
+ORCA_DEPENDS_OBJDIR_DEFAULT
+ORCA_DEPENDS_DIR_INTER
enable_orca
enable_email
enable_gphdfs
@@ -5242,8 +5247,41 @@ else
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: enable_orca" >&5
-$as_echo "enable_orca" >&6; }
+
+
+if test "$enable_orca" = yes ; then
+
+ if test -z "$ORCA_DEPENDS_DIR" ; then
+ as_fn_error $? "orca is enabled but ORCA_DEPENDS_DIR is not set" "$LINENO" 5]
+ fi
+
+ if test -z "$ORCA_OBJDIR_DEFAULT" ; then
+ as_fn_error $? "orca is enabled but ORCA_OBJDIR_DEFAULT is not set" "$LINENO" 5]
+ fi
+
+ if test -z "$XERCES_VER" ; then
+ as_fn_error $? "orca is enabled but XERCES_VER is not set" "$LINENO" 5]
+ fi
+
+ if test -z "$LIBGPOS_VER" ; then
+ as_fn_error $? "orca is enabled but LIBGPOS_VER is not set" "$LINENO" 5]
+ fi
+
+ if test -z "$OPTIMIZER_VER" ; then
+ as_fn_error $? "orca is enabled but OPTIMIZER_VER is not set" "$LINENO" 5]
+ fi
+
+ ORCA_DEPENDS_DIR_INTER="$ORCA_DEPENDS_DIR"
+ ORCA_DEPENDS_OBJDIR_DEFAULT="$ORCA_OBJDIR_DEFAULT"
+ ORCA_DEPENDS_XERCES_VER="$XERCES_VER"
+ ORCA_DEPENDS_LIBGPOS_VER="$LIBGPOS_VER"
+ ORCA_DEPENDS_OPTIMIZER_VER="$OPTIMIZER_VER"
+fi
+
+
+
+
+
#
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/060161b7/configure.in
----------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index 578aabf..c2d7dc0 100644
--- a/configure.in
+++ b/configure.in
@@ -550,9 +550,43 @@ AC_SUBST(enable_email)
PGAC_ARG_BOOL(enable, orca, no, [ --enable-orca enable Pivotal Query Optimizer],
[AC_DEFINE([USE_ORCA], 1,
[Define to 1 to build with Pivotal Query Optimizer. (--enable-orca)])])
-AC_MSG_RESULT([enable_orca])
AC_SUBST(enable_orca)
+if test "$enable_orca" = yes ; then
+
+ if test -z "$ORCA_DEPENDS_DIR" ; then
+ AC_MSG_ERROR([orca is enabled but ORCA_DEPENDS_DIR is not set])]
+ fi
+
+ if test -z "$ORCA_OBJDIR_DEFAULT" ; then
+ AC_MSG_ERROR([orca is enabled but ORCA_OBJDIR_DEFAULT is not set])]
+ fi
+
+ if test -z "$XERCES_VER" ; then
+ AC_MSG_ERROR([orca is enabled but XERCES_VER is not set])]
+ fi
+
+ if test -z "$LIBGPOS_VER" ; then
+ AC_MSG_ERROR([orca is enabled but LIBGPOS_VER is not set])]
+ fi
+
+ if test -z "$OPTIMIZER_VER" ; then
+ AC_MSG_ERROR([orca is enabled but OPTIMIZER_VER is not set])]
+ fi
+
+ ORCA_DEPENDS_DIR_INTER="$ORCA_DEPENDS_DIR"
+ ORCA_DEPENDS_OBJDIR_DEFAULT="$ORCA_OBJDIR_DEFAULT"
+ ORCA_DEPENDS_XERCES_VER="$XERCES_VER"
+ ORCA_DEPENDS_LIBGPOS_VER="$LIBGPOS_VER"
+ ORCA_DEPENDS_OPTIMIZER_VER="$OPTIMIZER_VER"
+fi
+
+AC_SUBST(ORCA_DEPENDS_DIR_INTER)
+AC_SUBST(ORCA_DEPENDS_OBJDIR_DEFAULT)
+AC_SUBST(ORCA_DEPENDS_XERCES_VER)
+AC_SUBST(ORCA_DEPENDS_LIBGPOS_VER)
+AC_SUBST(ORCA_DEPENDS_OPTIMIZER_VER)
+
#
# Include directories
#
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/060161b7/src/Makefile.global.in
----------------------------------------------------------------------
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index c741485..ad920f8 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -254,6 +254,13 @@ LD = @LD@
with_gnu_ld = @with_gnu_ld@
ld_R_works = @ld_R_works@
+# Dependencies
+ORCA_DEPENDS_DIR_INTER = @ORCA_DEPENDS_DIR_INTER@
+ORCA_DEPENDS_OBJDIR_DEFAULT = @ORCA_DEPENDS_OBJDIR_DEFAULT@
+ORCA_DEPENDS_XERCES_VER = @ORCA_DEPENDS_XERCES_VER@
+ORCA_DEPENDS_LIBGPOS_VER = @ORCA_DEPENDS_LIBGPOS_VER@
+ORCA_DEPENDS_OPTIMIZER_VER = @ORCA_DEPENDS_OPTIMIZER_VER@
+
# We want -L for libpgport.a to be first in LDFLAGS. We also need LDFLAGS
# to be a "recursively expanded" variable, else adjustments to rpathdir
# don't work right. So we must NOT do LDFLAGS := something, meaning this has
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/060161b7/src/backend/Makefile
----------------------------------------------------------------------
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 790b455..f648f3c 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -17,9 +17,6 @@ include $(top_builddir)/src/Makefile.global
SUBDIRS = access bootstrap catalog parser commands executor foreign \
lib libpq gp_libpq_fe main nodes optimizer port postmaster regex \
rewrite storage tcop utils resourcemanager $(top_builddir)/src/timezone cdb
-ifeq ($(enable_orca),yes)
-SUBDIRS += gpopt
-endif
include $(srcdir)/common.mk
@@ -54,11 +51,11 @@ LIBS := -lprotobuf -lboost_thread -lboost_system -lboost_date_time -lstdc++ -lhd
# adding orca libraries
ifeq ($(enable_orca),yes)
-LIBS := $(LIBS) -L$(LIBGPOS)/$(OBJDIR_DEFAULT) -lgpos
-LIBS := $(LIBS) -L$(XERCES_LIBDIR) -lxerces-c-3.1
-LIBS := $(LIBS) -L$(OPTIMIZER)/libnaucrates/$(OBJDIR_DEFAULT) -lnaucrates
-LIBS := $(LIBS) -L$(OPTIMIZER)/libgpdbcost/$(OBJDIR_DEFAULT) -lgpdbcost
-LIBS := $(LIBS) -L$(OPTIMIZER)/libgpopt/$(OBJDIR_DEFAULT) -lgpopt
+LIBS := $(LIBS) -L$(ORCA_DEPENDS_DIR_INTER)/libgpos/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lgpos
+LIBS := $(LIBS) -L$(ORCA_DEPENDS_DIR_INTER)/lib -lxerces-c
+LIBS := $(LIBS) -L$(ORCA_DEPENDS_DIR_INTER)/libnaucrates/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lnaucrates
+LIBS := $(LIBS) -L$(ORCA_DEPENDS_DIR_INTER)/libgpdbcost/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lgpdbcost
+LIBS := $(LIBS) -L$(ORCA_DEPENDS_DIR_INTER)/libgpopt/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lgpopt
LIBS := $(LIBS) -L$(top_builddir)/src/backend/gpopt -ldxltranslators
endif
@@ -75,7 +72,12 @@ SNAPPYLIB = -lsnappy
LIBS := $(LIBS) $(SNAPPYLIB)
##########################################################################
-all: submake-libpgport postgres $(POSTGRES_IMP)
+submake-libdxltranslators:
+ifeq ($(enable_orca),yes)
+ $(MAKE) -C gpopt all
+endif
+
+all: submake-libpgport submake-libdxltranslators postgres $(POSTGRES_IMP)
ifneq ($(PORTNAME), cygwin)
ifneq ($(PORTNAME), win32)
@@ -209,6 +211,9 @@ ifeq ($(MAKE_DLL), true)
$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
endif
endif
+ifeq ($(enable_orca),yes)
+ $(MAKE) -C gpopt install
+endif
$(MAKE) -C catalog install-data
$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
@@ -292,6 +297,9 @@ endif
ifeq ($(PORTNAME), win32)
rm -f postgres.dll postgres.def libpostgres.a $(WIN32RES)
endif
+ find gpopt -name *.o | xargs rm -rf
+ find gpopt -name *.so | xargs rm -rf
+ find gpopt -name *.dylib | xargs rm -rf
distclean: clean
rm -f port/tas.s port/dynloader.c port/pg_sema.c port/pg_shmem.c
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/060161b7/src/backend/gpopt/Makefile
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/Makefile b/src/backend/gpopt/Makefile
index 22cd5c3..f80e363 100644
--- a/src/backend/gpopt/Makefile
+++ b/src/backend/gpopt/Makefile
@@ -12,9 +12,6 @@ subdir = src/backend/gpopt
top_builddir = ../../..
include $(top_builddir)/src/Makefile.global
-BLD_TOP = $(top_builddir)/
-include $(top_builddir)/build-utils/pivotal/releng.mk
-
include $(top_builddir)/src/backend/gpopt/gpopt.mk
SUBDIRS = config translate relcache utils
@@ -35,6 +32,43 @@ ifeq (SunOS, $(UNAME))
LDLIBFLAGS = -shared -ldl -lrt
endif
+# define build flags for GP Optimizer UDFs library
+ifeq (Darwin, $(UNAME))
+ GPOPT_UDF_FLAGS := -dynamiclib -flat_namespace -undefined dynamic_lookup
+else
+ GPOPT_UDF_FLAGS := -shared
+endif
+
+LIBGPOS_DIR = $(ORCA_DEPENDS_DIR_INTER)/libgpos
+LIBNAUCRATES_DIR = $(ORCA_DEPENDS_DIR_INTER)/libnaucrates
+LIBGPDBCOST_DIR = $(ORCA_DEPENDS_DIR_INTER)/libgpdbcost
+LIBGPOPT_DIR = $(ORCA_DEPENDS_DIR_INTER)/libgpopt
+
+all: $(SUBDIRS) libdxltranslators.$(LDSFX) libgpoptudf.$(LDSFX)
+
+$(SUBDIRS):
+ $(MAKE) -C $@
+
+libdxltranslators.$(LDSFX): $(SUBDIROBJS) $(OBJS)
+ $(CXX) $(CXXFLAGS) $(LDLIBFLAGS) \
+ -L$(LIBGPOS_DIR)/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lgpos \
+ -L$(ORCA_DEPENDS_DIR_INTER)/lib -lxerces-c \
+ -L$(LIBNAUCRATES_DIR)/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lnaucrates \
+ -L$(LIBGPDBCOST_DIR)/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lgpdbcost \
+ -L$(LIBGPOPT_DIR)/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lgpopt -lpthread -o $@ \
+ $(SUBDIROBJS) $(OBJS)
+
+libgpoptudf.$(LDSFX): $(SUBDIROBJS)
+ $(CXX) $(CXXFLAGS) $(GPOPT_UDF_FLAGS) \
+ -L$(ORCA_DEPENDS_DIR_INTER)/lib -lxerces-c \
+ -L$(LIBGPOS_DIR)/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lgpos \
+ -L$(LIBNAUCRATES_DIR)/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lnaucrates \
+ -L$(LIBGPDBCOST_DIR)/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lgpdbcost \
+ -L$(LIBGPOPT_DIR)/$(ORCA_DEPENDS_OBJDIR_DEFAULT) -lgpopt \
+ -o $@ ./utils/funcs.o
+
+install:
+ $(INSTALL_DATA) libdxltranslators.$(LDSFX) '$(DESTDIR)$(libdir)/libdxltranslators.$(LDSFX)'
+ $(INSTALL_DATA) libgpoptudf.$(LDSFX) '$(DESTDIR)$(libdir)/libgpoptudf.$(LDSFX)'
-all:
- $(CXX) $(ARCH_FLAGS) $(LDLIBFLAGS) -L$(LIBGPOS)/$(OBJDIR_DEFAULT) -lgpos -L$(XERCES_LIBDIR) -lxerces-c-3.1 -L$(OPTIMIZER)/libnaucrates/$(OBJDIR_DEFAULT) -lnaucrates -L$(OPTIMIZER)/libgpdbcost/$(OBJDIR_DEFAULT) -lgpdbcost -L$(OPTIMIZER)/libgpopt/$(OBJDIR_DEFAULT) -lgpopt -lpthread -o libdxltranslators.$(LDSFX) $(shell find . -name '*.o' ! -name 'SUBSYS.o')
+.PHONY: all install $(SUBDIRS)
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/060161b7/src/backend/gpopt/config/Makefile
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/config/Makefile b/src/backend/gpopt/config/Makefile
index 5754f80..72d4bf9 100644
--- a/src/backend/gpopt/config/Makefile
+++ b/src/backend/gpopt/config/Makefile
@@ -4,17 +4,14 @@
# Makefile for gpopt
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/backend/gpopt/relcache/Makefile,v 1.15 2008/02/19 10:30:07 petere Exp $
+# $PostgreSQL: pgsql/src/backend/gpopt/config/Makefile,v 1.15 2008/02/19 10:30:07 petere Exp $
#
#-------------------------------------------------------------------------
-subdir = src/backend/gpopt/relcache
+subdir = src/backend/gpopt/config
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
-BLD_TOP = $(top_builddir)
-include $(top_builddir)/build-utils/pivotal/releng.mk
-
include $(top_builddir)/src/backend/gpopt/gpopt.mk
OBJS = CConfigParamMapping.o
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/060161b7/src/backend/gpopt/gpopt.mk
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/gpopt.mk b/src/backend/gpopt/gpopt.mk
index b7dead3..3e4e841 100644
--- a/src/backend/gpopt/gpopt.mk
+++ b/src/backend/gpopt/gpopt.mk
@@ -13,6 +13,14 @@ UNAME_P = $(shell uname -p)
ARCH_OS = GPOS_$(UNAME)
ARCH_CPU = GPOS_$(UNAME_P)
+ifeq (Darwin, $(UNAME))
+ LDSFX = dylib
+else
+ LDSFX = so
+endif
+
+BLD_TYPE=opt
+
GPOPT_flags = -g3 -DGPOS_DEBUG
ifeq "$(BLD_TYPE)" "opt"
GPOPT_flags = -O3 -fno-omit-frame-pointer -g3
@@ -32,11 +40,11 @@ endif
BLD_FLAGS = $(ARCH_FLAGS) -D$(ARCH_BIT) -D$(ARCH_CPU) -D$(ARCH_OS) $(GPOPT_flags)
override CPPFLAGS := -fPIC $(CPPFLAGS)
override CPPFLAGS := $(BLD_FLAGS) $(CPPFLAGS)
-override CPPFLAGS := -DGPOS_VERSION=\"$(LIBGPOS_VER)\" $(CPPFLAGS)
-override CPPFLAGS := -DGPOPT_VERSION=\"$(OPTIMIZER_VER)\" $(CPPFLAGS)
-override CPPFLAGS := -DXERCES_VERSION=\"$(XERCES_VER)\" $(CPPFLAGS)
-override CPPFLAGS := -I $(XERCES)/include $(CPPFLAGS)
-override CPPFLAGS := -I $(LIBGPOS)/include $(CPPFLAGS)
-override CPPFLAGS := -I $(OPTIMIZER)/libgpopt/include $(CPPFLAGS)
-override CPPFLAGS := -I $(OPTIMIZER)/libnaucrates/include $(CPPFLAGS)
-override CPPFLAGS := -I $(OPTIMIZER)/libgpdbcost/include $(CPPFLAGS)
\ No newline at end of file
+override CPPFLAGS := -DGPOS_VERSION=\"$(ORCA_DEPENDS_LIBGPOS_VER)\" $(CPPFLAGS)
+override CPPFLAGS := -DGPOPT_VERSION=\"$(ORCA_DEPENDS_OPTIMIZER_VER)\" $(CPPFLAGS)
+override CPPFLAGS := -DXERCES_VERSION=\"$(ORCA_DEPENDS_XERCES_VER)\" $(CPPFLAGS)
+override CPPFLAGS := -I $(ORCA_DEPENDS_DIR_INTER)/include $(CPPFLAGS)
+override CPPFLAGS := -I $(ORCA_DEPENDS_DIR_INTER)/libgpos/include $(CPPFLAGS)
+override CPPFLAGS := -I $(ORCA_DEPENDS_DIR_INTER)/libgpopt/include $(CPPFLAGS)
+override CPPFLAGS := -I $(ORCA_DEPENDS_DIR_INTER)/libnaucrates/include $(CPPFLAGS)
+override CPPFLAGS := -I $(ORCA_DEPENDS_DIR_INTER)/libgpdbcost/include $(CPPFLAGS)
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/060161b7/src/backend/gpopt/relcache/Makefile
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/relcache/Makefile b/src/backend/gpopt/relcache/Makefile
index aed59bc..b7dd65d 100644
--- a/src/backend/gpopt/relcache/Makefile
+++ b/src/backend/gpopt/relcache/Makefile
@@ -12,9 +12,6 @@ subdir = src/backend/gpopt/relcache
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
-BLD_TOP = $(top_builddir)
-include $(top_builddir)/build-utils/pivotal/releng.mk
-
include $(top_builddir)/src/backend/gpopt/gpopt.mk
OBJS = CMDProviderRelcache.o
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/060161b7/src/backend/gpopt/translate/Makefile
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/translate/Makefile b/src/backend/gpopt/translate/Makefile
index 5fd4f2c..1bd2a48 100644
--- a/src/backend/gpopt/translate/Makefile
+++ b/src/backend/gpopt/translate/Makefile
@@ -4,17 +4,14 @@
# Makefile for gpopt
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/backend/gpopt/relcache/Makefile,v 1.15 2008/02/19 10:30:07 petere Exp $
+# $PostgreSQL: pgsql/src/backend/gpopt/translate/Makefile,v 1.15 2008/02/19 10:30:07 petere Exp $
#
#-------------------------------------------------------------------------
-subdir = src/backend/gpopt/relcache
+subdir = src/backend/gpopt/translate
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
-BLD_TOP = $(top_builddir)
-include $(top_builddir)/build-utils/pivotal/releng.mk
-
include $(top_builddir)/src/backend/gpopt/gpopt.mk
OBJS = CMappingColIdVar.o \
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/060161b7/src/backend/gpopt/utils/Makefile
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/utils/Makefile b/src/backend/gpopt/utils/Makefile
index 2f0811b..60ba8c7 100644
--- a/src/backend/gpopt/utils/Makefile
+++ b/src/backend/gpopt/utils/Makefile
@@ -8,13 +8,10 @@
#
#-------------------------------------------------------------------------
-subdir = src/backend/gpopt/relcache
+subdir = src/backend/gpopt/utils
top_builddir = ../../../..
include $(top_builddir)/src/Makefile.global
-BLD_TOP = $(top_builddir)
-include $(top_builddir)/build-utils/pivotal/releng.mk
-
include $(top_builddir)/src/backend/gpopt/gpopt.mk
CFLAGS_DL = -fPIC