github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-15 16:31:17 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-1208: Sqoop2: job ID column is too small

Browse Source
This commit is contained in:
Jarek Jarcec Cecho 2013-10-01 18:07:40 -07:00
parent c0f409fa28
commit 0a5a80cbfa
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepoConstants.java
View File

@ -31,9 +31,14 @@ public final class DerbyRepoConstants {
* History:
* 0 - empty/unknown state
* 1 - First two releases (1.99.1, 1.99.2)
* 2 - added SQ_SYSTEM
* 2 - added SQ_SYSTEM, SQ_CONNECTION add column ENABLED,
* SQ_CONNECTION add column CREATION_USER, SQ_CONNECTION add column UPDATE_USER,
* SQ_JOB add column ENABLED, SQ_JOB add column CREATION_USER,
* SQ_JOB add column UPDATE_USER, SQ_SUBMISSION add column CREATION_USER,
* SQ_SUBMISSION add column UPDATE_USER
* 3 - SQ_SUBMISSION modified SQS_EXTERNAL_ID varchar(50)
*/
public static final int VERSION = 2;
public static final int VERSION = 3;
private DerbyRepoConstants() {
// Disable explicit object creation

3
repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
View File

@ -395,6 +395,9 @@ public void createOrUpdateInternals(Connection conn) {
runQuery(QUERY_UPGRADE_TABLE_SQ_SUBMISSION_ADD_COLUMN_CREATION_USER, conn);
runQuery(QUERY_UPGRADE_TABLE_SQ_SUBMISSION_ADD_COLUMN_UPDATE_USER, conn);
}
if(version <= 2) {
runQuery(QUERY_UPGRADE_TABLE_SQ_SUBMISSION_MODIFY_COLUMN_SQS_EXTERNAL_ID_VARCHAR_50, conn);
}
ResultSet rs = null;
PreparedStatement stmt = null;

9
repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbySchemaQuery.java
View File

@ -151,7 +151,7 @@
* | SQS_CREATION_DATE: TIMESTAMP |
* | SQS_UPDATE_USER: VARCHAR(32) |
* | SQS_UPDATE_DATE: TIMESTAMP |
* | SQS_EXTERNAL_ID: VARCHAR(25) |
* | SQS_EXTERNAL_ID: VARCHAR(50) |
* | SQS_EXTERNAL_LINK: VARCHAR(150) |
* | SQS_EXCEPTION: VARCHAR(150) |
* | SQS_EXCEPTION_TRACE: VARCHAR(750) |
@ -352,7 +352,7 @@ public final class DerbySchemaQuery {
+ COLUMN_SQS_STATUS + " VARCHAR(20), "
+ COLUMN_SQS_CREATION_DATE + " TIMESTAMP,"
+ COLUMN_SQS_UPDATE_DATE + " TIMESTAMP,"
+ COLUMN_SQS_EXTERNAL_ID + " VARCHAR(25), "
+ COLUMN_SQS_EXTERNAL_ID + " VARCHAR(50), "
+ COLUMN_SQS_EXTERNAL_LINK + " VARCHAR(150), "
+ COLUMN_SQS_EXCEPTION + " VARCHAR(150), "
+ COLUMN_SQS_EXCEPTION_TRACE + " VARCHAR(750), "
@ -374,6 +374,11 @@ public final class DerbySchemaQuery {
+ COLUMN_SQS_UPDATE_USER + " VARCHAR(32) "
+ "DEFAULT NULL";
//DDL: Add update_user column to table SQ_SUBMISSION
public static final String QUERY_UPGRADE_TABLE_SQ_SUBMISSION_MODIFY_COLUMN_SQS_EXTERNAL_ID_VARCHAR_50 =
"ALTER TABLE " + TABLE_SQ_SUBMISSION + " ALTER COLUMN "
+ COLUMN_SQS_EXTERNAL_ID + " SET DATA TYPE VARCHAR(50)";
// DDL: Create table SQ_COUNTER_GROUP
public static final String QUERY_CREATE_TABLE_SQ_COUNTER_GROUP =
"CREATE TABLE " + TABLE_SQ_COUNTER_GROUP + " ("

2
repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/DerbyTestCase.java
View File

@ -109,7 +109,7 @@ protected void createSchema() throws Exception {
runQuery(QUERY_UPGRADE_TABLE_SQ_JOB_ADD_COLUMN_UPDATE_USER);
runQuery(QUERY_UPGRADE_TABLE_SQ_SUBMISSION_ADD_COLUMN_CREATION_USER);
runQuery(QUERY_UPGRADE_TABLE_SQ_SUBMISSION_ADD_COLUMN_UPDATE_USER);
runQuery("INSERT INTO SQOOP.SQ_SYSTEM(SQM_KEY, SQM_VALUE) VALUES('version', '2')");
runQuery("INSERT INTO SQOOP.SQ_SYSTEM(SQM_KEY, SQM_VALUE) VALUES('version', '3')");
runQuery("INSERT INTO SQOOP.SQ_SYSTEM(SQM_KEY, SQM_VALUE) " +
"VALUES('framework.version', '1')");
}