Repository: trafodion
Updated Branches:
refs/heads/master 51bed00bf -> c0492a5fe
[TRAFODION-3061] eliminate building errors on CentOS7
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/a8f9197b
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/a8f9197b
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/a8f9197b
Branch: refs/heads/master
Commit: a8f9197b0e3043f0c2e1cfca841d010bca42ef63
Parents: fe62cce
Author: LiuMing <ovis_poly@sina.com>
Authored: Tue May 8 09:17:57 2018 +0800
Committer: LiuMing <ovis_poly@sina.com>
Committed: Tue May 8 09:17:57 2018 +0800
----------------------------------------------------------------------
core/sqf/src/trafconf/tcdbsqlite.cpp | 2 --
core/sqf/src/trafconf/tctrace.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLmd.h | 4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/a8f9197b/core/sqf/src/trafconf/tcdbsqlite.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/trafconf/tcdbsqlite.cpp b/core/sqf/src/trafconf/tcdbsqlite.cpp
index 6b3d37a..7310d8c 100644
--- a/core/sqf/src/trafconf/tcdbsqlite.cpp
+++ b/core/sqf/src/trafconf/tcdbsqlite.cpp
@@ -2142,7 +2142,6 @@ int CTcdbSqlite::GetSNodeData( int pnid
}
}
- int spnid;
int sparedpnid;
int spareCount = 0;
@@ -2165,7 +2164,6 @@ int CTcdbSqlite::GetSNodeData( int pnid
}
}
- spnid = sqlite3_column_int(prepStmt, 0);
sparedpnid = sqlite3_column_int(prepStmt, 1);
spareNodeConfig.spare_pnid[spareCount] = sparedpnid;
spareCount++;
http://git-wip-us.apache.org/repos/asf/trafodion/blob/a8f9197b/core/sqf/src/trafconf/tctrace.cpp
----------------------------------------------------------------------
diff --git a/core/sqf/src/trafconf/tctrace.cpp b/core/sqf/src/trafconf/tctrace.cpp
index b016f0a..7b03885 100644
--- a/core/sqf/src/trafconf/tctrace.cpp
+++ b/core/sqf/src/trafconf/tctrace.cpp
@@ -60,7 +60,7 @@ CTrafConfigTrace::CTrafConfigTrace()
, traceFileFb_(0)
, traceFileBase_(NULL)
{
- numTraceAreas_ = sizeof(traceAreaList_)/sizeof(TraceArea_t);
+ numTraceAreas_ = (int)(sizeof(traceAreaList_)/sizeof(TraceArea_t));
}
const char *CTrafConfigTrace::GetEnvStr(const char *key)
http://git-wip-us.apache.org/repos/asf/trafodion/blob/a8f9197b/core/sql/sqlcomp/CmpSeabaseDDLmd.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLmd.h b/core/sql/sqlcomp/CmpSeabaseDDLmd.h
index 3ca7e78..fefc29e 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLmd.h
+++ b/core/sql/sqlcomp/CmpSeabaseDDLmd.h
@@ -1699,7 +1699,7 @@ static const QString createTrafViewsViewQuery[] =
static const QString createTrafObjectCommentViewQuery[] =
{
- {" create view %s.\"%s\"."TRAF_OBJECT_COMMENT_VIEW" as "},
+ {" create view %s.\"%s\"." TRAF_OBJECT_COMMENT_VIEW" as "},
{" select O.catalog_name, O.schema_name, O.object_name, T.text as comment "},
{" from %s.\"%s\".\"%s\" as O, %s.\"%s\".\"%s\" as T "},
{" where O.object_uid = T.text_uid and T.text_type = %s "},
@@ -1709,7 +1709,7 @@ static const QString createTrafObjectCommentViewQuery[] =
static const QString createTrafColumnCommentViewQuery[] =
{
- {" create view %s.\"%s\"."TRAF_COLUMN_COMMENT_VIEW" as "},
+ {" create view %s.\"%s\"." TRAF_COLUMN_COMMENT_VIEW" as "},
{" select O.CATALOG_NAME, O.SCHEMA_NAME, O.OBJECT_NAME, C.COLUMN_NAME, T.TEXT as COMMENT
"},
{" from %s.\"%s\".\"%s\" as O, %s.\"%s\".\"%s\" as C, %s.\"%s\".\"%s\" as T "},
{" where O.OBJECT_UID = C.OBJECT_UID and T.TEXT_UID = O.OBJECT_UID and T.TEXT_TYPE = %s
and T.SUB_ID = C.COLUMN_NUMBER "},
|