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 2017/12/18 19:16:00 UTC

[1/2] incubator-trafodion git commit: [TRAFODION-2398] Revise Message Guide msgs 1146-1199 + isolated others

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master cd89a2a17 -> c0583c994


[TRAFODION-2398] Revise Message Guide msgs 1146-1199 + isolated others


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4669c079
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4669c079
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4669c079

Branch: refs/heads/master
Commit: 4669c079f0ac81604ddc6c965c9442843c857039
Parents: 4639458
Author: Dave Birdsall <db...@apache.org>
Authored: Sun Dec 17 00:19:01 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Sun Dec 17 00:19:01 2017 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt                    |  88 ++--
 core/sql/exp/ExpErrorEnums.h                    |   6 +-
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |  78 ++--
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   2 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |   2 +-
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |   6 +-
 .../src/asciidoc/_chapters/ddl_msgs.adoc        | 424 +++++++------------
 .../asciidoc/_chapters/update_stats_msgs.adoc   |   4 +-
 8 files changed, 245 insertions(+), 365 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4669c079/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt
index 4b0389a..cfe49e7 100644
--- a/core/sql/bin/SqlciErrors.txt
+++ b/core/sql/bin/SqlciErrors.txt
@@ -146,65 +146,65 @@
 1144 ZZZZZ 99999 BEGINNER MAJOR DBADMIN A quoted string was expected in first key clause for column $0~ColumnName on table $1~TableName, but the value detected is ($2~String0).
 1145 3D000 99999 BEGINNER MAJOR DBADMIN --- unused ---
 1146 ZZZZZ 99999 BEGINNER MINOR DBADMIN Object $0~String0 could not be altered because it either does not exist or is not a table.
-1147 ZZZZZ 99999 BEGINNER MINOR DBADMIN System-generated column $0~ColumnName of base table $1~TableName cannot appear in a unique or primary key constraint definition.
+1147 ZZZZZ 99999 BEGINNER MINOR DBADMIN System-generated column $0~ColumnName of base table $1~TableName cannot appear in a unique or primary key constraint.
 1148 23000 99999 BEGINNER MINOR DBADMIN System-generated column $0~ColumnName of base table $1~TableName cannot appear in a referential integrity constraint definition.
-1149 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Column $0~ColumnName does not exist in table $1~TableName.
-1150 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Table $0~TableName was not created because Partition Overlay Support could not generate volume names for the partitions to reside on.
-1151 01000 99999 BEGINNER MAJOR DBADMIN POS (Partition Overlay Support) was not applied because volume names could not be generated for the partitions.  So a simple table ~TableName was created without partitions.
-1152 ZZZZZ 99999 BEGINNER CRTCL DBADMIN Unable to access partition $0~string0. Partition is offline.
-1153 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Column $0~String0 whose size is not set cannot be part of the primary key.
-1154 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Cannot create object $0~TableName because the table size $1~Int0 is too big to fit on the system($2~Int1 partitions).
+1149 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1150 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1151 01000 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1152 ZZZZZ 99999 BEGINNER CRTCL DBADMIN --- unused ---
+1153 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1154 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
 1155 ZZZZZ 99999 BEGINNER MINOR DBADMIN Operation cannot be performed because $0~String0 is not a synonym.
 1156 ZZZZZ 99999 BEGINNER MINOR DBADMIN Object $0~TableName does not have columns.
 1157 ZZZZZ 99999 BEGINNER MINOR DBADMIN Synonym object $0~String0 is the same as previous mapping.
-1158 ZZZZZ 99999 BEGINNER MINOR LOGONLY Object $0~TableName already exists.
-1159 ZZZZZ 99999 BEGINNER MINOR DBADMIN $0~TableName does not exist.
-1160 ZZZZZ 99999 BEGINNER MAJOR DBADMIN A mismatch between the NOT DROPPABLE PRIMARY KEY constraint and the STORE BY clause was detected.  When both clauses are specified, the STORE BY key column list must be the same as, or a prefix of, the PRIMARY KEY column list.  This mismatch is caused by differences between the columns themselves, the order of columns, or the ASC/DESC attribute.
-1161 ZZZZZ 99999 BEGINNER MINOR DBADMIN System generated column $0~String0 cannot be specified as part of the PARTITION BY clause.
-1162 ZZZZZ 99999 BEGINNER INFRM LOGONLY User $0~String0 already owns $1~String1 $2~String2.  Operation ignored.
-1163 ZZZZZ 99999 BEGINNER MAJOR DBADMIN You are not authorized to change the owner of $0~String0 $1~String1 owned by user $2~String2.
-1164 ZZZZZ 99999 ADVANCED MAJOR DBADMIN Internal error: unable to send controls while performing $0~String0. Error returned is $1~Int0.
-1165 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Parallel $0~string0 operation failed on $1~TableName, the serial operation for this object will be performed.
-1166 ZZZZZ 99999 BEGINNER MAJOR DBADMIN	Drop of partition $0~string0 for object $1~string1 failed with error $2~NSKCode, continuing.
-1167 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Cannot change ownership of $0~String0 $1~String1 because $2~String2 is not the super ID or the services ID.
-1168 ZZZZZ 99999 ADVANCED MAJOR DBADMIN Internal error: unable to find the object associated with UID $0~string0 that belongs to the schema associated with UID $1~string1.  This object is being accessed by $2~string2 using the lock mode of $3~string3.
-1169 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Schema privileges for schema $0~String0 have not been enabled.
-1170 ZZZZZ 99999 BEGINNER MINOR DBADMIN Invalid number of disk pools $0~Int0 specified either through the default or through the DDL statement.
-1171 ZZZZZ 99999 ADVANCED MAJOR DBADMIN Error $0~int0 was returned by the file system while fetching the size of the disk.
-1172 ZZZZZ 99999 BEGINNER MAJOR DBADMIN DDL privileges cannot be specified on $0~string0.  They may only be specified at the schema level.
-1173 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Volatile table $0~TableName was not created as the free space threshold $0~string0 percent was reached on all available disks.
-1174 ZZZZZ 99999 BEGINNER MAJOR DBADMIN An invalid data type was specified for column $0~String0.
-1175 ZZZZZ 99999 BEGINNER INFRM LOGONLY Since table $0~TableName does not contain an IDENTIFIER column, the sequence generator object was not recreated.
-1176 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Cannot create object $0~TableName because max table size $1~Int0 is bigger than absolute max table size $2~Int1.
-1177 ZZZZZ 99999 ADVANCED MAJOR DBADMIN Internal error: trying to create an object with a qualified name type of $0~string0. This qualified name type is not supported. 
-1178 ZZZZZ 99999 ADVANCED MAJOR DIALOUT Internal error: unable to find catalog associated with uid $0~string0.  This catalog is being accessed by role $1~string1.
-1179 ZZZZZ 99999 ADVANCED MAJOR DBADMIN Internal error: inconsistent object definition for $0~TableName found for object in name space $0~string0. Object owned by $1~string1. Unable to find object details in $2~string2;
+1158 ZZZZZ 99999 BEGINNER MINOR LOGONLY --- unused ---
+1159 ZZZZZ 99999 BEGINNER MINOR DBADMIN --- unused ---
+1160 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1161 ZZZZZ 99999 BEGINNER MINOR DBADMIN --- unused ---
+1162 ZZZZZ 99999 BEGINNER INFRM LOGONLY --- unused ---
+1163 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1164 ZZZZZ 99999 ADVANCED MAJOR DBADMIN --- unused ---
+1165 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1166 ZZZZZ 99999 BEGINNER MAJOR DBADMIN	--- unused ---
+1167 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1168 ZZZZZ 99999 ADVANCED MAJOR DBADMIN --- unused ---
+1169 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1170 ZZZZZ 99999 BEGINNER MINOR DBADMIN --- unused ---
+1171 ZZZZZ 99999 ADVANCED MAJOR DBADMIN --- unused ---
+1172 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1173 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1174 ZZZZZ 99999 BEGINNER MAJOR DBADMIN An unsupported data type was encountered on this operation.
+1175 ZZZZZ 99999 BEGINNER INFRM LOGONLY --- unused ---
+1176 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1177 ZZZZZ 99999 ADVANCED MAJOR DBADMIN --- unused ---
+1178 ZZZZZ 99999 ADVANCED MAJOR DIALOUT --- unused ---
+1179 ZZZZZ 99999 ADVANCED MAJOR DBADMIN --- unused ---
 1180 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Trying to create an external $0~String0 table with a different schema or table name ($1~TableName) than the source table ($2~String1).  The external schema and table name must be the same as the source. 
 1181 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Trying to create a schema with name $0~TableName to store the definition of a native HIVE or HBASE table and the name is too long.  Maximum length supported is $0~Int0.
