You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2018/05/14 16:45:51 UTC
[1/5] trafodion git commit: [TRAFODION-1861] Run Trafodion on CentOS 7
Repository: trafodion
Updated Branches:
refs/heads/master 330235a0b -> 607e8a7c1
[TRAFODION-1861] Run Trafodion on CentOS 7
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/4addf763
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/4addf763
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/4addf763
Branch: refs/heads/master
Commit: 4addf763ee18eb9cb01e2bd0fecde297a60f485c
Parents: fe62cce
Author: LiuMing <ov...@sina.com>
Authored: Tue May 8 12:01:46 2018 +0800
Committer: LiuMing <ov...@sina.com>
Committed: Tue May 8 12:01:46 2018 +0800
----------------------------------------------------------------------
core/sqf/macros.gmk | 6 ++++++
core/sqf/src/seabed/src/Makefile | 13 +++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/4addf763/core/sqf/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/macros.gmk b/core/sqf/macros.gmk
index b21ab1b..1b6a9a8 100644
--- a/core/sqf/macros.gmk
+++ b/core/sqf/macros.gmk
@@ -141,3 +141,9 @@ CDEPFLAGS = -Wp,-MD,$(CDEP_FILE) -Wp,-MT,$@
CDEPFILES = $(CDEP_DIR)/*.dep
CDEP_DIR = $(OUTDIR)/depend
CDEP_FILE = $(CDEP_DIR)/$<.dep
+
+GCC_FULL_VERSION := $(shell gcc -dumpversion)
+GCC_MAJOR_VERSION := $(shell echo $(GCC_FULL_VERSION) | cut -d. -f 1)
+GCC_MINOR_VERSION := $(shell echo $(GCC_FULL_VERSION) | cut -d. -f 2)
+GCC_MAJOR_VERSION_GT_3 := $(shell expr $(GCC_MAJOR_VERSION) \> 3)
+GCC_MINOR_VERSION_GT_4 := $(shell expr $(GCC_MINOR_VERSION) \> 4)
http://git-wip-us.apache.org/repos/asf/trafodion/blob/4addf763/core/sqf/src/seabed/src/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/Makefile b/core/sqf/src/seabed/src/Makefile
index f3a5ef7..0c9bdd1 100644
--- a/core/sqf/src/seabed/src/Makefile
+++ b/core/sqf/src/seabed/src/Makefile
@@ -55,6 +55,16 @@ LIBSBUTIL = $(LIBEXPDIR)/libsbutil.so
LIBSQSTATESB = $(LIBEXPDIR)/libsqstatesb.so
# neet -lrt for clock_gettime
LIBSX += -lrt
+#
+# the order of these objects have to be swapped based on the GCC version
+MS_MPITMSG_O = $(OUTDIR)/mpitmsg.o \
+ $(OUTDIR)/ms.o
+ifeq ($(GCC_MAJOR_VERSION_GT_3),1)
+ifeq ($(GCC_MINOR_VERSION_GT_4),1)
+MS_MPITMSG_O = $(OUTDIR)/ms.o \
+ $(OUTDIR)/mpitmsg.o
+endif
+endif
OBJSBFS = $(OUTDIR)/fs.o \
@@ -78,8 +88,7 @@ OBJSBMS = $(OUTDIR)/apictr.o \
$(OUTDIR)/mapmd.o \
$(OUTDIR)/mapstats.o \
$(OUTDIR)/monclio.o \
- $(OUTDIR)/mpitmsg.o \
- $(OUTDIR)/ms.o \
+ $(MS_MPITMSG_O) \
$(OUTDIR)/mserr.o \
$(OUTDIR)/mseventmgr.o \
$(OUTDIR)/msic.o \
[3/5] trafodion git commit: fix review comments
Posted by db...@apache.org.
fix review comments
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e2e6f9fb
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e2e6f9fb
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e2e6f9fb
Branch: refs/heads/master
Commit: e2e6f9fbac488db09ba3007b21d8ed9b00550acd
Parents: d2b365c
Author: LiuMing <ov...@sina.com>
Authored: Wed May 9 13:38:15 2018 +0800
Committer: LiuMing <ov...@sina.com>
Committed: Wed May 9 13:38:15 2018 +0800
----------------------------------------------------------------------
core/sqf/macros.gmk | 1 +
core/sqf/src/seabed/src/Makefile | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/e2e6f9fb/core/sqf/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/macros.gmk b/core/sqf/macros.gmk
index 1b6a9a8..00e7ced 100644
--- a/core/sqf/macros.gmk
+++ b/core/sqf/macros.gmk
@@ -146,4 +146,5 @@ GCC_FULL_VERSION := $(shell gcc -dumpversion)
GCC_MAJOR_VERSION := $(shell echo $(GCC_FULL_VERSION) | cut -d. -f 1)
GCC_MINOR_VERSION := $(shell echo $(GCC_FULL_VERSION) | cut -d. -f 2)
GCC_MAJOR_VERSION_GT_3 := $(shell expr $(GCC_MAJOR_VERSION) \> 3)
+GCC_MAJOR_VERSION_EQ_4 := $(shell expr $(GCC_MAJOR_VERSION) \= 4)
GCC_MINOR_VERSION_GT_4 := $(shell expr $(GCC_MINOR_VERSION) \> 4)
http://git-wip-us.apache.org/repos/asf/trafodion/blob/e2e6f9fb/core/sqf/src/seabed/src/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/Makefile b/core/sqf/src/seabed/src/Makefile
index 0c9bdd1..186949c 100644
--- a/core/sqf/src/seabed/src/Makefile
+++ b/core/sqf/src/seabed/src/Makefile
@@ -59,7 +59,7 @@ LIBSX += -lrt
# the order of these objects have to be swapped based on the GCC version
MS_MPITMSG_O = $(OUTDIR)/mpitmsg.o \
$(OUTDIR)/ms.o
-ifeq ($(GCC_MAJOR_VERSION_GT_3),1)
+ifeq ($(GCC_MAJOR_VERSION_EQ_4),1)
ifeq ($(GCC_MINOR_VERSION_GT_4),1)
MS_MPITMSG_O = $(OUTDIR)/ms.o \
$(OUTDIR)/mpitmsg.o
[4/5] trafodion git commit: fix review comments
Posted by db...@apache.org.
fix review comments
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/ab112eac
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/ab112eac
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/ab112eac
Branch: refs/heads/master
Commit: ab112eac8048484593596c096432e38663b7270a
Parents: e2e6f9f
Author: LiuMing <ov...@sina.com>
Authored: Fri May 11 15:49:00 2018 +0800
Committer: LiuMing <ov...@sina.com>
Committed: Fri May 11 15:49:00 2018 +0800
----------------------------------------------------------------------
core/sqf/macros.gmk | 2 ++
core/sqf/src/seabed/src/Makefile | 17 ++++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ab112eac/core/sqf/macros.gmk
----------------------------------------------------------------------
diff --git a/core/sqf/macros.gmk b/core/sqf/macros.gmk
index 00e7ced..0fa5f3d 100644
--- a/core/sqf/macros.gmk
+++ b/core/sqf/macros.gmk
@@ -147,4 +147,6 @@ GCC_MAJOR_VERSION := $(shell echo $(GCC_FULL_VERSION) | cut -d. -f 1)
GCC_MINOR_VERSION := $(shell echo $(GCC_FULL_VERSION) | cut -d. -f 2)
GCC_MAJOR_VERSION_GT_3 := $(shell expr $(GCC_MAJOR_VERSION) \> 3)
GCC_MAJOR_VERSION_EQ_4 := $(shell expr $(GCC_MAJOR_VERSION) \= 4)
+GCC_MAJOR_VERSION_LT_4 := $(shell expr $(GCC_MAJOR_VERSION) \< 4)
GCC_MINOR_VERSION_GT_4 := $(shell expr $(GCC_MINOR_VERSION) \> 4)
+GCC_MINOR_VERSION_LT_5 := $(shell expr $(GCC_MINOR_VERSION) \< 5)
http://git-wip-us.apache.org/repos/asf/trafodion/blob/ab112eac/core/sqf/src/seabed/src/Makefile
----------------------------------------------------------------------
diff --git a/core/sqf/src/seabed/src/Makefile b/core/sqf/src/seabed/src/Makefile
index 186949c..3d77af6 100644
--- a/core/sqf/src/seabed/src/Makefile
+++ b/core/sqf/src/seabed/src/Makefile
@@ -57,15 +57,22 @@ LIBSQSTATESB = $(LIBEXPDIR)/libsqstatesb.so
LIBSX += -lrt
#
# the order of these objects have to be swapped based on the GCC version
-MS_MPITMSG_O = $(OUTDIR)/mpitmsg.o \
- $(OUTDIR)/ms.o
-ifeq ($(GCC_MAJOR_VERSION_EQ_4),1)
-ifeq ($(GCC_MINOR_VERSION_GT_4),1)
MS_MPITMSG_O = $(OUTDIR)/ms.o \
- $(OUTDIR)/mpitmsg.o
+ $(OUTDIR)/mpitmsg.o
+
+#if major version is 4, check minor version, if minor version < 5, it is old CentOS
+ifeq ($(GCC_MAJOR_VERSION_EQ_4),1)
+ifeq ($(GCC_MINOR_VERSION_LT_5),1)
+MS_MPITMSG_O = $(OUTDIR)/mpitmsg.o \
+ $(OUTDIR)/ms.o
endif
endif
+#if major version is less than 4, it must be older CentOS version
+ifeq ($(GCC_MAJOR_VERSION_LT_4),1)
+MS_MPITMSG_O = $(OUTDIR)/mpitmsg.o \
+ $(OUTDIR)/ms.o
+endif
OBJSBFS = $(OUTDIR)/fs.o \
$(OUTDIR)/fsfname.o \
[5/5] trafodion git commit: Merge [TRAFODION-1861] PR 1553 Run
Trafodion on CentOS 7
Posted by db...@apache.org.
Merge [TRAFODION-1861] PR 1553 Run Trafodion on CentOS 7
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/607e8a7c
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/607e8a7c
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/607e8a7c
Branch: refs/heads/master
Commit: 607e8a7c113f2b73d8e00ba49eb9f3bb7c3b59da
Parents: 330235a ab112ea
Author: Dave Birdsall <db...@apache.org>
Authored: Mon May 14 16:44:57 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon May 14 16:44:57 2018 +0000
----------------------------------------------------------------------
core/sqf/macros.gmk | 9 +++++++++
core/sqf/src/seabed/src/Makefile | 20 ++++++++++++++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/5] trafodion git commit: Merge branch 'master' of
https://github.com/apache/trafodion into TRAFODION-1861
Posted by db...@apache.org.
Merge branch 'master' of https://github.com/apache/trafodion into TRAFODION-1861
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/d2b365c0
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/d2b365c0
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/d2b365c0
Branch: refs/heads/master
Commit: d2b365c016ede7a49ff9d40b3d060499737fe4d2
Parents: 4addf76 008f4af
Author: LiuMing <ov...@sina.com>
Authored: Wed May 9 12:33:52 2018 +0800
Committer: LiuMing <ov...@sina.com>
Committed: Wed May 9 12:33:52 2018 +0800
----------------------------------------------------------------------
core/sqf/src/trafconf/tcdbsqlite.cpp | 2 --
core/sqf/src/trafconf/tctrace.cpp | 2 +-
core/sql/parser/sqlparser.y | 8 ++++++++
core/sql/regress/seabase/EXPECTED002 | 20 ++++++++++----------
core/sql/sqlcomp/CmpSeabaseDDLmd.h | 4 ++--
.../java/org/trafodion/sql/HBaseClient.java | 14 --------------
core/sql/ustat/hs_cli.cpp | 1 +
core/sql/ustat/hs_globals.cpp | 4 ++++
core/sql/ustat/hs_log.h | 1 +
9 files changed, 27 insertions(+), 29 deletions(-)
----------------------------------------------------------------------