This is an automated email from the ASF dual-hosted git repository. huor pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hawq.git
commit 6ac3bd2934be5718deb8952a3c47c76fed89dd74 Author: oushu1tuyu1 <[email protected]> AuthorDate: Sat Apr 27 11:50:48 2019 +0800 HAWQ-1705. fix orc build bug --- depends/dbcommon/src/dbcommon/type/type-kind.h | 1 + src/Makefile.global.in | 1 + src/backend/utils/Makefile | 2 +- src/backend/utils/hawq_type_mapping.c | 3 +-- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/depends/dbcommon/src/dbcommon/type/type-kind.h b/depends/dbcommon/src/dbcommon/type/type-kind.h index f4e7907..8769a1b 100644 --- a/depends/dbcommon/src/dbcommon/type/type-kind.h +++ b/depends/dbcommon/src/dbcommon/type/type-kind.h @@ -75,6 +75,7 @@ enum TypeKind { DOUBLEARRAYID = 1004, STRINGARRAYID = 1005, BPCHARARRAYID = 1006, + DECIMAL128ARRAYID = 1007, // 1200~1299 reference diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 3691d79..51dffad 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -223,6 +223,7 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CPPFLAGS += -I$(abs_top_srcdir)/depends/libhdfs3/build/install$(prefix)/include CPPFLAGS += -I$(abs_top_srcdir)/depends/libyarn/build/install$(prefix)/include +CPPFLAGS += -I/usr/local/hawq/include ifdef PGXS override CPPFLAGS := -I$(includedir_server) -I$(includedir_internal) $(CPPFLAGS) diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile index 05b02f0..b265667 100644 --- a/src/backend/utils/Makefile +++ b/src/backend/utils/Makefile @@ -8,7 +8,7 @@ subdir = src/backend/utils top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -OBJS = fmgrtab.o session_state.o +OBJS = fmgrtab.o session_state.o hawq_type_mapping.o SUBDIRS = adt cache error fmgr hash init mb misc mmgr resowner \ resscheduler sort time gpmon gp workfile_manager diff --git a/src/backend/utils/hawq_type_mapping.c b/src/backend/utils/hawq_type_mapping.c index 9e19076..50b524c 100644 --- a/src/backend/utils/hawq_type_mapping.c +++ b/src/backend/utils/hawq_type_mapping.c @@ -23,8 +23,7 @@ *------------------------------------------------------------------------- */ -#include "hawq_type_mapping.h" - +#include "utils/hawq_type_mapping.h" #include "miscadmin.h" int32_t map_hawq_type_to_common_plan(int32_t hawqTypeID) {