-1182 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Error $0~NSKCode was returned by the file system on resource fork $1~String0.
-1183 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Error $0~NSKCode was returned by the file system on metadata table $1~TableName (file name $2~String0).
-1184 ZZZZZ 99999 BEGINNER MAJOR DBADMIN You do not have the required privilege(s) on $0~ColumnName.
-1185 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The location name is either invalid or missing.
+1182 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1183 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1184 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1185 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
 1186 42000 99999 BEGINNER MAJOR DBADMIN Column $0~ColumnName is of type $1~String0 which is not compatible with the default value's type, $2~String1.
 1187 3F000 99999 BEGINNER MAJOR DBADMIN The schema name $0~SchemaName is reserved for SQL metadata.
 1188 23000 99999 BEGINNER MAJOR DBADMIN Referential integrity constraint $0~ConstraintName for table $1~TableName could not be created due to circular dependency: $2~String0.
-1189 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Request failed. View $0~string0 is already valid.
+1189 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
 1190 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Failed to initialize Hive metadata. Call to $0~string0 returned error $1~string1($0~int0). Cause: $2~string2.
 1191 ZZZZZ 99999 BEGINNER MAJOR DBADMIN SERIALIZE option is not yet supported for $0~string0 datatype.
 1192 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Failed to retrieve data from Hive metastore.  Call to $0~string0 returned error $1~string1($0~int0). Cause: $2~string2.
 1193 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU The $0~string0 specified in the $1~string1 clause must be identical to the primary key for a Trafodion table.
-1194 ZZZZZ 99999 ADVANCED MAJOR DIALOUT Label $0~String0 could not be dropped (file error $1~NSKCode). 
+1194 ZZZZZ 99999 ADVANCED MAJOR DIALOUT --- unused ---
 1195 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU Column $0~ColumnName is not allowed as a salt column. Only primary key columns or STORE BY columns are allowed.
-1196 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU The number of salt partitions must be between $0~int0 and $1~int1
+1196 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU The number of salt partitions must be between $0~int0 and $1~int1 inclusive.
 1197 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU The location $0~string0 for $1~string1 does not match with another location $2~string2 specified. All location specifications must be identical.
-1198 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU View text is too long to fit into the metadata.
+1198 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU --- unused ---
 1199 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU The PARTITION BY clause is not allowed for a Trafodion table.
 1200 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU An error occurred while reading HDFS file statistics for Hive table $1~TableName. Cause: $0~string0.
 1201 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU Salted index $0~string0 cannot be unique.
 1202 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU Index $0~string1 cannot be salted like a table since table $0~string0 is not salted.
 1203 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU HBASE_OPTIONS clause in CREATE statement is longer than 6000 characters. Object $0~string0 was not created.
 1204 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU Unsupported Hive datatype $0~string0.
-1205 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU Hive feature $0~string0 is not supported.
+1205 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU --- unused ---
 1206 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU SALT AND SPLIT BY clauses are not allowed together.
 1207 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU Text to be inserted into the TEXT metadata table contains too many quotes.
 1208 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU The SPLIT BY clause is not supported for indexes.
@@ -230,7 +230,7 @@
 1232 ZZZZZ 99999 BEGINNER MINOR DBADMIN A file error ($0~int0) occurred when saving dropped table DDL for table $1~TableName to $2~String0.
 1233 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Creating schema in SQL system catalog $0~String0 is prohibited.
 1234 ZZZZZ 99999 BEGINNER MAJOR DIALOUT Authorization need to be reinitialized due to missing or corrupted privilege manager metadata. To reinitialize, do 'initialize authorization, drop' followed by 'initialize authorization'. This deletes and recreates privilege manager metadata. Trafodion metadata is not affected. 
-1235 ZZZZZ 99999 BEGINNER MAJOR DBADMIN An invalid combination of EXTENT sizes and MAXEXTENTS was specified for table or index $0~TableName. File system error returned $1~int0.
+1235 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
 1236 3F000 99999 BEGINNER MAJOR DBADMIN The schema name specified for SQL object $0~String0 is not valid. The schema name must be the same as the schema being created.
 1237 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU --- unused as of 05/7/12 ---
 1238 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The character set used in TRIGGER text must be ISO88591.
