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/12/08 09:41:58 UTC
incubator-hawq git commit: HAWQ-230. fix build failure on centos 7
Repository: incubator-hawq
Updated Branches:
refs/heads/master 72b349b4b -> 9b2421ea2
HAWQ-230. fix build failure on centos 7
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/9b2421ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/9b2421ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/9b2421ea
Branch: refs/heads/master
Commit: 9b2421ea2fecb1fef834183a05e024a642190250
Parents: 72b349b
Author: Zhanwei Wang <wa...@apache.org>
Authored: Mon Dec 7 17:46:13 2015 +0800
Committer: Zhanwei Wang <wa...@apache.org>
Committed: Tue Dec 8 11:39:10 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 +
configure | 2 +-
configure.in | 2 +-
contrib/orafce/plvlex.c | 4 +++-
src/backend/Makefile | 3 ---
src/backend/access/parquet/metadatautil_c++/MetadataUtil.cpp | 6 ++++--
.../access/parquet/metadatautil_c++/Metadatainterface.cpp | 6 +++++-
src/backend/catalog/caql/gram.y | 1 +
8 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b2421ea/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 827e838..8fd9023 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@ objfiles.txt
.settings
# Generated files
+BUILD_NUMBER
GNUmakefile
config.log
config.status
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b2421ea/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 309039f..4d11d0b 100755
--- a/configure
+++ b/configure
@@ -10921,7 +10921,7 @@ return json_tokener_parse ();
return 0;
}
_ACEOF
-for ac_lib in '' json; do
+for ac_lib in '' json-c json; do
if test -z "$ac_lib"; then
ac_res="none required"
else
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b2421ea/configure.in
----------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index fbf6552..30c8094 100644
--- a/configure.in
+++ b/configure.in
@@ -1224,7 +1224,7 @@ fi
# json-c
AC_CHECK_HEADERS(json/json.h, [], [AC_MSG_ERROR([json-c is required])])
-AC_SEARCH_LIBS(json_tokener_parse, json, [], [AC_MSG_ERROR([json-c is required])], [])
+AC_SEARCH_LIBS(json_tokener_parse, json-c json, [], [AC_MSG_ERROR([json-c is required])], [])
# libxml2
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b2421ea/contrib/orafce/plvlex.c
----------------------------------------------------------------------
diff --git a/contrib/orafce/plvlex.c b/contrib/orafce/plvlex.c
index fbde660..e703cbd 100644
--- a/contrib/orafce/plvlex.c
+++ b/contrib/orafce/plvlex.c
@@ -20,13 +20,15 @@
#include "lib/stringinfo.h"
#include "plvlex.h"
-#include "sqlparse.h"
#include "nodes/pg_list.h"
#include "funcapi.h"
#include "catalog/pg_type.h"
#include "orafunc.h"
#include "builtins.h"
+#define YYPARSE_PARAM
+#include "sqlparse.h"
+
typedef struct {
List *nodes;
int nnodes;
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b2421ea/src/backend/Makefile
----------------------------------------------------------------------
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 28bde84..8460b76 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -67,9 +67,6 @@ endif
# HAWQ uses threads in the backend
LIBS := $(LIBS) -lpthread
-JSONLIB = -ljson
-LIBS := $(LIBS) $(JSONLIB)
-
THRIFTLIB = -lthrift
LIBS := $(LIBS) $(THRIFTLIB)
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b2421ea/src/backend/access/parquet/metadatautil_c++/MetadataUtil.cpp
----------------------------------------------------------------------
diff --git a/src/backend/access/parquet/metadatautil_c++/MetadataUtil.cpp b/src/backend/access/parquet/metadatautil_c++/MetadataUtil.cpp
index de4d7bd..8967d2f 100644
--- a/src/backend/access/parquet/metadatautil_c++/MetadataUtil.cpp
+++ b/src/backend/access/parquet/metadatautil_c++/MetadataUtil.cpp
@@ -27,14 +27,16 @@
#include <fcntl.h>
#include <vector>
#include <string.h>
-#include "MetadataUtil.h"
-#include "parquet_types.h"
extern "C" {
#include "postgres.h"
#include "utils/palloc.h"
#include "lib/stringinfo.h"
}
+
+#include "MetadataUtil.h"
+#include "parquet_types.h"
+
using namespace hawq;
ThriftSerializer *MetadataUtil::thriftSerializer = new ThriftSerializer(true, 1024);
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b2421ea/src/backend/access/parquet/metadatautil_c++/Metadatainterface.cpp
----------------------------------------------------------------------
diff --git a/src/backend/access/parquet/metadatautil_c++/Metadatainterface.cpp b/src/backend/access/parquet/metadatautil_c++/Metadatainterface.cpp
index e39b479..5e85745 100644
--- a/src/backend/access/parquet/metadatautil_c++/Metadatainterface.cpp
+++ b/src/backend/access/parquet/metadatautil_c++/Metadatainterface.cpp
@@ -27,13 +27,17 @@
#include <fstream>
#include <stdio.h>
#include <bitset>
+
+extern "C" {
+#include "postgres.h"
+}
+
#include "MetadataUtil.h"
using namespace hawq;
using namespace std;
using namespace boost;
extern "C" {
-#include "postgres.h"
#include "utils/palloc.h"
/*
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9b2421ea/src/backend/catalog/caql/gram.y
----------------------------------------------------------------------
diff --git a/src/backend/catalog/caql/gram.y b/src/backend/catalog/caql/gram.y
index add0428..1350f06 100644
--- a/src/backend/catalog/caql/gram.y
+++ b/src/backend/catalog/caql/gram.y
@@ -291,4 +291,5 @@ caql_raw_parser(const char *query, const char *file, int line)
#undef yylval
#undef yylloc
+struct yyguts_t * yyg = NULL;
#include "scan.c"