You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2016/03/16 21:44:47 UTC
[1/3] incubator-trafodion git commit: Changes to drop LOB dependent
tables during drop schema. TRAFODION-1883.
Repository: incubator-trafodion
Updated Branches:
refs/heads/master f9b3afd33 -> 2a9e9f223
Changes to drop LOB dependent tables during drop schema. TRAFODION-1883.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cf5390e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cf5390e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cf5390e7
Branch: refs/heads/master
Commit: cf5390e7d6f59257529668361e98325c5bbf8f9b
Parents: 57d3ebd
Author: Sandhya Sundaresan <sa...@edev03.esgyn.local>
Authored: Tue Mar 15 18:10:11 2016 +0000
Committer: Sandhya Sundaresan <sa...@edev03.esgyn.local>
Committed: Tue Mar 15 18:10:11 2016 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 2 +-
core/sql/common/ComSmallDefs.h | 4 +-
core/sql/exp/ExpLOB.cpp | 16 ++---
core/sql/sqlcomp/CmpSeabaseDDL.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 11 ++++
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 84 ++++++++++++++++++++-------
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 9 +--
7 files changed, 92 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cf5390e7/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 58a77ba..f197018 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -2454,7 +2454,7 @@ Lng32 SQLCLI_ProcessRetryQuery(
return retcode;
}
- if (rootTdb->updDelInsertQuery())
+ if (rootTdb->updDelInsertQuery()|| (rootTdb->ddlQuery()))
{
if (rootTdb->transactionReqd() &&
(NOT exTransaction->xnInProgress()))
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cf5390e7/core/sql/common/ComSmallDefs.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSmallDefs.h b/core/sql/common/ComSmallDefs.h
index 9a10fc8..630d292 100644
--- a/core/sql/common/ComSmallDefs.h
+++ b/core/sql/common/ComSmallDefs.h
@@ -122,7 +122,9 @@ typedef NABoolean ComBoolean;
#define SEABASE_OLD_PRIVMGR_SCHEMA "PRIVMGR_MD"
#define SEABASE_PRIVMGR_SCHEMA "_PRIVMGR_MD_"
#define SEABASE_UDF_SCHEMA "_UDF_"
-
+#define LOB_MD_PREFIX "LOBMD_"
+#define LOB_DESC_CHUNK_PREFIX "LOBDescChunks_"
+#define LOB_DESC_HANDLE_PREFIX "LOBDescHandle_"
#define SEABASE_DEFAULT_COL_FAMILY "#1"
// reserved names for seabase metadata where SQL table information is kept
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cf5390e7/core/sql/exp/ExpLOB.cpp
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpLOB.cpp b/core/sql/exp/ExpLOB.cpp
index 18470d6..556907c 100644
--- a/core/sql/exp/ExpLOB.cpp
+++ b/core/sql/exp/ExpLOB.cpp
@@ -94,7 +94,7 @@ char * ExpLOBoper::ExpGetLOBDescHandleObjNamePrefix(Int64 uid,
if (outBufLen < 512)
return NULL;
- str_sprintf(outBuf, "LOBDescHandle_%020Ld", uid);
+ str_sprintf(outBuf, "%s_%020Ld", LOB_DESC_HANDLE_PREFIX,uid);
return outBuf;
}
@@ -107,8 +107,8 @@ char * ExpLOBoper::ExpGetLOBDescHandleName(Lng32 schNameLen, char * schName,
(schName == NULL))
return NULL;
- str_sprintf(outBuf, "%s.\"LOBDescHandle_%020Ld_%04d\"",
- schName, uid, num);
+ str_sprintf(outBuf, "%s.\"%s_%020Ld_%04d\"",
+ schName, LOB_DESC_HANDLE_PREFIX,uid, num);
return outBuf;
}
@@ -116,7 +116,7 @@ char * ExpLOBoper::ExpGetLOBDescHandleName(Lng32 schNameLen, char * schName,
Lng32 ExpLOBoper::ExpGetLOBnumFromDescName(char * descName, Lng32 descNameLen)
{
// Desc Name Format: LOBDescHandle_%020Ld_%04d
- char * lobNumPtr = &descName[strlen("LOBDescHandle_") + 20 + 1];
+ char * lobNumPtr = &descName[sizeof(LOB_DESC_HANDLE_PREFIX) + 20 + 1];
Lng32 lobNum = str_atoi(lobNumPtr, 4);
return lobNum;
@@ -131,8 +131,8 @@ char * ExpLOBoper::ExpGetLOBDescChunksName(Lng32 schNameLen, char * schName,
(schName == NULL))
return NULL;
- str_sprintf(outBuf, "%s.\"LOBDescChunks_%020Ld_%04d\"",
- schName, uid, num);
+ str_sprintf(outBuf, "%s.\"%s_%020Ld_%04d\"",
+ schName, LOB_DESC_CHUNK_PREFIX,uid, num);
return outBuf;
}
@@ -159,8 +159,8 @@ char * ExpLOBoper::ExpGetLOBMDName(Lng32 schNameLen, char * schName,
if (outBufLen < 512)
return NULL;
- str_sprintf(outBuf, "%s.\"LOBMD_%020Ld\"",
- schName, uid);
+ str_sprintf(outBuf, "%s.\"%s_%020Ld\"",
+ schName, LOB_MD_PREFIX,uid);
return outBuf;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cf5390e7/core/sql/sqlcomp/CmpSeabaseDDL.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDL.h b/core/sql/sqlcomp/CmpSeabaseDDL.h
index e1eee25..b51df70 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDL.h
+++ b/core/sql/sqlcomp/CmpSeabaseDDL.h
@@ -162,7 +162,7 @@ class CmpSeabaseDDL
static NABoolean isHbase(const NAString &catName);
static bool isHistogramTable(const NAString &tabName);
-
+ static NABoolean isLOBDependentNameMatch(const NAString &name);
static NABoolean isSeabaseMD(const NAString &catName,
const NAString &schName,
const NAString &objName);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cf5390e7/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index 938d8f2..1efa24d 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -926,6 +926,17 @@ bool CmpSeabaseDDL::isHistogramTable(const NAString &name)
}
+NABoolean CmpSeabaseDDL::isLOBDependentNameMatch(const NAString &name)
+{
+ if ((name(0,min((sizeof(LOB_MD_PREFIX)-1), name.length())) == LOB_MD_PREFIX) ||
+ (name(0,min((sizeof(LOB_DESC_CHUNK_PREFIX)-1), name.length()))==LOB_DESC_CHUNK_PREFIX)||
+ (name(0,min((sizeof(LOB_DESC_HANDLE_PREFIX)-1), name.length()))==LOB_DESC_HANDLE_PREFIX)
+ )
+ return true;
+ else
+ return false;
+}
+
NABoolean CmpSeabaseDDL::isSeabase(const NAString &catName)
{
if ((CmpCommon::getDefault(MODE_SEABASE) == DF_ON) &&
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cf5390e7/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
index 34a8cf0..dc13462 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
@@ -61,6 +61,7 @@ static bool dropOneTable(
const char * schemaName,
const char * objectName,
bool isVolatile,
+ bool ifExists,
bool ddlXns);
static bool transferObjectPrivs(
@@ -499,6 +500,8 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode)
// select objects in the schema to drop, don't return PRIMARY_KEY_CONSTRAINTS,
// they always get removed when the parent table is dropped.
+ // Filter out the LOB depenedent tables too - they will get dropped when
+ //the main LOB table is dropped.
str_sprintf(query,"SELECT TRIM(object_name), TRIM(object_type) "
"FROM %s.\"%s\".%s "
"WHERE catalog_name = '%s' AND schema_name = '%s' AND "
@@ -548,7 +551,7 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode)
dirtiedMetadata = TRUE;
if (dropOneTable(cliInterface,(char*)catName.data(),
(char*)schName.data(),(char*)objName.data(),
- isVolatile, dropSchemaNode->ddlXns()))
+ isVolatile, FALSE,dropSchemaNode->ddlXns()))
someObjectsCouldNotBeDropped = true;
}
}
@@ -638,26 +641,58 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode)
objectsQueue->position();
for (int idx = 0; idx < objectsQueue->numEntries(); idx++)
- {
- OutputInfo * vi = (OutputInfo*)objectsQueue->getNext();
+ {
+ OutputInfo * vi = (OutputInfo*)objectsQueue->getNext();
- NAString objName = vi->get(0);
- NAString objType = vi->get(1);
+ NAString objName = vi->get(0);
+ NAString objType = vi->get(1);
+
+ // drop user objects first
+ if (objType == COM_BASE_TABLE_OBJECT_LIT)
+ {
+ // histogram tables have already been dropped
+ // Avoid any tables that match LOB dependent tablenames.
+ // (there is no special type for these tables)
+ if (!isHistogramTable(objName) && !isLOBDependentNameMatch(objName))
+ {
+ dirtiedMetadata = TRUE;
+ if (dropOneTable(cliInterface,(char*)catName.data(),
+ (char*)schName.data(),(char*)objName.data(),
+ isVolatile, FALSE,dropSchemaNode->ddlXns()))
+ someObjectsCouldNotBeDropped = true;
+ }
+ }
+ }
+
+ // If there are any user tables having the LOB dependent name pattern, they
+ // will still be around. Drop those. The real LOB dependent tables, would
+ //have been dropped in the previous step
+
- // drop user objects first
- if (objType == COM_BASE_TABLE_OBJECT_LIT)
- {
- // histogram tables have already been dropped
- if (!isHistogramTable(objName))
- {
- dirtiedMetadata = TRUE;
- if (dropOneTable(cliInterface,(char*)catName.data(),
- (char*)schName.data(),(char*)objName.data(),
- isVolatile, dropSchemaNode->ddlXns()))
- someObjectsCouldNotBeDropped = true;
- }
- }
- }
+ objectsQueue->position();
+ for (int idx = 0; idx < objectsQueue->numEntries(); idx++)
+ {
+ OutputInfo * vi = (OutputInfo*)objectsQueue->getNext();
+
+ NAString objName = vi->get(0);
+ NAString objType = vi->get(1);
+
+ if (objType == COM_BASE_TABLE_OBJECT_LIT)
+ {
+ if (!isHistogramTable(objName) && isLOBDependentNameMatch(objName))
+ {
+ dirtiedMetadata = TRUE;
+ // Pass in TRUE for "ifExists" since the lobDependent tables
+ // would have already been dropped and we don't want those to
+ // raise errors. We just want to catch any user tables that
+ // happen to have the same name patterns.
+ if (dropOneTable(cliInterface,(char*)catName.data(),
+ (char*)schName.data(),(char*)objName.data(),
+ isVolatile,TRUE, dropSchemaNode->ddlXns()))
+ someObjectsCouldNotBeDropped = true;
+ }
+ }
+ }
// Drop any remaining indexes.
@@ -1151,6 +1186,7 @@ static bool dropOneTable(
const char * schemaName,
const char * objectName,
bool isVolatile,
+ bool ifExists,
bool ddlXns)
{
@@ -1160,17 +1196,23 @@ char buf [1000];
bool someObjectsCouldNotBeDropped = false;
char volatileString[20] = {0};
+ char ifExistsString[20] = {0};
Lng32 cliRC = 0;
+
+
if (isVolatile)
strcpy(volatileString,"VOLATILE");
+ if (ifExists)
+ strcpy(ifExistsString,"IF EXISTS");
+
if (ComIsTrafodionExternalSchemaName(schemaName))
str_sprintf(buf,"DROP EXTERNAL TABLE \"%s\" FOR \"%s\".\"%s\".\"%s\" CASCADE",
objectName,catalogName,schemaName,objectName);
else
- str_sprintf(buf,"DROP %s TABLE \"%s\".\"%s\".\"%s\" CASCADE",
- volatileString,catalogName,schemaName,objectName);
+ str_sprintf(buf,"DROP %s %s TABLE \"%s\".\"%s\".\"%s\" CASCADE",
+ volatileString, ifExistsString, catalogName,schemaName,objectName);
ULng32 savedParserFlags = Get_SqlParser_Flags(0xFFFFFFFF);
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cf5390e7/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index fb9c802..a4b74e3 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -2226,6 +2226,7 @@ short CmpSeabaseDDL::createSeabaseTable2(
Int64 lobMaxSize = CmpCommon::getDefaultNumeric(LOB_MAX_SIZE)*1024*1024;
if (j > 0)
{
+ Int32 rc = sendAllControls(FALSE, FALSE, TRUE);
//if the table is a volatile table return an error
if (createTableNode->isVolatile())
{
@@ -2247,7 +2248,7 @@ short CmpSeabaseDDL::createSeabaseTable2(
newSchName.append("\".\"");
newSchName.append(schemaNamePart);
newSchName += "\"";
- Lng32 rc = SQL_EXEC_LOBddlInterface((char*)newSchName.data(),
+ rc = SQL_EXEC_LOBddlInterface((char*)newSchName.data(),
newSchName.length(),
objUID,
j,
@@ -3334,8 +3335,7 @@ short CmpSeabaseDDL::dropSeabaseTable2(
processReturn();
return -1;
- }
-
+ }
}
// drop all check constraints from metadata if 'no check' is not specified.
@@ -3582,6 +3582,7 @@ short CmpSeabaseDDL::dropSeabaseTable2(
}
if (j > 0)
{
+ Int32 rc = sendAllControls(FALSE, FALSE, TRUE);
Int64 objUID = getObjectUID(cliInterface,
catalogNamePart.data(), schemaNamePart.data(),
objectNamePart.data(),
@@ -3592,7 +3593,7 @@ short CmpSeabaseDDL::dropSeabaseTable2(
newSchName.append("\".\"");
newSchName.append(schemaNamePart);
newSchName += "\"";
- Lng32 rc = SQL_EXEC_LOBddlInterface((char*)newSchName.data(),
+ rc = SQL_EXEC_LOBddlInterface((char*)newSchName.data(),
newSchName.length(),
objUID,
j,
[3/3] incubator-trafodion git commit: Merge remote branch
'apache/master' into merge_trafodion388
Posted by sa...@apache.org.
Merge remote branch 'apache/master' into merge_trafodion388
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2a9e9f22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2a9e9f22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2a9e9f22
Branch: refs/heads/master
Commit: 2a9e9f223066967836502f892254652870445335
Parents: a7f2f27 f9b3afd
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Wed Mar 16 20:43:30 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Wed Mar 16 20:43:30 2016 +0000
----------------------------------------------------------------------
.rat-excludes | 1 +
core/dbsecurity/auth/Makefile | 2 +-
core/sqf/monitor/linux/clio.cxx | 7 +
core/sqf/monitor/linux/monitor.cxx | 6 +
core/sqf/monitor/linux/shell.cxx | 6 +
core/sqf/sql/scripts/install_local_hadoop | 1 -
core/sqf/src/seabed/src/msmon.cpp | 6 +
.../transactional/SplitBalanceHelper.java | 8 +-
core/sqf/src/tm/Makefile | 3 +
core/sqf/src/tm/tm.cpp | 33 +-
core/sqf/src/tm/tmaudit.cpp | 18 +-
core/sqf/src/tm/tmauditobj.cpp | 6 +-
core/sqf/src/tm/tmddlrequests.cpp | 12 +-
core/sqf/src/tm/tmlib.cpp | 13 +-
core/sqf/src/tm/tmpoolelement.h | 2 +-
core/sqf/src/tm/tmrecov.cpp | 3 +-
core/sqf/src/tm/tmregisterregion.cpp | 4 +-
core/sqf/src/tm/tmrmhbase.cpp | 3 -
core/sqf/src/tm/tmrmtse.cpp | 3 +-
core/sqf/src/tm/tmtime.h | 3 +-
core/sqf/src/tm/tmxarmmain.cpp | 2 +-
core/sqf/src/tm/tmxatxn.cpp | 4 +-
core/sqf/src/tm/tools/Makefile | 3 +
core/sqf/src/tm/tools/dtmci.cpp | 14 +-
core/sqf/src/tm/xarmapi.cpp | 5 +-
core/sqf/src/tm/xatmapi.cpp | 7 +-
core/sql/common/ComSmallDefs.h | 5 +
core/sql/common/ComUser.cpp | 54 +
core/sql/common/ComUser.h | 6 +
core/sql/common/NAUserId.h | 32 +-
core/sql/exp/ExpHbaseInterface.h | 1 -
core/sql/exp/exp_datetime.cpp | 1228 +++++++----------
core/sql/exp/exp_datetime.h | 186 ++-
core/sql/exp/exp_function.cpp | 28 +-
core/sql/generator/GenItemFunc.cpp | 134 +-
core/sql/optimizer/BindItemExpr.cpp | 584 ++++-----
core/sql/optimizer/BindRelExpr.cpp | 40 +-
core/sql/optimizer/ItemCache.cpp | 5 +-
core/sql/optimizer/ItemExpr.cpp | 52 +-
core/sql/optimizer/ItemFunc.h | 53 +-
core/sql/optimizer/QRDescGenerator.cpp | 19 +-
core/sql/optimizer/RelExeUtil.cpp | 5 +
core/sql/optimizer/RelExeUtil.h | 17 +-
core/sql/optimizer/RelFastTransport.cpp | 2 +-
core/sql/optimizer/RelUpdate.h | 3 +-
core/sql/optimizer/Stats.h | 8 +-
core/sql/optimizer/SynthType.cpp | 148 +--
core/sql/parser/ParKeyWords.cpp | 7 +-
core/sql/parser/sqlparser.y | 127 +-
core/sql/regress/compGeneral/DIFF006.KNOWN.SB | 4 -
.../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 2 +-
core/sql/regress/compGeneral/EXPECTED006 | 1235 ------------------
core/sql/regress/compGeneral/EXPECTED006.SB | 19 +-
core/sql/regress/compGeneral/TEST006 | 12 +-
core/sql/regress/core/EXPECTED001.SB | 42 +-
core/sql/regress/core/TEST001 | 2 +
core/sql/regress/privs2/EXPECTED135 | 2 +
core/sql/regress/seabase/EXPECTED020 | 20 +
core/sql/regress/seabase/EXPECTED030 | 550 ++++++++
core/sql/regress/seabase/TEST020 | 7 +
core/sql/regress/seabase/TEST030 | 110 ++
core/sql/regress/tools/runregr_udr.ksh | 2 +-
core/sql/regress/udr/EXPECTED102 | 421 ++++++
core/sql/regress/udr/TEST102 | 119 ++
core/sql/sqlcomp/CmpSeabaseDDL.h | 7 +
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 110 +-
core/sql/sqlcomp/CmpSeabaseDDLauth.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 45 +-
core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 171 +++
core/sql/sqlcomp/CmpSeabaseDDLroutine.h | 280 ++++
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 32 +-
core/sql/sqlcomp/PrivMgrComponentOperations.cpp | 24 +-
core/sql/sqlcomp/PrivMgrComponentOperations.h | 3 +-
core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp | 15 +-
core/sql/sqlcomp/PrivMgrComponentPrivileges.h | 3 +-
core/sql/sqlcomp/PrivMgrMD.cpp | 129 +-
core/sql/sqlcomp/PrivMgrMD.h | 3 +-
core/sql/sqlcomp/PrivMgrRoles.cpp | 65 +-
core/sql/sqlcomp/PrivMgrRoles.h | 4 +-
dcs/Makefile | 2 +
dcs/bin/dcs | 20 -
dcs/bin/dcs-config.sh | 21 -
dcs/bin/dcs-daemon.sh | 21 -
dcs/bin/dcs-daemons.sh | 20 -
dcs/pom.xml | 157 +--
dcs/src/assembly/all.xml | 11 +-
.../org/trafodion/dcs/master/DcsMaster.java | 2 -
.../dcs/master/MasterStatusServlet.java | 22 +-
.../java/org/trafodion/dcs/rest/DcsRest.java | 215 ---
.../trafodion/dcs/rest/GetStatusResponse.java | 50 -
.../org/trafodion/dcs/rest/RESTServlet.java | 172 ---
.../org/trafodion/dcs/rest/ResourceBase.java | 34 -
.../org/trafodion/dcs/rest/ResourceConfig.java | 31 -
.../org/trafodion/dcs/rest/RestConstants.java | 63 -
.../org/trafodion/dcs/rest/RootResource.java | 102 --
.../org/trafodion/dcs/rest/ServerConnector.java | 79 --
.../org/trafodion/dcs/rest/ServerResource.java | 158 ---
.../org/trafodion/dcs/rest/VersionResource.java | 122 --
.../trafodion/dcs/rest/WorkloadResource.java | 140 --
.../org/trafodion/dcs/rest/client/Client.java | 504 -------
.../org/trafodion/dcs/rest/client/Cluster.java | 102 --
.../org/trafodion/dcs/rest/client/Response.java | 129 --
.../trafodion/dcs/rest/model/ServerModel.java | 530 --------
.../trafodion/dcs/rest/model/VersionModel.java | 193 ---
.../dcs/rest/model/WorkloadListModel.java | 225 ----
.../trafodion/dcs/rest/model/WorkloadModel.java | 139 --
.../dcs/rest/provider/JAXBContextResolver.java | 84 --
.../producer/PlainTextMessageBodyProducer.java | 92 --
.../dcs-webapps/master/aggr_querystats.html | 88 --
.../dcs-webapps/master/aggr_querystats.jsp | 85 --
.../resources/dcs-webapps/master/explain.html | 62 -
.../resources/dcs-webapps/master/queryPlan.jsp | 77 --
.../dcs-webapps/master/querystats.html | 89 --
.../resources/dcs-webapps/master/querystats.jsp | 89 --
.../resources/dcs-webapps/master/repository.jsp | 114 --
.../resources/dcs-webapps/master/sessions.html | 87 --
.../resources/dcs-webapps/master/sessions.jsp | 89 --
.../src/asciidoc/_chapters/odbc_windows.adoc | 10 +-
docs/cqd_reference/pom.xml | 8 +-
.../src/asciidoc/_chapters/debugging.adoc | 95 ++
.../src/asciidoc/_chapters/histograms.adoc | 38 +-
.../src/asciidoc/_chapters/introduction.adoc | 13 +-
.../_chapters/operational_controls.adoc | 138 +-
.../src/asciidoc/_chapters/query_execution.adoc | 239 ++++
.../src/asciidoc/_chapters/query_plans.adoc | 330 ++++-
.../asciidoc/_chapters/runtime_controls.adoc | 4 +-
.../src/asciidoc/_chapters/schema_controls.adoc | 24 +-
.../asciidoc/_chapters/table_definition.adoc | 142 ++
.../src/asciidoc/_chapters/transactions.adoc | 4 +-
.../src/asciidoc/_chapters/update_stats.adoc | 31 +-
docs/cqd_reference/src/asciidoc/index.adoc | 3 +
docs/load_transform/pom.xml | 8 +-
.../src/asciidoc/_chapters/about.adoc | 8 +-
.../src/asciidoc/_chapters/bulk_load.adoc | 37 +-
.../src/asciidoc/_chapters/introduction.adoc | 14 +-
.../src/asciidoc/_chapters/tables_indexes.adoc | 18 +-
.../src/asciidoc/_chapters/trickle_load.adoc | 12 +-
.../src/asciidoc/_chapters/troubleshoot.adoc | 4 +-
.../src/asciidoc/_chapters/about.adoc | 4 +-
.../src/asciidoc/_chapters/cqds.adoc | 329 -----
.../src/asciidoc/_chapters/introduction.adoc | 11 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 6 +-
docs/sql_reference/src/asciidoc/index.adoc | 1 -
docs/src/site/markdown/documentation.md | 66 +-
docs/src/site/markdown/logo.md | 2 +-
.../resources/images/logos/pb-Trafodion.png | Bin 49089 -> 0 bytes
.../resources/images/logos/pb-trafodion.png | Bin 0 -> 49089 bytes
docs/src/site/site.xml | 1 +
install/installer/checkHBase | 37 +
install/installer/parseHBaseSite.py | 25 +-
install/installer/traf_add_sudoAccess | 3 +-
install/installer/traf_cloudera_mods98 | 40 +-
install/installer/traf_config_check | 48 +-
install/installer/traf_config_setup | 3 +-
install/installer/traf_getHadoopNodes | 21 +-
install/installer/traf_hortonworks_mods98 | 68 +-
install/installer/traf_package_setup | 2 +-
install/installer/trafodion_install | 88 +-
licenses/lic-dcs-bin | 651 ++++++++-
licenses/not-dcs-bin | 20 +
pom.xml | 2 +
162 files changed, 5312 insertions(+), 7877 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2a9e9f22/core/sql/common/ComSmallDefs.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2a9e9f22/core/sql/sqlcomp/CmpSeabaseDDL.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2a9e9f22/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2a9e9f22/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: Merge remote branch
'origin/pr/388/head' into merge_trafodion388
Posted by sa...@apache.org.
Merge remote branch 'origin/pr/388/head' into merge_trafodion388
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a7f2f277
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a7f2f277
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a7f2f277
Branch: refs/heads/master
Commit: a7f2f277d467baa3ac08ee1fb5d9cf93c9dee50f
Parents: 5a6549b cf5390e
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Wed Mar 16 20:41:12 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Wed Mar 16 20:41:12 2016 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 2 +-
core/sql/common/ComSmallDefs.h | 4 +-
core/sql/exp/ExpLOB.cpp | 16 ++---
core/sql/sqlcomp/CmpSeabaseDDL.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 11 ++++
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 84 ++++++++++++++++++++-------
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 9 +--
7 files changed, 92 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7f2f277/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7f2f277/core/sql/exp/ExpLOB.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a7f2f277/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index ce3349b,a4b74e3..8d20873
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@@ -2224,12 -2224,9 +2224,13 @@@ short CmpSeabaseDDL::createSeabaseTable
}
Int64 lobMaxSize = CmpCommon::getDefaultNumeric(LOB_MAX_SIZE)*1024*1024;
+
+ const char *lobHdfsServer = CmpCommon::getDefaultString(LOB_HDFS_SERVER);
+ Int32 lobHdfsPort = (Lng32)CmpCommon::getDefaultNumeric(LOB_HDFS_PORT);
+
if (j > 0)
{
+ Int32 rc = sendAllControls(FALSE, FALSE, TRUE);
//if the table is a volatile table return an error
if (createTableNode->isVolatile())
{