@@ -241,12 +241,12 @@
 1243 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The hexadecimal form of string literals is not allowed in this context.
 1244 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Authorization initialization failed.
 1245 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The supplied partition key value ($0~String0) for column $1~ColumnName of object $2~TableName is not valid.
-1246 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The supplied partition key value ($0~String0) is inconsistent with the data type of column $1~ColumnName of object $2~TableName.   
+1246 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
 1247 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- Msg text will be merged in.  ------   
 1248 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Partition name $0~string0 has already been used. Each partition in an object should have a unique name.
-1249 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Insert into $0~string0 log table failed.    
-1250 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Operation cannot be performed on object $0~TableName because a utility operation ($2~string0) associated with DDL_LOCK $3~string1 is currently running.
-1251 01000 99999 BEGINNER MINOR DBADMIN The extra insignificant digits of default value ($0~String0) are truncated to match the scale of the data type of column $1~ColumnName.
+1249 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---   
+1250 ZZZZZ 99999 BEGINNER MAJOR DBADMIN --- unused ---
+1251 01000 99999 BEGINNER MINOR DBADMIN The extra insignificant digits of default value $0~String0 are truncated to match the scale of the data type of column $1~ColumnName.
 1252 ZZZZZ 99999 BEGINNER MAJOR DBADMIN The existing index $0~TableName to be used by a unique or primary constraint has not been populated.  Please populate the index and then try to add the constraint again.
 1253 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- Msg text will be merged in.  ------   
 1254 ZZZZZ 99999 BEGINNER MAJOR DBADMIN Duplicate unique constraints are not allowed with same set of columns.
@@ -1894,7 +1894,7 @@ drop the default context
 9212 ZZZZZ 99999 ADVANCED MAJOR DBADMIN Cardinality statistics will be more accurate if you use the SET ROWCOUNT option in the SAMPLE clause.
 9213 ZZZZZ 99999 BEGINNER INFRM DBADMIN If you intend to update histogram statistics for columns, you must specify a column list in the statement.
 9214 ZZZZZ 99999 ADVANCED MAJOR DBADMIN Object $0~string0 could not be created.
-9215 ZZZZZ 99999 ADVANCED MAJOR DBADMIN UPDATE STATISTICS encountered an internal error (from $0~String0, with return value=$1~String1).  Details: $2~String2."
+9215 ZZZZZ 99999 ADVANCED MAJOR DBADMIN UPDATE STATISTICS encountered an internal error (from $0~String0, with return value=$1~String1).  Details: $2~String2.
 9216 ZZZZZ 99999 BEGINNER MAJOR DBADMIN UPDATE STATISTICS cannot be on EVERY COLUMN for LOG tables. 
 9217 ZZZZZ 99999 BEGINNER INFRM DBADMIN The statement will have no effect because no histograms are currently maintained for the table.
 9218 ZZZZZ 99999 BEGINNER INFRM DBADMIN The statement will have no effect because no histograms need to be updated.

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4669c079/core/sql/exp/ExpErrorEnums.h
----------------------------------------------------------------------
diff --git a/core/sql/exp/ExpErrorEnums.h b/core/sql/exp/ExpErrorEnums.h
index d9aedf7..ba604bf 100644
--- a/core/sql/exp/ExpErrorEnums.h
+++ b/core/sql/exp/ExpErrorEnums.h
@@ -182,7 +182,7 @@ enum ExeErrorCode
   EXE_NO_MEM_TO_BUILD			= 8570,
   EXE_NO_MEM_TO_EXEC 			= 8571,
   EXE_CANNOT_CONTINUE                   = 8572,
-  EXE_ACCESS_VIOLATION                  = 8573,
+  // unused                             = 8573,
   
   // ------------------------------------------------------------
   // Error 8574, lost open. Could result in reopening the table.
@@ -340,7 +340,7 @@ enum ExeErrorCode
   CLI_USER_ENDED_XN_CLEANUP             = 8844,
   CLI_INTERR_NULL_TCB                   = 8845,
   CLI_EMPTY_SQL_STMT                    = 8846,
-  CLI_SQLMP_RTD_ERROR			= 8847,
+  // unused      			= 8847,
   CLI_CANCEL_REJECTED                   = 8848,
   CLI_NON_CURSOR_UPDEL_TABLE            = 8850,
   CLI_USER_MEMORY_IN_EXECUTOR_SEGMENT   = 8851,
@@ -394,7 +394,7 @@ enum ExeErrorCode
 
   CLI_ARKCMP_INIT_FAILED		= 8890,
   CLI_NOT_ASCII_CHAR_TYPE		= 8891,
