You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2016/03/18 16:24:27 UTC
[1/8] incubator-trafodion git commit: commit #1
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 3687c5c70 -> 741e52a28
commit #1
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a3af80d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a3af80d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a3af80d5
Branch: refs/heads/master
Commit: a3af80d590d3e31e268c38e728aa7a31a482aaf3
Parents: 6b9dea5
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Sun Mar 13 22:13:35 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Sun Mar 13 22:13:35 2016 +0000
----------------------------------------------------------------------
core/sql/bin/SqlciErrors.txt | 1 +
core/sql/common/ComMisc.cpp | 14 ++++++++++
core/sql/common/ComMisc.h | 8 ++++++
core/sql/common/ComSmallDefs.h | 5 ++++
core/sql/optimizer/BindItemExpr.cpp | 1 +
core/sql/regress/seabase/TEST020 | 7 ++---
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 38 ++++++++++++++++------------
core/sql/sqlcomp/DefaultConstants.h | 8 +++++-
core/sql/sqlcomp/nadefaults.cpp | 28 ++++++++++----------
9 files changed, 77 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3af80d5/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index 084a4fd..99b7c1c 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -261,6 +261,7 @@
1266 ZZZZZ 99999 BEGINNER MINOR DBADMIN Only EXECUTE privilege is supported for a procedure or routine.
1267 ZZZZZ 99999 BEGINNER MINOR DBADMIN $0~string0 privilege is incompatible with this object type.
1268 ZZZZZ 99999 BEGINNER MINOR DBADMIN Duplicate columns are not allowed in a GRANT or REVOKE statement.
+1269 ZZZZZ 99999 BEGINNER MINOR DBADMIN Column name $0~String0 is reserved for internal system usage. It cannot be specified as a user column.
1270 ZZZZZ 99999 BEGINNER MAJOR DBADMIN ALLOCATE or DEALLOCATE failed for object $0~TableName due to file error $1~Int0 on $2~String0.
1271 ZZZZZ 99999 BEGINNER MAJOR DBADMIN ALLOCATE failed for object $0~TableName because the number of extents to be allocated ($1~Int0) is greater than the MAXEXTENTS for a partition of the object.
1272 ZZZZZ 99999 BEGINNER CRTCL DIALOUT The system is not licensed for use of SQL format tables.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3af80d5/core/sql/common/ComMisc.cpp
----------------------------------------------------------------------
diff --git a/core/sql/common/ComMisc.cpp b/core/sql/common/ComMisc.cpp
index b9b94a5..c466e56 100644
--- a/core/sql/common/ComMisc.cpp
+++ b/core/sql/common/ComMisc.cpp
@@ -228,4 +228,18 @@ NAString ComConvertTrafNameToNativeName(
return convertedName;
}
+NABoolean ComTrafReservedColName(
+ const NAString &colName)
+{
+
+ if ((colName == TRAF_SALT_COLNAME) ||
+ (colName == TRAF_SYSKEY_COLNAME))
+ return TRUE;
+
+ if ((memcmp(colName.data(), TRAF_DIVISION_COLNAME_PREFIX, strlen(TRAF_DIVISION_COLNAME_PREFIX)) == 0) &&
+ (colName.data()[colName.length()-1] == '_'))
+ return TRUE;
+
+ return FALSE;
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3af80d5/core/sql/common/ComMisc.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComMisc.h b/core/sql/common/ComMisc.h
index 65aca95..8049209 100644
--- a/core/sql/common/ComMisc.h
+++ b/core/sql/common/ComMisc.h
@@ -65,4 +65,12 @@ NAString ComConvertTrafNameToNativeName(
const NAString &schemaName,
const NAString &objectName);
+// returns TRUE if specified name is a reserved name.
+// Currently, reserved names for traf internal usage are:
+// SYSKEY
+// _SALT_
+// _DIVISION_*_ :_DIVISION_ prefix followed by division number and ending
+// with underscore(_)
+NABoolean ComTrafReservedColName(const NAString &colName);
+
#endif // COMMISC_H
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3af80d5/core/sql/common/ComSmallDefs.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSmallDefs.h b/core/sql/common/ComSmallDefs.h
index e14f2bc..fc561ba 100644
--- a/core/sql/common/ComSmallDefs.h
+++ b/core/sql/common/ComSmallDefs.h
@@ -174,6 +174,11 @@ typedef NABoolean ComBoolean;
#define SEABASE_LIBMGR_SCHEMA "_LIBMGR_"
#define SEABASE_LIBMGR_LIBRARY "DB__LIBMGRNAME"
+// reserved column names for traf internal system usage
+#define TRAF_SALT_COLNAME "_SALT_"
+#define TRAF_DIVISION_COLNAME_PREFIX "_DIVISION_"
+#define TRAF_SYSKEY_COLNAME "SYSKEY"
+
// length of explain_plan column in metric_query_table.
// explain_plan greater than this length are chunked and store in multiple
// rows in metric_text_table
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3af80d5/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
diff --git a/core/sql/optimizer/BindItemExpr.cpp b/core/sql/optimizer/BindItemExpr.cpp
index ba7595f..3856240 100644
--- a/core/sql/optimizer/BindItemExpr.cpp
+++ b/core/sql/optimizer/BindItemExpr.cpp
@@ -4100,6 +4100,7 @@ NABoolean DateFormat::errorChecks(Lng32 frmt, BindWA *bindWA,
bindWA->setErrStatus();
}
break;
+
} // switch
return TRUE;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3af80d5/core/sql/regress/seabase/TEST020
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST020 b/core/sql/regress/seabase/TEST020
index 64afa3c..a8b3003 100755
--- a/core/sql/regress/seabase/TEST020
+++ b/core/sql/regress/seabase/TEST020
@@ -136,11 +136,10 @@ create table test020t31 (g0 smallint default 32768 not null primary key);
-- Test columns named SYSKEY
--
--- Expecting error 1080 message: Duplicate references to column SYSKEY
--- in the create request
--- when the following Create Table command is executed.
+-- Expecting error 1269 message: Col name SYSKEY is reserved.
create table test020t5(syskey int);
+cqd traf_allow_reserved_colnames 'ON';
create table test020t5(c int not null not droppable primary key not droppable,
syskey char(4));
invoke test020t5;
@@ -151,6 +150,8 @@ alter table test020t5 add constraint test020t5c1 check (syskey >= 'aaaa');
showddl test020t5;
-- Expecting an error message when the following insert statement is executed.
insert into test020t5 values (3, '1234');
+cqd traf_allow_reserved_colnames reset;
+
--------------------------------------------
-- test cases for solution 10-040607-6721 --
--------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3af80d5/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index ce3349b..6be8cad 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -1530,11 +1530,18 @@ short CmpSeabaseDDL::createSeabaseTable2(
objectOwnerID = schemaOwnerID;
// check if SYSKEY is specified as a column name.
- NABoolean explicitSyskeySpecified = FALSE;
for (Lng32 i = 0; i < colArray.entries(); i++)
{
- if (colArray[i]->getColumnName() == "SYSKEY")
- explicitSyskeySpecified = TRUE;
+ if ((CmpCommon::getDefault(TRAF_ALLOW_RESERVED_COLNAMES) == DF_OFF) &&
+ (ComTrafReservedColName(colArray[i]->getColumnName())))
+ {
+ *CmpCommon::diags() << DgSqlCode(-1269)
+ << DgString0(colArray[i]->getColumnName());
+
+ deallocEHI(ehi);
+ processReturn();
+ return -1;
+ }
}
NABoolean implicitPK = FALSE;
@@ -1562,18 +1569,6 @@ short CmpSeabaseDDL::createSeabaseTable2(
numSysCols++;
}
- if ((implicitPK) && (explicitSyskeySpecified))
- {
- *CmpCommon::diags() << DgSqlCode(-1080)
- << DgColumnName("SYSKEY");
-
- deallocEHI(ehi);
-
- processReturn();
-
- return -1;
- }
-
int numSaltPartns = 0; // # of "_SALT_" values
int numSplits = 0; // # of initial region splits
@@ -1582,7 +1577,7 @@ short CmpSeabaseDDL::createSeabaseTable2(
if ((createTableNode->getSaltOptions()) ||
((numSaltPartnsFromCQD > 0) &&
- (NOT (implicitPK || explicitSyskeySpecified))))
+ (NOT implicitPK)))
{
// add a system column SALT INTEGER NOT NULL with a computed
// default value HASH2PARTFUNC(<salting cols> FOR <num salt partitions>)
@@ -4463,6 +4458,17 @@ void CmpSeabaseDDL::alterSeabaseTableAddColumn(
return;
}
+ if ((CmpCommon::getDefault(TRAF_ALLOW_RESERVED_COLNAMES) == DF_OFF) &&
+ (ComTrafReservedColName(colName)))
+ {
+ *CmpCommon::diags() << DgSqlCode(-1269)
+ << DgString0(colName);
+
+ deallocEHI(ehi);
+ processReturn();
+ return;
+ }
+
if (colFamily.isNull())
{
colFamily = naTable->defaultColFam();
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3af80d5/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/DefaultConstants.h b/core/sql/sqlcomp/DefaultConstants.h
index f78bfae..7e20226 100644
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@ -3801,7 +3801,13 @@ enum DefaultConstants
// If this cqd is on, then other alters (name, datatype) are also supported.
TRAF_ALTER_COL_ATTRS,
- // if ON, upsert into the table will use the default value for the omitted columns
+ // if set, let users create system reserved names. Default is OFF.
+ // This cqd should only be used to debug or if system column names are
+ // REALLY needed by users.
+ // Currently syskey, _salt_, _division_.
+ TRAF_ALLOW_RESERVED_COLNAMES,
+
+ // if ON, upsert into the table will use the default value for the omitted columns
// with default value
TRAF_UPSERT_WITH_INSERT_DEFAULT_SEMANTICS,
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a3af80d5/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp
index 711b964..5d3d08b 100644
--- a/core/sql/sqlcomp/nadefaults.cpp
+++ b/core/sql/sqlcomp/nadefaults.cpp
@@ -3299,28 +3299,30 @@ XDDkwd__(SUBQUERY_UNNESTING, "ON"),
DDint__(TEST_PASS_ONE_ASSERT_TASK_NUMBER, "-1"),
DDint__(TEST_PASS_TWO_ASSERT_TASK_NUMBER, "-1"),
- XDDintN2(TIMEOUT, "6000"),
+ XDDintN2(TIMEOUT, "6000"),
- DDflt0_(TMUDF_CARDINALITY_FACTOR, "1"),
- DDflt0_(TMUDF_LEAF_CARDINALITY, "1"),
+ DDflt0_(TMUDF_CARDINALITY_FACTOR, "1"),
+ DDflt0_(TMUDF_LEAF_CARDINALITY, "1"),
DDkwd__(TOTAL_RESOURCE_COSTING, "ON"),
-
+
DDint__(TRAF_ALIGNED_FORMAT_ADD_COL_METHOD, "2"),
-
- DDkwd__(TRAF_ALIGNED_ROW_FORMAT, "OFF"),
-
+
+ DDkwd__(TRAF_ALIGNED_ROW_FORMAT, "OFF"),
+
DDkwd__(TRAF_ALLOW_ESP_COLOCATION, "OFF"),
+
+ DDkwd__(TRAF_ALLOW_RESERVED_COLNAMES, "OFF"),
+
+ DDkwd__(TRAF_ALLOW_SELF_REF_CONSTR, "ON"),
- DDkwd__(TRAF_ALLOW_SELF_REF_CONSTR, "ON"),
-
- DDkwd__(TRAF_ALTER_COL_ATTRS, "ON"),
+ DDkwd__(TRAF_ALTER_COL_ATTRS, "ON"),
- DDkwd__(TRAF_BLOB_AS_VARCHAR, "ON"), //set to OFF to enable Lobs support
+ DDkwd__(TRAF_BLOB_AS_VARCHAR, "ON"), //set to OFF to enable Lobs support
- DDkwd__(TRAF_BOOTSTRAP_MD_MODE, "OFF"),
+ DDkwd__(TRAF_BOOTSTRAP_MD_MODE, "OFF"),
- DDkwd__(TRAF_CLOB_AS_VARCHAR, "ON"), //set to OFF to enable Lobs support
+ DDkwd__(TRAF_CLOB_AS_VARCHAR, "ON"), //set to OFF to enable Lobs support
DDkwd__(TRAF_COL_LENGTH_IS_CHAR, "ON"),
[6/8] incubator-trafodion git commit: JIRA 1852: disallow reserved
names as user columns
Posted by an...@apache.org.
JIRA 1852: disallow reserved names as user columns
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5cdf688f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5cdf688f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5cdf688f
Branch: refs/heads/master
Commit: 5cdf688ff81d3813f233af90fbc376f6d65deca2
Parents: 950a303
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Thu Mar 17 15:16:15 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Thu Mar 17 15:16:15 2016 +0000
----------------------------------------------------------------------
.../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 2 +-
core/sql/regress/compGeneral/EXPECTED006.SB | 5 +-
core/sql/regress/seabase/EXPECTED020 | 1 +
core/sql/regress/seabase/EXPECTED027 | 66 +++++++++++++++++++-
core/sql/regress/seabase/TEST027 | 19 ++++++
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 7 +--
6 files changed, 92 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5cdf688f/core/sql/regress/compGeneral/DIFF006.KNOWN.SB.OS
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/DIFF006.KNOWN.SB.OS b/core/sql/regress/compGeneral/DIFF006.KNOWN.SB.OS
index 6172793..871164d 100644
--- a/core/sql/regress/compGeneral/DIFF006.KNOWN.SB.OS
+++ b/core/sql/regress/compGeneral/DIFF006.KNOWN.SB.OS
@@ -6,7 +6,7 @@
> *** ERROR[8822] The statement was not prepared.
65d66
< --- SQL operation failed with errors.
-689c690
+692c693
< *** ERROR[4312] HP_SYSTEM_CATALOG.MXCS_SCHEMA.ASSOC2DS is an MXCS metadata table and cannot be directly updated.
---
> *** ERROR[1002] Catalog HP_SYSTEM_CATALOG does not exist or has not been registered on node .
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5cdf688f/core/sql/regress/compGeneral/EXPECTED006.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED006.SB b/core/sql/regress/compGeneral/EXPECTED006.SB
index cbb07f6..c72e759 100644
--- a/core/sql/regress/compGeneral/EXPECTED006.SB
+++ b/core/sql/regress/compGeneral/EXPECTED006.SB
@@ -280,7 +280,10 @@
--- SQL operation complete.
>>prepare xx from select * from t006t1 where to_date(A, '99:99:99:99') = A;
---- SQL command prepared.
+*** ERROR[4045] The operand of function TO_DATE must be numeric.
+
+*** ERROR[8822] The statement was not prepared.
+
>>control query default MODE_SPECIAL_4 reset;
--- SQL operation complete.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5cdf688f/core/sql/regress/seabase/EXPECTED020
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED020 b/core/sql/regress/seabase/EXPECTED020
index 93d6589..08bfb7c 100644
--- a/core/sql/regress/seabase/EXPECTED020
+++ b/core/sql/regress/seabase/EXPECTED020
@@ -219,6 +219,7 @@ ALTER TABLE TRAFODION.SCH.TEST020T5 ADD CONSTRAINT TRAFODION.SCH.TEST020T5C1
*** ERROR[8101] The operation is prevented by check constraint TRAFODION.SCH.TEST020T5C1 on table TRAFODION.SCH.TEST020T5.
--- 0 row(s) inserted.
+>>
>>cqd traf_allow_reserved_colnames reset;
--- SQL operation complete.
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5cdf688f/core/sql/regress/seabase/EXPECTED027
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED027 b/core/sql/regress/seabase/EXPECTED027
index ac04eff..2465664 100644
--- a/core/sql/regress/seabase/EXPECTED027
+++ b/core/sql/regress/seabase/EXPECTED027
@@ -1378,7 +1378,7 @@ CREATE VIEW TRAFODION.SCH027.T027V2 (ZZ) AS
--- SQL operation failed with errors.
>>alter table t027t7 alter column cc rename to "_SALT_";
-*** ERROR[1404] Column CC cannot be altered. Reason: Renamed column _SALT_ already exist in the table.
+*** ERROR[1404] Column CC cannot be altered. Reason: Renamed column _SALT_ is reserved for internal system usage.
--- SQL operation failed with errors.
>>alter table t027t7 alter column zz rename to zzz;
@@ -1481,6 +1481,70 @@ SCH027.T027V122
--- SQL operation failed with errors.
>>
+>>-- reserved words cannot be used as colnames in create/add/alter stmts
+>>drop table if exists t027t7 cascade;
+
+--- SQL operation complete.
+>>create table t027t7 (syskey int);
+
+*** ERROR[1269] Column name SYSKEY is reserved for internal system usage. It cannot be specified as a user column.
+
+--- SQL operation failed with errors.
+>>create table t027t7 ("_SALT_" int);
+
+*** ERROR[1269] Column name _SALT_ is reserved for internal system usage. It cannot be specified as a user column.
+
+--- SQL operation failed with errors.
+>>create table t027t7 ("_DIVISION_2_" int);
+
+*** ERROR[1269] Column name _DIVISION_2_ is reserved for internal system usage. It cannot be specified as a user column.
+
+--- SQL operation failed with errors.
+>>create table t027t7 (a int not null primary key);
+
+--- SQL operation complete.
+>>alter table t027t7 add column "_SALT_" int;
+
+*** ERROR[1269] Column name _SALT_ is reserved for internal system usage. It cannot be specified as a user column.
+
+--- SQL operation failed with errors.
+>>alter table t027t7 alter column a rename to SYSKEY;
+
+*** ERROR[1404] Column A cannot be altered. Reason: Renamed column SYSKEY is reserved for internal system usage.
+
+--- SQL operation failed with errors.
+>>
+>>-- if cqd is specified, then reserved cols can be used.
+>>-- Use this cqd carefully.
+>>cqd traf_allow_reserved_colnames 'ON';
+
+--- SQL operation complete.
+>>drop table if exists t027t7 cascade;
+
+--- SQL operation complete.
+>>create table t027t7 (syskey int not null primary key, b int);
+
+--- SQL operation complete.
+>>alter table t027t7 add column "_DIVISION_1" int;
+
+--- SQL operation complete.
+>>alter table t027t7 alter column b rename to "_SALT_";
+
+--- SQL operation complete.
+>>invoke t027t7;
+
+-- Definition of Trafodion table TRAFODION.SCH027.T027T7
+-- Definition current Thu Mar 17 14:48:27 2016
+
+ (
+ SYSKEY INT NO DEFAULT NOT NULL NOT DROPPABLE
+ , "_SALT_" INT DEFAULT NULL /*altered_col*/
+ , "_DIVISION_1" INT DEFAULT NULL /*added_col*/
+ )
+ PRIMARY KEY (SYSKEY ASC)
+
+--- SQL operation complete.
+>>
>>-- cleanup
>>?section clean_up
>>drop table if exists t027t7 cascade;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5cdf688f/core/sql/regress/seabase/TEST027
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/TEST027 b/core/sql/regress/seabase/TEST027
index 8ef95f0..b3d2710 100644
--- a/core/sql/regress/seabase/TEST027
+++ b/core/sql/regress/seabase/TEST027
@@ -21,6 +21,7 @@
--
-- tests for support of multiple column families
-- tests for alter table alter column
+-- tests for reserved words usage in create/add/alter stmts
create schema trafodion.sch027;
set schema trafodion.sch027;
@@ -289,6 +290,24 @@ begin work;
alter table t027t7 alter column b largeint;
rollback work;
+-- reserved words cannot be used as colnames in create/add/alter stmts
+drop table if exists t027t7 cascade;
+create table t027t7 (syskey int);
+create table t027t7 ("_SALT_" int);
+create table t027t7 ("_DIVISION_2_" int);
+create table t027t7 (a int not null primary key);
+alter table t027t7 add column "_SALT_" int;
+alter table t027t7 alter column a rename to SYSKEY;
+
+-- if cqd is specified, then reserved cols can be used.
+-- Use this cqd carefully.
+cqd traf_allow_reserved_colnames 'ON';
+drop table if exists t027t7 cascade;
+create table t027t7 (syskey int not null primary key, b int);
+alter table t027t7 add column "_DIVISION_1" int;
+alter table t027t7 alter column b rename to "_SALT_";
+invoke t027t7;
+
-- cleanup
?section clean_up
drop table if exists t027t7 cascade;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5cdf688f/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index a2c3ca7..20f020b 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -3901,7 +3901,7 @@ void CmpSeabaseDDL::renameSeabaseTable(
{
*CmpCommon::diags()
<< DgSqlCode(-1427)
- << DgString0("Reason: Operation not allowed if check constraints are presenr. Drop the constraints and recreate them after rename.");
+ << DgString0("Reason: Operation not allowed if check constraints are present. Drop the constraints and recreate them after rename.");
processReturn();
@@ -6640,12 +6640,10 @@ void CmpSeabaseDDL::alterSeabaseTableAlterColumnRename(
return;
}
- /* Temporarily commenting out this code. It will be enabled after
- support for reserved colnames check is delivered.
if ((CmpCommon::getDefault(TRAF_ALLOW_RESERVED_COLNAMES) == DF_OFF) &&
(ComTrafReservedColName(renamedColName)))
{
- NAString reason = "Renamed column is a reserved name.";
+ NAString reason = "Renamed column " + renamedColName + " is reserved for internal system usage.";
*CmpCommon::diags() << DgSqlCode(-1404)
<< DgColumnName(colName)
<< DgString0(reason);
@@ -6654,7 +6652,6 @@ void CmpSeabaseDDL::alterSeabaseTableAlterColumnRename(
return;
}
- */
if (nacol->isComputedColumn() || nacol->isSystemColumn())
{
[3/8] incubator-trafodion git commit: Merge remote branch
'origin/master' into resrvdcols_br
Posted by an...@apache.org.
Merge remote branch 'origin/master' into resrvdcols_br
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/57a7566f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/57a7566f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/57a7566f
Branch: refs/heads/master
Commit: 57a7566fab823bc45a01121cfa953bff18504378
Parents: db44c1d 2a9e9f2
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Wed Mar 16 22:55:51 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Wed Mar 16 22:55:51 2016 +0000
----------------------------------------------------------------------
.rat-excludes | 1 +
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/cli/Cli.cpp | 2 +-
core/sql/common/ComSmallDefs.h | 4 +-
core/sql/exp/ExpLOB.cpp | 16 +-
core/sql/exp/exp_function.cpp | 6 +-
core/sql/optimizer/BindRelExpr.cpp | 40 +-
core/sql/optimizer/RelUpdate.h | 3 +-
core/sql/optimizer/Stats.h | 8 +-
core/sql/regress/seabase/EXPECTED020 | 20 +
core/sql/regress/seabase/TEST020 | 7 +
core/sql/sqlcomp/CmpSeabaseDDL.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 86 +--
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 11 +
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 6 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 84 ++-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 9 +-
dcs/Makefile | 2 +
dcs/pom.xml | 6 +-
.../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 +
86 files changed, 2210 insertions(+), 883 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/57a7566f/core/sql/common/ComSmallDefs.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/57a7566f/core/sql/regress/seabase/TEST020
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/57a7566f/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
[8/8] incubator-trafodion git commit: Merge [TRAFODION-1852] PR-390
Disallow reserved names in create/alter/add stmts
Posted by an...@apache.org.
Merge [TRAFODION-1852] PR-390 Disallow reserved names in create/alter/add stmts
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/741e52a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/741e52a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/741e52a2
Branch: refs/heads/master
Commit: 741e52a28769a26cc2d6583e7b72f663ac5f49fc
Parents: 3687c5c 14b17dd
Author: Anoop Sharma <an...@edev06.esgyn.local>
Authored: Fri Mar 18 15:23:58 2016 +0000
Committer: Anoop Sharma <an...@edev06.esgyn.local>
Committed: Fri Mar 18 15:23:58 2016 +0000
----------------------------------------------------------------------
core/sql/bin/SqlciErrors.txt | 1 +
core/sql/common/ComMisc.cpp | 14 +++++
core/sql/common/ComMisc.h | 8 +++
core/sql/common/ComSmallDefs.h | 5 ++
core/sql/optimizer/BindItemExpr.cpp | 2 +-
.../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 2 +-
core/sql/regress/compGeneral/EXPECTED006.SB | 5 +-
core/sql/regress/seabase/EXPECTED020 | 15 +++--
core/sql/regress/seabase/EXPECTED027 | 66 +++++++++++++++++++-
core/sql/regress/seabase/TEST020 | 7 ++-
core/sql/regress/seabase/TEST027 | 19 ++++++
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 43 +++++++------
core/sql/sqlcomp/DefaultConstants.h | 8 ++-
core/sql/sqlcomp/nadefaults.cpp | 4 +-
14 files changed, 165 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
[7/8] incubator-trafodion git commit: JIRA 1852: disallow reserved
names as user columns
Posted by an...@apache.org.
JIRA 1852: disallow reserved names as user columns
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/14b17ddd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/14b17ddd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/14b17ddd
Branch: refs/heads/master
Commit: 14b17ddd9c591eb75bf9a9a0dc5c085f3c7dee04
Parents: 5cdf688
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Thu Mar 17 15:56:54 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Thu Mar 17 15:56:54 2016 +0000
----------------------------------------------------------------------
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 12 ------------
1 file changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/14b17ddd/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 20f020b..4ce1313 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -3896,18 +3896,6 @@ void CmpSeabaseDDL::renameSeabaseTable(
return;
}
- const CheckConstraintList &checkList = naTable->getCheckConstraints();
- if (checkList.entries() > 0)
- {
- *CmpCommon::diags()
- << DgSqlCode(-1427)
- << DgString0("Reason: Operation not allowed if check constraints are present. Drop the constraints and recreate them after rename.");
-
- processReturn();
-
- return;
- }
-
Int64 objUID = getObjectUID(&cliInterface,
catalogNamePart.data(), schemaNamePart.data(),
objectNamePart.data(),
[5/8] incubator-trafodion git commit: Merge remote branch
'origin/master' into resrvdcols_br
Posted by an...@apache.org.
Merge remote branch 'origin/master' into resrvdcols_br
Conflicts:
core/sql/common/ComMisc.cpp
core/sql/optimizer/BindItemExpr.cpp
core/sql/regress/seabase/EXPECTED020
core/sql/regress/seabase/TEST020
core/sql/sqlcomp/nadefaults.cpp
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/950a303f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/950a303f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/950a303f
Branch: refs/heads/master
Commit: 950a303f36591af03814a892694289edeb968f8e
Parents: a33ee6b 616961d
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Thu Mar 17 01:46:23 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Thu Mar 17 01:46:23 2016 +0000
----------------------------------------------------------------------
core/sql/bin/SqlciErrors.txt | 2 +-
core/sql/cli/Cli.cpp | 3 +-
core/sql/comexe/ComQueue.h | 2 +-
core/sql/comexe/ComTdb.h | 1 +
core/sql/common/ComMisc.cpp | 1 -
core/sql/common/NAString.cpp | 23 +
core/sql/common/NAString.h | 3 +
core/sql/common/OperTypeEnum.h | 1 +
core/sql/generator/Generator.cpp | 10 +-
core/sql/optimizer/BindItemExpr.cpp | 15 +-
core/sql/optimizer/NAFileSet.cpp | 2 +
core/sql/optimizer/NAFileSet.h | 7 +
core/sql/optimizer/NATable.cpp | 24 +-
core/sql/optimizer/NATable.h | 3 +-
core/sql/optimizer/RelExeUtil.cpp | 7 +-
core/sql/parser/ElemDDLNode.cpp | 6 +
core/sql/parser/ElemDDLNode.h | 3 +
.../sql/parser/StmtDDLAlterTableAlterColumn.cpp | 39 +-
core/sql/parser/StmtDDLAlterTableAlterColumn.h | 40 +-
core/sql/parser/sqlparser.y | 19 +-
core/sql/regress/charsets/DIFF012.KNOWN.SB | 2 +-
core/sql/regress/charsets/EXPECTED002 | 9 +-
core/sql/regress/charsets/EXPECTED003 | 11 +-
core/sql/regress/charsets/EXPECTED012 | 19 +-
core/sql/regress/core/EXPECTED001.SB | 6 +-
core/sql/regress/core/EXPECTED037.SB | 14 +-
core/sql/regress/core/EXPECTED061.SB | 13 +-
core/sql/regress/core/EXPECTED116 | 149 +-
core/sql/regress/core/TEST116 | 11 +-
core/sql/regress/executor/EXPECTED001 | 80 +-
core/sql/regress/executor/EXPECTED013.SB | 59 +-
core/sql/regress/executor/EXPECTED014.SB | 73 +-
core/sql/regress/executor/EXPECTED016.SB | 10 +-
core/sql/regress/executor/EXPECTED122 | 20 +-
core/sql/regress/hive/EXPECTED009 | 7 +
core/sql/regress/hive/EXPECTED017 | 3 +
core/sql/regress/privs1/EXPECTED132 | 96 +-
core/sql/regress/seabase/EXPECTED010 | 394 +++---
core/sql/regress/seabase/EXPECTED011 | 16 +-
core/sql/regress/seabase/EXPECTED012 | 5 +-
core/sql/regress/seabase/EXPECTED020 | 12 +-
core/sql/regress/seabase/EXPECTED022 | 12 +-
core/sql/regress/seabase/EXPECTED025 | 7 +-
core/sql/regress/seabase/EXPECTED027 | 435 +++++-
core/sql/regress/seabase/TEST020 | 1 +
core/sql/regress/seabase/TEST027 | 66 +-
core/sql/sqlcat/desc.h | 1 +
core/sql/sqlcomp/CmpDescribe.cpp | 30 +-
core/sql/sqlcomp/CmpDescribe.h | 2 -
core/sql/sqlcomp/CmpSeabaseDDL.h | 70 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 72 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 1297 ++++++++++++++----
52 files changed, 2425 insertions(+), 788 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/950a303f/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/950a303f/core/sql/common/ComMisc.cpp
----------------------------------------------------------------------
diff --cc core/sql/common/ComMisc.cpp
index c466e56,5c41b94..76313a2
--- a/core/sql/common/ComMisc.cpp
+++ b/core/sql/common/ComMisc.cpp
@@@ -228,18 -228,3 +228,17 @@@ NAString ComConvertTrafNameToNativeName
return convertedName;
}
+NABoolean ComTrafReservedColName(
+ const NAString &colName)
+{
+
+ if ((colName == TRAF_SALT_COLNAME) ||
+ (colName == TRAF_SYSKEY_COLNAME))
+ return TRUE;
+
+ if ((memcmp(colName.data(), TRAF_DIVISION_COLNAME_PREFIX, strlen(TRAF_DIVISION_COLNAME_PREFIX)) == 0) &&
+ (colName.data()[colName.length()-1] == '_'))
+ return TRUE;
+
+ return FALSE;
+}
-
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/950a303f/core/sql/optimizer/BindItemExpr.cpp
----------------------------------------------------------------------
diff --cc core/sql/optimizer/BindItemExpr.cpp
index 3856240,173e373..72fa71f
--- a/core/sql/optimizer/BindItemExpr.cpp
+++ b/core/sql/optimizer/BindItemExpr.cpp
@@@ -4100,9 -4106,16 +4106,16 @@@ NABoolean DateFormat::errorChecks(Lng3
bindWA->setErrStatus();
}
break;
-
+
+ case 7:
+ {
+ *CmpCommon::diags() << DgSqlCode(-4045) << DgString0("TO_DATE");
+ bindWA->setErrStatus();
+ }
+ break;
+
} // switch
-
+
return TRUE;
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/950a303f/core/sql/regress/seabase/EXPECTED020
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/950a303f/core/sql/regress/seabase/TEST020
----------------------------------------------------------------------
diff --cc core/sql/regress/seabase/TEST020
index d2728f8,bedab65..a7ab1f4
--- a/core/sql/regress/seabase/TEST020
+++ b/core/sql/regress/seabase/TEST020
@@@ -151,8 -152,7 +151,9 @@@ alter table test020t5 add constraint te
showddl test020t5;
-- Expecting an error message when the following insert statement is executed.
insert into test020t5 values (3, '1234');
+
+cqd traf_allow_reserved_colnames reset;
+
--------------------------------------------
-- test cases for solution 10-040607-6721 --
--------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/950a303f/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
[4/8] incubator-trafodion git commit: commit #2
Posted by an...@apache.org.
commit #2
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a33ee6b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a33ee6b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a33ee6b9
Branch: refs/heads/master
Commit: a33ee6b9a6aa3186508ca528ffe744e4d4ea8f18
Parents: 57a7566
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Wed Mar 16 23:07:20 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Wed Mar 16 23:07:20 2016 +0000
----------------------------------------------------------------------
core/sql/regress/seabase/EXPECTED020 | 25 +++++++++++++++----------
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 12 ++++++++++++
2 files changed, 27 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a33ee6b9/core/sql/regress/seabase/EXPECTED020
----------------------------------------------------------------------
diff --git a/core/sql/regress/seabase/EXPECTED020 b/core/sql/regress/seabase/EXPECTED020
index f2f807f..891f7a3 100644
--- a/core/sql/regress/seabase/EXPECTED020
+++ b/core/sql/regress/seabase/EXPECTED020
@@ -6,7 +6,7 @@
>>invoke test020t1;
-- Definition of Trafodion table TRAFODION.SCH.TEST020T1
--- Definition current Fri Jun 5 10:06:01 2015
+-- Definition current Sun Mar 13 06:02:17 2016
(
C1 INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -48,7 +48,7 @@ C1 C2
>>invoke test020t2;
-- Definition of Trafodion table TRAFODION.SCH.TEST020T2
--- Definition current Fri Jun 5 10:06:03 2015
+-- Definition current Sun Mar 13 06:02:19 2016
(
C CHAR(15) CHARACTER SET ISO88591 COLLATE
@@ -142,15 +142,16 @@ G0
>>-- Test columns named SYSKEY
>>--
>>
->>-- Expecting error 1080 message: Duplicate references to column SYSKEY
->>-- in the create request
->>-- when the following Create Table command is executed.
+>>-- Expecting error 1269 message: Col name SYSKEY is reserved.
>>create table test020t5(syskey int);
-*** ERROR[1080] The DDL request has duplicate references to column SYSKEY.
+*** ERROR[1269] Column name SYSKEY is reserved for internal system usage. It cannot be specified as a user column.
--- SQL operation failed with errors.
>>
+>>cqd traf_allow_reserved_colnames 'ON';
+
+--- SQL operation complete.
>>create table test020t5(c int not null not droppable primary key not droppable,
+> syskey char(4));
@@ -158,7 +159,7 @@ G0
>>invoke test020t5;
-- Definition of Trafodion table TRAFODION.SCH.TEST020T5
--- Definition current Fri Jun 5 10:06:10 2015
+-- Definition current Sun Mar 13 06:02:32 2016
(
C INT NO DEFAULT NOT NULL NOT DROPPABLE
@@ -215,6 +216,10 @@ ALTER TABLE TRAFODION.SCH.TEST020T5 ADD CONSTRAINT TRAFODION.SCH.TEST020T5C1
*** ERROR[8101] The operation is prevented by check constraint TRAFODION.SCH.TEST020T5C1 on table TRAFODION.SCH.TEST020T5.
--- 0 row(s) inserted.
+>>cqd traf_allow_reserved_colnames reset;
+
+--- SQL operation complete.
+>>
>>--------------------------------------------
>>-- test cases for solution 10-040607-6721 --
>>--------------------------------------------
@@ -251,7 +256,7 @@ ALTER TABLE TRAFODION.SCH.TEST020T5 ADD CONSTRAINT TRAFODION.SCH.TEST020T5C1
>>invoke test020t6;
-- Definition of Trafodion table TRAFODION.SCH.TEST020T6
--- Definition current Fri Jun 5 10:06:54 2015
+-- Definition current Sun Mar 13 06:03:34 2016
(
C INT DEFAULT NULL
@@ -415,10 +420,10 @@ ATEST BTEST CTEST DTEST
A
-----------
- ?
1
- ?
3
+ ?
+ ?
--- 4 row(s) selected.
>>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a33ee6b9/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 86b4ba6..48bb134 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -3893,6 +3893,18 @@ void CmpSeabaseDDL::renameSeabaseTable(
return;
}
+ const CheckConstraintList &checkList = naTable->getCheckConstraints();
+ if (checkList.entries() > 0)
+ {
+ *CmpCommon::diags()
+ << DgSqlCode(-1427)
+ << DgString0("Reason: Operation not allowed if check constraints are presenr. Drop the constraints and recreate them after rename.");
+
+ processReturn();
+
+ return;
+ }
+
Int64 objUID = getObjectUID(&cliInterface,
catalogNamePart.data(), schemaNamePart.data(),
objectNamePart.data(),
[2/8] incubator-trafodion git commit: Merge remote branch
'origin/master' into resrvdcols_br
Posted by an...@apache.org.
Merge remote branch 'origin/master' into resrvdcols_br
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/db44c1d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/db44c1d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/db44c1d7
Branch: refs/heads/master
Commit: db44c1d716d44e07f5d01ba13d01b1cc4fdd2d3b
Parents: a3af80d 5ed42cc
Author: Cloud User <ce...@ansharma-3.novalocal>
Authored: Sun Mar 13 22:13:44 2016 +0000
Committer: Cloud User <ce...@ansharma-3.novalocal>
Committed: Sun Mar 13 22:13:44 2016 +0000
----------------------------------------------------------------------
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 | 5 +-
4 files changed, 2 insertions(+), 1244 deletions(-)
----------------------------------------------------------------------