-  CLI_RTD_BUFFER_TOO_SMALL		= 8892,
+  // unused				= 8892,
   CLI_STMT_DESC_COUNT_MISMATCH          = 8893,
   CLI_RESERVED_ARGUMENT                 = 8894,
   CLI_INVALID_CHARSET_FOR_DESCRIPTOR    = 8895,

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4669c079/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpDDLCatErrorCodes.h b/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
index 52eca31..f208652 100644
--- a/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
+++ b/core/sql/sqlcomp/CmpDDLCatErrorCodes.h
@@ -179,52 +179,49 @@ enum CatErrorCode { CAT_FIRST_ERROR = 1000
                   , CAT_CANNOT_ALTER_WRONG_TYPE                   = 1146
                   , CAT_SYSTEM_COL_NOT_ALLOWED_IN_UNIQUE_CNSTRNT  = 1147
                   , CAT_SYSTEM_COL_NOT_ALLOWED_IN_RI_CNSTRNT      = 1148
-                  , CAT_COLUMN_DOES_NOT_EXIST_IN_TABLE            = 1149
-                  , CAT_COULD_NOT_GET_VOLUME_NAMES_FOR_POS        = 1150
-                  , CAT_POS_WAS_NOT_APPLIED                       = 1151
-                  , CAT_PARTITION_OFFLINE                         = 1152
-                  , CAT_COLSZ_NOTSET_IN_KEY                       = 1153
-                  , CAT_POS_TABLE_SIZE_TOO_BIG                    = 1154
+                  // unused                                       = 1149
+                  // unused                                       = 1150
+                  // unused                                       = 1151
+                  // unused                                       = 1152
+                  // unused                                       = 1153
+                  // unused                                       = 1154
                   , CAT_NOT_A_SYNONYM                             = 1155
                   , CAT_INCORRECT_OBJECT_TYPE                     = 1156
                   , CAT_ALTERING_TO_SAME_VALUE                    = 1157
-                  , CAT_OBJECT_ALREADY_EXISTS                     = 1158
-                  , CAT_SYNONYM_DOES_NOT_EXIST                    = 1159
-                  , CAT_INVALID_STORE_BY                          = 1160
-                  , CAT_SYS_COL_NOT_ALLOWED_IN_PARTITIONBY_CLAUSE = 1161
-                  , CAT_ID_ALREADY_OWNS_OBJECT                    = 1162
-                  , CAT_NOT_ALLOWED_TO_CHANGE_OWNER               = 1163
-                  , CAT_SEND_CONTROLS_FAILED                      = 1164
-                  , CAT_PARALLEL_OP_FAILED                        = 1165
-                  , CAT_DROP_FAILED_WITH_CLEANUP                  = 1166
-                  , CAT_OWNER_MUST_BE_SUPER_OR_SERVICES           = 1167
-                  , CAT_INVALID_OBJECT_UID                        = 1168
-                  , CAT_MISSING_SCHEMA_SECURITY                   = 1169
-                  , CAT_POS_INVALID_NUM_DISK_POOLS                = 1170
-                  , CAT_FETCH_DISK_SIZE_ERROR                     = 1171
-                  , CAT_CANNOT_SPECIFY_DDL_AT_OBJECT_LEVEL        = 1172
-                  , CAT_NO_VOLUMES_FOR_VOLATILE_TABLES            = 1173
+                  // unused                                       = 1158
+                  // unused                                       = 1159
+                  // unused                                       = 1160
+                  // unused                                       = 1161
+                  // unused                                       = 1162
+                  // unused                                       = 1163
+                  // unused                                       = 1164
+                  // unused                                       = 1165
+                  // unused                                       = 1166
+                  // unused                                       = 1167
+                  // unused                                       = 1168
+                  // unused                                       = 1169
+                  // unused                                       = 1170
+                  // unused                                       = 1171
+                  // unused                                       = 1172
+                  // unused                                       = 1173
                   , CAT_INVALID_COLUMN_DATATYPE                   = 1174
-                  , CAT_NO_IDENTITY_COLUMN_FOR_TABLE              = 1175
-                  , CAT_POS_MTS_SIZE_BIGGER_THAN_AMTS_SIZE        = 1176
-                  , CAT_UNKNOWN_TABLE_TYPE                        = 1177
-                  , CAT_INVALID_CATALOG_UID                       = 1178
-                  , CAT_INVALID_OBJECT_INFO                       = 1179
-                  //
-                  // 1150-1180  Queuing and publish/subscribe errors
-                  //
+                  // unused                                       = 1175
+                  // unused                                       = 1176
+                  // unused                                       = 1177
+                  // unused                                       = 1178
+                  // unused                                       = 1179
                   , CAT_EXTERNAL_NAME_MISMATCH                    = 1180
                   , CAT_EXTERNAL_SCHEMA_NAME_TOO_LONG             = 1181
-                  , CAT_METADATA_SQL_ERROR                        = 1183
-                  , CAT_INSUFFICIENT_PRIV_ON_COLUMN               = 1184
-                  , CAT_LOCATION_INVALID_OR_MISSING               = 1185
+                  // unused                                       = 1182
+                  // unused                                       = 1183
+                  // unused                                       = 1184
+                  // unused                                       = 1185
                   , CAT_INCOMPATIBLE_DATA_TYPE_IN_DEFAULT_CLAUSE  = 1186
                   , CAT_RESERVED_METADATA_SCHEMA_NAME             = 1187
                   , CAT_RI_CIRCULAR_DEPENDENCY                    = 1188
-                  , CAT_VIEW_NAME_VALID                           = 1189
+                  // unused                                       = 1189
 
-                  , CAT_DROP_LABEL_ERROR_FELABELBAD               = 1194
-                  , CAT_INVALID_SYSTEM_NAME                       = 1196
+                  , CAT_INVALID_NUM_OF_SALT_PARTNS                = 1196
                   , CAT_INVALID_SALTED_UNIQUE_IDX                 = 1201
                   , CAT_INVALID_SALT_LIKE_CLAUSE                  = 1202
                   , CAT_INVALID_HBASE_OPTIONS_CLAUSE              = 1203
@@ -242,14 +239,15 @@ enum CatErrorCode { CAT_FIRST_ERROR = 1000
                   , CAT_UNABLE_TO_CREATE_ROUTINE                  = 1231
                   , CAT_UNABLE_TO_SAVE_DDL                        = 1232
                   , CAT_CREATE_SCHEMA_IN_SYSCAT_IS_PROHIBITED     = 1233
-                  , CAT_LABEL_FAILED_DUE_TO_EXTENT_OR_MAXEXTENT   = 1235
+                  // unused                                       = 1235
                   , CAT_IMPROPER_SCHEMA_NAME                      = 1236
                   , CAT_NON_ISO88591_RANGE_PARTITION_COLUMN       = 1240
                   , CAT_INIT_AUTHORIZATION_FAILED                 = 1244
                   , CAT_FIRST_KEY_VALUE_INVALID                   = 1245
-                  , CAT_FIRST_KEY_VALUE_INCONSISTENT              = 1246
+                  // unused                                       = 1246
                   , CAT_PARTITION_NAME_ALREADY_EXISTS             = 1248
-                  , CAT_DDL_OPERATION_IN_PROGRESS                 = 1250
+                  // unused                                       = 1249
+                  // unused                                       = 1250
                   , CAT_SCALE_OF_DEFAULT_VALUE_ADJUSTED           = 1251
                   , CAT_INVALID_INDEX_DATA                        = 1252
                   , CAT_DUPLICATE_UNIQUE_CONSTRAINT_ON_SAME_COL   = 1254
@@ -400,7 +398,7 @@ enum CatErrorCode { CAT_FIRST_ERROR = 1000
                   , CAT_IDENTITY_COLUMN_NOT_NULL_NOT_DROPPABLE    = 1512
                   , CAT_IDENTITY_COLUMN_HASH_PARTITIONED_ONLY     = 1513
                   , CAT_IDENTITY_COLUMN_NO_ALTER_TABLE            = 1514
-                  , CAT_IDENTITY_COLUMN_2                         = 1515
+                  // unused                                       = 1515
 
                   , CAT_CANNOT_DISABLE_NOT_DROPPABLE_CONSTRAINT   = 1517
                   , CAT_CANNOT_ENABLE_CONSTRAINT                  = 1518

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4669c079/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
index 2490e59..9bad515 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
@@ -2973,7 +2973,7 @@ short CmpSeabaseDDL::getTypeInfo(const NAType * naType,
 
     default:
       {
-        *CmpCommon::diags() << DgSqlCode(-1174);
+        *CmpCommon::diags() << DgSqlCode(-CAT_INVALID_COLUMN_DATATYPE);
         
         return -1; 
       }

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4669c079/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
index 124ec1b..d56a0da 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
@@ -2181,7 +2181,7 @@ short CmpSeabaseDDL::createSeabaseTable2(
       if (numSaltPartns <= 1 || numSaltPartns > 1024)
         {
           // number of salt partitions is out of bounds
-          *CmpCommon::diags() << DgSqlCode(-1196) 
+          *CmpCommon::diags() << DgSqlCode(-CAT_INVALID_NUM_OF_SALT_PARTNS) 
                               << DgInt0(2)
                               << DgInt1(1024);
           deallocEHI(ehi); 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4669c079/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLview.cpp b/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
index b0e04ee..62a2c6b 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
@@ -1060,11 +1060,7 @@ void CmpSeabaseDDL::createSeabaseView(
   NADELETEBASIC(query, STMTHEAP);
   if (cliRC < 0)
     {
-      if (cliRC == -8402)
-        // string overflow, view text does not fit into metadata table
-        *CmpCommon::diags() << DgSqlCode(-1198);
-      else
-        cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
+      cliInterface.retrieveSQLDiagnostics(CmpCommon::diags());
 
       deallocEHI(ehi); 
       processReturn();

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4669c079/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc b/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
index 37394f8..b04bb21 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/ddl_msgs.adoc
@@ -1479,7 +1479,7 @@ calculations. Change the column definitions and reissue the statement.
 == SQL 1143
 
 ```
-Validation for constraint <constraint-name> failed; incompatible data exists in referencing base table <referencing-table-name> and referenced base table <referenced-table-name>. To display the data violating the constraint, please use the following DML statement: <statement-text>.
+Validation for constraint <constraint-name> failed; incompatible data exists in referencing base table <referencing-table-name> and referenced base table <referenced-table-name>. To display the data that violates the constraint, please use the following DML statement: <statement-text>.
 ```
 
 Where <constraint-name> is the name of a column constraint or table
@@ -1530,22 +1530,17 @@ compatible with the type of column <column-name> and resubmit.
 == SQL 1146
 
 ```
-Object <object-name> could not be altered because it is not a <object-type>.
+Object <object-name> could not be altered because it either does not exist or is not a table.
 ```
 
 Where <object-name> is the name of the object being requested.
 
-Where <object-type> is the type of object required for the DDL statement
-issued.
-
-*Cause:* The type of the object specified in the command is inconsistent
-with the DDL command being used. For example, this occurs if DROP TABLE
-is used, and the object you specify is an INDEX.
+*Cause:* You attempted to rename a column in a table, but the <object-name> specified
+either is not a table, or the table does not exist.
 
 *Effect:* The operation fails.
 
-*Recovery:* Check that the correct object name was specified and execute
-a statement that is consistent with that type of object.
+*Recovery:* Correct the <object-name> and resubmit.
 
 <<<
 [[SQL-1147]]
@@ -1585,78 +1580,6 @@ that is the SYSKEY, which is not supported.
 *Recovery:* Do not use the SYSKEY as part of the referenced key.
 
 <<<
-[[SQL-1150]]
-== SQL 1150
-
-```
-Table <table-name> was not created as Partition Overlay Support could not generate volume names for the partitions to reside on.
-```
-
-Where <table-name> is the name of the table.
-
-*Cause:* When the Partition Overlay Support feature is enabled without
-setting volume names (through CQD POS_LOCATIONS) for table partitions to
-reside on, location names are generated automatically. However, the
-{project-name} database software could not generate the location names
-automatically and, because the CQD POS_RAISE_ERROR is set, the table is
-not created.
-
-*Effect:* The operation fails.
-
-*Recovery:* To correct the error, choose a recovery method:
-
-* Verify that the disk volumes are available on the current node and
-retry the request.
-* Specify the volume names where the partitions need to be created for
-the given CREATE TABLE statement through CONTROL QUERY DEFAULT
-POS_LOCATIONS, and then retry the request.
-* Do not set the CQD POS_RAISE_ERROR, in which case, a simple table
-without partitions is created when the volume names cannot be generated.
-
-<<<
-[[SQL-1151]]
-== SQL 1151
-
-```
-POS (Partition Overlay Support) was not applied as volume names could not be generated for the partitions. So a simple table <table-name> was created without partitions.
-```
-
-Where <table-name> is the name of the table.
-
-*Cause:* When the Partition Overlay Support feature is enabled without
-setting volume names (through CQD POS_LOCATIONS) for table partitions to
-reside on, location names are generated automatically. However, the
-{project-name} database software could not generate the location names
-automatically, and because the CQD POS_RAISE_ERROR is not set, the given
-table is created as a simple table without partitions as it would be if
-the Partition Overlay Support feature was not enabled.
-
-*Effect:* The POS feature was not applied. A simple table without
-partitions was created.
-
-*Recovery:* None if a non-partitioned table is requested. To request a
-partitioned table, delete the table, verify that disk volumes are
-available, and resubmit. You can also specify the volume names where the
-partitions need to be created for the given CREATE TABLE through
-CONTROL QUERY DEFAULT POS_LOCATIONS, and then retry the request.
-
-<<<
-[[SQL-1154]]
-== SQL 1154
-
-```
-Cannot create object <object-name> as the table size is too big to fit on the system.
-```
-
-*Cause:* {project-name} could not create the object
-because the requested table size is bigger than the total amount of disk
-space available on the system.
-
-*Effect:* The SQL operation fails.
-
-*Recovery:* Check that the table size requested is big enough to fit on
-the system and retry the statement.
-
 [[SQL-1155]]
 == SQL 1155
 
@@ -1675,15 +1598,14 @@ Operation cannot be performed because <object-name> is not a synonym.
 == SQL 1156
 
 ```
-Synonym <name> does not exist or object type is invalid for the current operation.
+Object <object-name> does not have columns.
 ```
 
-*Cause:* You specified a create or alter of synonym <name> on an object
-that is not a table or view.
+*Cause:* You attempted to grant or revoke column privileges, but <object-name> is not a table or a view.
 
 *Effect:* The operation fails.
 
-*Recovery:* Correct the syntax so that the correct <name> is used.
+*Recovery:* Correct the syntax so that the correct <object-name> is used.
 
 [[SQL-1157]]
 == SQL 1157
@@ -1699,247 +1621,272 @@ is the same as its previous mapping.
 
 *Recovery:* None.
 
-<<<
-[[SQL-1158]]
-== SQL 1158
+[[SQL-1174]]
+== SQL 1174
 
 ```
-Synonym <name> already exists.
+An unsupported data type was encountered on this operation.
 ```
 
-*Cause:* You specified a create of synonym <name> on an object, but a
-synonym of that name already exists.
+*Cause:* You performed a DDL-related operation and one of the objects involved
+has a column with a data type that is not supported for this operation. This is
+due to an incomplete implementation of support for a particular column type.
 
 *Effect:* The operation fails.
 
-*Recovery:* Correct the syntax so that the correct <name> is used.
+*Recovery:* None. Report this error and the DDL operation to the {project-name} User Distribution List.
 
-[[SQL-1159]]
-== SQL 1159
+<<<
+[[SQL-1180]]
+== SQL 1180
 
 ```
-The specified object <name> is not a table or a view. Please verify that the correct object was specified.
+Trying to create an external <kind> table with a different schema or table name (<table-name>) than the source table (<source-table-name>). The external schema and table name must be the same as the source.
 ```
 
-*Cause:* You specified an alter or drop of synonym <name>, but a synonym of that name already exists.
+Where <kind> is the kind of the source table (e.g. HBASE or HIVE).
+
+Where <table-name> is the name of a {project-name} external table that you are trying to create.
+
+Where <source-table-name> is the name of a non-{project-name} table (e.g. an HBase or Hive table).
+
+*Cause:* You attempted a CREATE EXTERNAL TABLE statement, but you used a different schema name for the {project-name} external
+table than the original. This might happen because you let the schema name of the external table default, and the default is not the 
+same as the source table schema.
+
+*Effect:* The external table was not created.
+
+*Recovery:* Either supply the correct schema name or change the default schema name.
+
+[[SQL-1181]]
+== SQL 1181
+
+```
+Trying to create a schema with name <schema-name> to store the definition of a native HIVE or HBASE table and the name is too long. Maximum length supported is <max-length>.
+```
+
+Where <schema-name> is the name of the schema you are trying to create.
+
+Where <max-length> is the maximum length of schema names supported by {project-name}.
+
+*Cause:* You attempted to create an external table for an HBase or Hive table but the schema name is too long.
 
 *Effect:* The operation fails.
 
-*Recovery:* Correct the syntax so that the correct <name> is used.
+*Recovery:* None.
 
 <<<
-[[SQL-1160]]
-== SQL 1160
+[[SQL-1186]]
+== SQL 1186
 
 ```
-A mismatch between the NOT DROPPABLE PRIMARY KEY constraint and the STORE BY clause was detected. When both clauses are specified, the STORE BY key column list must be the same as, or a prefix of , the PRIMARY KEY column list. This mismatch is caused by differences between the columns themselves, the order of columns, or the ASC/DESC attribute.
+Column <column-name> is of type <column-data-type> which is not compatible with the default value's type, <value-datatype>.
 ```
 
-*Cause:* You attempted to create a table that contains both a NOT
-DROPPABLE PRIMARY KEY constraint and a STORE BY clause. The syntax
-specified is not correct. The STORE BY column list must be the same as,
-or a prefix of, the NOT DROPPABLE PRIMARY KEY column list.
+Where <column-name> is the name of the column that has an error.
+
+Where <column-data-type> is the data type of <column-name>
+
+Where <value-data-type> is the value specified as the default value for the column.
+
+*Cause:* The value specified as the default for the column is
+incompatible with the type of the column.
 
 *Effect:* The operation fails.
 
-*Recovery:* If you want the STORE BY column list that specifies the
-clustering key to be different than the PRIMARY KEY, specify a DROPPABLE
-PRIMARY KEY. If you want the PRIMARY KEY to be the same as the STORE BY
-key, do not specify a STORE BY clause. Correct the syntax and resubmit.
+*Recovery:* Change either the column data type or the value for the
+default to be compatible types and resubmit.
 
-[[SQL-1161]]
-== SQL 1161
+[[SQL-1187]]
+== SQL 1187
 
 ```
-System generated column SYSKEY cannot be specified as part of the PARTITION BY clause.
+The schema name <schema-name> is reserved for SQL metadata.
 ```
 
-*Cause:* {project-name} could not create the object
-because system-generated column SYSKEY is not allowed as part of the
-PARTITION BY clause.
+Where <schema-name> is the name of a {project-name} database schema.
 
-*Effect:* The DDL operation fails.
+*Cause:* {project-name} reserves certain schema names
+for its own use.
 
-*Recovery:* Remove the system added column SYSKEY from the PARTITION BY
-clause and retry the DDL statement.
+*Effect:* The operation fails.
+
+*Recovery:* See the {docs-url}/sql_reference/index.html[_{project-name} SQL Reference Manual_] for reserved schema
+names. Choose a name that is not reserved and reissue the CREATE statement.
 
 <<<
-[[SQL-1180]]
-== SQL 1180
+[[SQL-1188]]
+== SQL 1188
 
 ```
-The required subvolume name for locations in schema <schema-name> is <directory-name>.
+Referential integrity constraint <constraint-name> for table <table-name> could not be created due to circular dependency: <dependency-information>.
 ```
 
-Where <schema-name> is the schema in which the object is being created.
+Where <constraint-name> is the name of a column constraint or table
+constraint. Where <table-name> is the name of the table specified in the
+operation.
 
-Where <directory-name> is the designated subvolume name for that schema.
+Where <dependency-information> is a list of unique constraints that cause the circular dependency.
 
-*Cause:* One or more LOCATION clauses in the CREATE or MODIFY statement
-contained a {project-name} platform location whose subvolume did not match
-the designated subvolume for the schema in which the object was being
-created.
+*Cause:* You tried to define a referential constraint that is creating a
+circular dependency, where one of the columns of the table is
+referencing a column that belongs to the same table, either directly or
+indirectly.
 
-*Effect:* The object was not created.
+*Effect:* The operation fails.
 
-*Recovery:* Either correct the invalid LOCATION clauses or remove them
-and allow the system to generate the {project-name} platform locations.
+*Recovery:* None. You cannot define a referential constraint that creates a circular dependency.
 
-[[SQL-1181]]
-== SQL 1181
+[[SQL-1190]]
+== SQL 1190
 
 ```
-Label <file-name> could not be dropped. (file error <error>).
+Failed to initialize Hive metadata. Call to <function> returned error <optional-symbol>(<error-number>). Cause: <diagnostics>.
 ```
 
-Where <file-name> is the name of the table, index, view, or routine
-being dropped.
+Where <function> is a {project-name} internal method call.
 
-Where <error> is the returned file system error number.
+Where <optional-symbol> is an internal symbol representing the error.
 
-*Cause:* The object you attempted to drop resulted in file system error
-<error>.
+Where <error-number> is the error code returned by <function>.
 
-*Effect:* The DDL DROP operation fails.
+Where <diagnositics> is Java exception information.
 
-*Recovery:* See previous messages in this {project-name} database software
-operation to determine the necessary corrective actions. Also, use the
-file system error <error-number> to analyze the cause. For information
-about file system errors, see <<file_system_errors, File-System Errors>>.
-Fix the error and resubmit.
+*Cause:* You attempted to access a Hive object but {project-name} was unable to access the Hive metadata for that object. A common
+cause of this error is that the Hive metadata server is down.
+
+*Effect:* The operation fails.
+
+*Recovery:* Take corrective action to insure that the Hive subsystem is functioning correctly. Then resubmit.
 
 <<<
-[[SQL-1182]]
-== SQL 1182
+[[SQL-1191]]
+== SQL 1191
 
 ```
-Error <error> was returned by the file system on resource fork <file-name>.
+SERIALIZE option is not yet supported for <data-type> datatype.
 ```
 
-Where <error> is the error returned.
-
-Where <file-name> is the name of the file.
+Where <data-type> is the data type of a column that you tried to create.
 
-*Cause:* File system error.
+*Cause:* You attempted to create a column with the SERIALIZED attribute (for example, while submitting a CREATE TABLE statement) 
+but {project-name} does not presently
+support columns of the given data type with the SERIALIZED attribute.
 
 *Effect:* The operation fails.
 
-*Recovery:* For information about file system errors, see <<file_system_errors,File-System Errors>>.
+*Recovery:* Correct the statement by either changing the data type or removing the SERIALIZED attribute. Then resubmit.
 
-[[SQL-1183]]
-== SQL 1183
+[[SQL-1192]]
+== SQL 1192
 
 ```
-Error <error> was returned by the file system on metadata table <ANSI-name> (file name <file-name>).
+Failed to retrieve data from Hive metastore.  Call to <function> returned error <optional-symbol>(<error-number>). Cause: <diagnostics>.
 ```
 
-Where <error> is the error returned.
+Where <function> is a {project-name} internal method call.
+
+Where <optional-symbol> is an internal symbol representing the error.
 
-Where <ANSI-name> is the metadata table.
+Where <error-number> is the error code returned by <function>.
 
-Where <file-name> is the name of the file.
+Where <diagnositics> is Java exception information.
 
-*Cause:* File system error.
+*Cause:* An error occurred when {project-name} attempted to read metadata about a Hive object from the Hive metastore. The <diagnostics>
+contains specific information about the error.
 
 *Effect:* The operation fails.
 
-*Recovery:* For information about file system errors, see <<file_system_errors,File-System Errors>>.
+*Recovery:* The <diagnostics> may suggest appropriate corrective action. If not, report this error and the associated SQL
+operation to the {project-name} User Distribution List.
 
 <<<
-[[SQL-1184]]
-== SQL 1184
+[[SQL-1193]]
+== SQL 1193
 
 ```
-You do not have the required privilege(s) on <column-name>.
+The <type-of-string> specified in the <clause-name> clause must be identical to the primary key for a Trafodion table.
 ```
 
-Where <column-name> is the name of a column specified in the references
-part of a referential integrity constraint.
+Where <type-of-string> indicates some syntactic construct (e.g. "clusering key").
+
+Where <clause-name> is a SQL clause (e.g. "STORE BY").
 
-*Cause:* You attempted to establish a referential integrity constraint
-on a column for which the executing user ID has no REFERENCES
-privileges.
+*Cause:* You specified two syntatic constructs (e.g. "STORE BY" and "PRIMARY KEY") in a DDL statement (e.g. "CREATE TABLE") that
+overlap in meaning. {project-name} requires the former construct to match the latter in this case.
 
 *Effect:* The operation fails.
 
-*Recovery:* Establish correct column privileges and resubmit.
+*Recovery:* Either remove the <clause-name> clause (as it is redundant) or change it to match the primary key. Then resubmit.
 
-[[SQL-1185]]
-== SQL 1185
+[[SQL-1195]]
+== SQL 1195
 
 ```
-The location name is either invalid or missing.
+Column <column-name> is not allowed as a salt column. Only primary key columns or STORE BY columns are allowed.
 ```
 
-*Cause:* A partition location is either invalid or missing.
+Where <column-name> is the name of a column specified in a SALT clause.
+
+*Cause:* You specified a column in a SALT clause (e.g. on a CREATE TABLE statement) that is not part of the primary or clustering key.
 
 *Effect:* The operation fails.
 
-*Recovery:* Specify the correct location for all partitions involved in
-the affected command.
+*Recovery:* Correct the column name then resubmit.
 
 <<<
-[[SQL-1186]]
-== SQL 1186
+[[SQL-1196]]
+== SQL 1196
 
 ```
-Column <column-name> is of type <column-data-type> which is not compatible with the default value's type, <value-datatype>.
+The number of salt partitions must be between <lower-bound> and <upper-bound> inclusive.
 ```
 
-Where <column-name> is the name of the column that has an error.
+Where <lower-bound> is the smallest allowable number of salt partitions supported.
 
-Where <column-data-type> is the data type of <column-name>
+Where <upper-bound> is the largest allowable number of salt partitions supported.
 
-Where <value-data-type> is the value specified as the default value for the column.
-
-*Cause:* The value specified as the default for the column is
-incompatible with the type of the column.
+*Cause:* You specified a SALT clause (e.g. on a CREATE TABLE statement) with a number of partitions outside the range that
+{project-name} supports.
 
 *Effect:* The operation fails.
 
-*Recovery:* Change either the column data type or the value for the
-default to be compatible types and resubmit.
+*Recovery:* Correct the SALT clause then resubmit.
 
-[[SQL-1187]]
-== SQL 1187
+<<<
+[[SQL-1197]]
+== SQL 1197
 
 ```
-The schema name <schema-name> is reserved for {project-name} metadata.
+The location <location-1> for <stored-procedure-name> does not match with another location <location-2> specified. All location specifications must be identical.
 ```
 
-Where <schema-name> is the name of a {project-name} database schema.
+Where <location-1> and <location-2> are execution locations for an internal stored procedure.
 
-*Cause:* {project-name} reserves certain schema names
-for its own use.
+Where <stored-procedure-name> is the name of an internal stored procedure.
+
+*Cause:* This is a {project-name} internal error.
 
 *Effect:* The operation fails.
 
-*Recovery:* See the {docs-url}/sql_reference/index.html[_{project-name} SQL Reference Manual_] for reserved schema
-names. Choose a name that is not reserved and reissue the CREATE statement.
+*Recovery:* None. Report this error and the associated SQL
+operation to the {project-name} User Distribution List.
 
 <<<
-[[SQL-1188]]
-== SQL 1188
+[[SQL-1199]]
+== SQL 1199
 
 ```
-Referential integrity constraint <constraint-name> for table <table-name> could not be created due to circular dependency: <dependency-information>.
+The PARTITION BY clause is not allowed for a Trafodion table.
 ```
 
-Where <constraint-name> is the name of a column constraint or table
-constraint. Where <table-name> is the name of the table specified in the
-operation.
-
-Where <dependency-information> is a list of unique constraints that cause the circular dependency.
-
-*Cause:* You tried to define a referential constraint that is creating a
-circular dependency, where one of the columns of the table is
-referencing a column that belongs to the same table, either directly or
-indirectly.
+*Cause:* You specified a PARTITION BY clause when trying to create a {project-name} table.
 
 *Effect:* The operation fails.
 
-*Recovery:* None. You cannot define a referential constraint that creates a circular dependency.
+*Recovery:* Remove the PARTITION BY clause from the DDL statement and resubmit.
 
+<<<
 [[SQL-1224]]
 == SQL 1224
 
@@ -2046,21 +1993,6 @@ Where <catalog-name> is the name of the {project-name} database catalog.
 *Recovery:* Choose a different catalog name and reissue the CREATE
 statement.
 
-[[SQL-1235]]
-== SQL 1235
-
-```
-An invalid combination of EXTENT sizes and MAXEXTENTS was specified
-```
-for table or index <table-name>.
-
-*Cause:* A CREATE or ALTER statement specified an invalid combination of
-EXTENT sizes and MAXEXTENTS.
-
-*Effect:* The operation fails.
-
-*Recovery:* Correct the error and retry the operation.
-
 <<<
 [[SQL-1236]]
 == SQL 1236
@@ -2188,28 +2120,6 @@ Where <object-name> is the name of the affected object.
 *Recovery:* Specify valid key values and resubmit.
 
 <<<
-[[SQL-1246]]
-== SQL 1246
-
-```
-The supplied partition key value (<key-value>) is inconsistent
-```
-with the data type of column <column-name> of object <object-name>.
-
-Where <key-value> is the specified first key value.
-
-Where <column-name> is the column of <object-name> that corresponds to
-the invalid key value.
-
-Where <object-name> is the name of the affected object.
-
-*Cause:* A utility command specified a key value that is inconsistent
-with the data type of the column that corresponds to the key value.
-
-*Effect:* The operation fails.
-
-*Recovery:* Specify valid key values and resubmit.
-
 [[SQL-1248]]
 == SQL 1248
 
@@ -2227,30 +2137,6 @@ partitions of an object.
 *Recovery:* Choose a name that is not the same as any other partition
 name in this object and reissue the CREATE statement.
 
-<<<
-[[SQL-1250]]
-== SQL 1250
-
-```
-DROP cannot be performed on object <object-name> because a utility operation (<operation-type>) associated with DDL_LOCK <lock-name> is currently running.
-```
-
-Where <object-name> is the ANSI name of the object named in the DROP
-command.
-
-Where <operation-type> is the type of utility operation.
-
-Where <lock-name> is the ANSI name of the DDL lock object that is
-associated with the utility operation.
-
-*Cause:* You attempted to drop an object that a utility command is
-using.
-
-*Effect:* The operation fails.
-
-*Recovery:* Wait until the utility operation has finished, and then
-retry the DROP operation.
-
 [[SQL-1251]]
 == SQL 1251
 

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4669c079/docs/messages_guide/src/asciidoc/_chapters/update_stats_msgs.adoc
----------------------------------------------------------------------
diff --git a/docs/messages_guide/src/asciidoc/_chapters/update_stats_msgs.adoc b/docs/messages_guide/src/asciidoc/_chapters/update_stats_msgs.adoc
index c660148..51c7e3e 100644
--- a/docs/messages_guide/src/asciidoc/_chapters/update_stats_msgs.adoc
+++ b/docs/messages_guide/src/asciidoc/_chapters/update_stats_msgs.adoc
@@ -62,7 +62,7 @@ contact {project-support}.
 == SQL 9202
 
 ```
-UPDATE STATISTICS has located previously generated histograms that are not being regenerated. This may affect the plans that will be generated. Missing column lists are <column-list>.
+UPDATE STATISTICS has located previously generated histograms that are not being regenerated. This may affect the plans that will be generated. Missing columns lists are <column-list>.
 ```
 
 *Cause:* UPDATE STATISTICS has located previously generated histograms that are not being regenerated.
@@ -456,7 +456,7 @@ a user transaction.
 == SQL 9245
 
 ```
-Unexpected out-of-order data encountered during histogram construction on column <column-name> this might result in later 6004 warnings.
+Unexpected out-of-order data encountered during histogram construction on column <column-name>; this might result in later 6004 warnings.
 ```
 
 *Cause:* {project-name} detected out-of-order data while generating histograms. This is likely an


[2/2] incubator-trafodion git commit: [TRAFODION-2398] PR 1352 Update Msgs Guide msgs 1146-1199 + isolated others

Posted by db...@apache.org.
[TRAFODION-2398] PR 1352 Update Msgs Guide msgs 1146-1199 + isolated others


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c0583c99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c0583c99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c0583c99

Branch: refs/heads/master
Commit: c0583c994722f6ee1d0b1d8c5010d43d1d977fdd
Parents: cd89a2a 4669c07
Author: Dave Birdsall <db...@apache.org>
Authored: Mon Dec 18 19:14:37 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Mon Dec 18 19:14:37 2017 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt                    |  88 ++--
 core/sql/exp/ExpErrorEnums.h                    |   6 +-
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |  78 ++--
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   2 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |   2 +-
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |   6 +-
 .../src/asciidoc/_chapters/ddl_msgs.adoc        | 424 +++++++------------
 .../asciidoc/_chapters/update_stats_msgs.adoc   |   4 +-
 8 files changed, 245 insertions(+), 365 deletions(-)
----------------------------------------------------------------------