Yaniv Dary has uploaded a new change for review. Change subject: history: removed vm auto suspend deprecated column (#885640) ......................................................................
history: removed vm auto suspend deprecated column (#885640) It has not been in use since 2.2. Bug-Url: https://bugzilla.redhat.com/885640 Change-Id: Ib287d10153e48074621724dc932ea9c5f41d11bf Signed-off-by: Yaniv Dary <yd...@redhat.com> --- M data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/configurationsync_3_2/ConfigurationSync.java M data-warehouse/history_etl/tos_project/process/ConfigurationSync_3.2.item M data-warehouse/history_etl/tos_project/process/ConfigurationSync_3.2.properties M data-warehouse/historydbscripts_postgres/create_views_3_0.sql M data-warehouse/historydbscripts_postgres/create_views_3_1.sql M data-warehouse/historydbscripts_postgres/create_views_3_2.sql A data-warehouse/historydbscripts_postgres/upgrade/03_02_0030_drop_auto_suspend_column.sql 7 files changed, 123 insertions(+), 334 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/74/10574/1 diff --git a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/configurationsync_3_2/ConfigurationSync.java b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/configurationsync_3_2/ConfigurationSync.java index aaf3590..8550cff 100644 --- a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/configurationsync_3_2/ConfigurationSync.java +++ b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/configurationsync_3_2/ConfigurationSync.java @@ -21108,12 +21108,6 @@ return this.fail_back; } - public Boolean auto_suspend; - - public Boolean getAuto_suspend() { - return this.auto_suspend; - } - public Short usb_policy; public Short getUsb_policy() { @@ -21316,13 +21310,6 @@ length = dis.readByte(); if (length == -1) { - this.auto_suspend = null; - } else { - this.auto_suspend = dis.readBoolean(); - } - - length = dis.readByte(); - if (length == -1) { this.usb_policy = null; } else { this.usb_policy = dis.readShort(); @@ -21458,15 +21445,6 @@ dos.writeBoolean(this.fail_back); } - // Boolean - - if (this.auto_suspend == null) { - dos.writeByte(-1); - } else { - dos.writeByte(0); - dos.writeBoolean(this.auto_suspend); - } - // Short if (this.usb_policy == null) { @@ -21528,7 +21506,6 @@ sb.append(",initialized=" + String.valueOf(initialized)); sb.append(",stateless=" + String.valueOf(stateless)); sb.append(",fail_back=" + String.valueOf(fail_back)); - sb.append(",auto_suspend=" + String.valueOf(auto_suspend)); sb.append(",usb_policy=" + String.valueOf(usb_policy)); sb.append(",time_zone=" + time_zone); sb.append(",cluster_configuration_version=" @@ -21696,12 +21673,6 @@ return this.fail_back; } - public Boolean auto_suspend; - - public Boolean getAuto_suspend() { - return this.auto_suspend; - } - public Short usb_policy; public Short getUsb_policy() { @@ -21895,13 +21866,6 @@ length = dis.readByte(); if (length == -1) { - this.auto_suspend = null; - } else { - this.auto_suspend = dis.readBoolean(); - } - - length = dis.readByte(); - if (length == -1) { this.usb_policy = null; } else { this.usb_policy = dis.readShort(); @@ -22044,15 +22008,6 @@ dos.writeBoolean(this.fail_back); } - // Boolean - - if (this.auto_suspend == null) { - dos.writeByte(-1); - } else { - dos.writeByte(0); - dos.writeBoolean(this.auto_suspend); - } - // Short if (this.usb_policy == null) { @@ -22104,7 +22059,6 @@ sb.append(",initialized=" + String.valueOf(initialized)); sb.append(",stateless=" + String.valueOf(stateless)); sb.append(",fail_back=" + String.valueOf(fail_back)); - sb.append(",auto_suspend=" + String.valueOf(auto_suspend)); sb.append(",usb_policy=" + String.valueOf(usb_policy)); sb.append(",time_zone=" + time_zone); sb.append(",create_date=" + String.valueOf(create_date)); @@ -22267,12 +22221,6 @@ return this.fail_back; } - public Boolean auto_suspend; - - public Boolean getAuto_suspend() { - return this.auto_suspend; - } - public Short usb_policy; public Short getUsb_policy() { @@ -22466,13 +22414,6 @@ length = dis.readByte(); if (length == -1) { - this.auto_suspend = null; - } else { - this.auto_suspend = dis.readBoolean(); - } - - length = dis.readByte(); - if (length == -1) { this.usb_policy = null; } else { this.usb_policy = dis.readShort(); @@ -22615,15 +22556,6 @@ dos.writeBoolean(this.fail_back); } - // Boolean - - if (this.auto_suspend == null) { - dos.writeByte(-1); - } else { - dos.writeByte(0); - dos.writeBoolean(this.auto_suspend); - } - // Short if (this.usb_policy == null) { @@ -22675,7 +22607,6 @@ sb.append(",initialized=" + String.valueOf(initialized)); sb.append(",stateless=" + String.valueOf(stateless)); sb.append(",fail_back=" + String.valueOf(fail_back)); - sb.append(",auto_suspend=" + String.valueOf(auto_suspend)); sb.append(",usb_policy=" + String.valueOf(usb_policy)); sb.append(",time_zone=" + time_zone); sb.append(",create_date=" + String.valueOf(create_date)); @@ -22776,7 +22707,7 @@ String insert_tJDBCOutput_6 = "INSERT INTO " + "vm_configuration" - + " (vm_id,vm_name,vm_description,vm_type,cluster_id,template_id,template_name,cpu_per_socket,number_of_sockets,memory_size_mb,operating_system,ad_domain,default_host,high_availability,initialized,stateless,fail_back,auto_suspend,usb_policy,time_zone,cluster_configuration_version,default_host_configuration_version,create_date,update_date,delete_date) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + + " (vm_id,vm_name,vm_description,vm_type,cluster_id,template_id,template_name,cpu_per_socket,number_of_sockets,memory_size_mb,operating_system,ad_domain,default_host,high_availability,initialized,stateless,fail_back,usb_policy,time_zone,cluster_configuration_version,default_host_configuration_version,create_date,update_date,delete_date) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; java.sql.PreparedStatement pstmt_tJDBCOutput_6 = connection_tJDBCOutput_6 .prepareStatement(insert_tJDBCOutput_6); @@ -22844,7 +22775,7 @@ java.sql.Statement stmt_tJDBCInput_6 = conn_tJDBCInput_6 .createStatement(); - String dbquery_tJDBCInput_6 = "SELECT vm_id, vm_name, vm_description, vm_type, cluster_id, upper(cast(cluster_id as char(36))) as cluster_join_id, template_id, template_name, cpu_per_socket, number_of_sockets, memory_size_mb, operating_system, ad_domain, default_host, upper(cast(default_host as char(36))) as default_host_join_id, high_availability, initialized, stateless, fail_back, auto_suspend, usb_policy, time_zone, create_date, update_date FROM dwh_vm_configuration_history_view"; + String dbquery_tJDBCInput_6 = "SELECT vm_id, vm_name, vm_description, vm_type, cluster_id, upper(cast(cluster_id as char(36))) as cluster_join_id, template_id, template_name, cpu_per_socket, number_of_sockets, memory_size_mb, operating_system, ad_domain, default_host, upper(cast(default_host as char(36))) as default_host_join_id, high_availability, initialized, stateless, fail_back, usb_policy, time_zone, create_date, update_date FROM dwh_vm_configuration_history_view"; globalMap.put("tJDBCInput_6_QUERY", dbquery_tJDBCInput_6); @@ -23135,25 +23066,11 @@ } } if (colQtyInRs_tJDBCInput_6 < 20) { - row4.auto_suspend = null; - } else { - - if (rs_tJDBCInput_6.getObject(20) != null) { - row4.auto_suspend = rs_tJDBCInput_6.getBoolean(20); - } else { - row4.auto_suspend = null; - } - - if (rs_tJDBCInput_6.wasNull()) { - row4.auto_suspend = null; - } - } - if (colQtyInRs_tJDBCInput_6 < 21) { row4.usb_policy = null; } else { - if (rs_tJDBCInput_6.getObject(21) != null) { - row4.usb_policy = rs_tJDBCInput_6.getShort(21); + if (rs_tJDBCInput_6.getObject(20) != null) { + row4.usb_policy = rs_tJDBCInput_6.getShort(20); } else { row4.usb_policy = null; } @@ -23162,11 +23079,11 @@ row4.usb_policy = null; } } - if (colQtyInRs_tJDBCInput_6 < 22) { + if (colQtyInRs_tJDBCInput_6 < 21) { row4.time_zone = null; } else { - tmpContent_tJDBCInput_6 = rs_tJDBCInput_6.getString(22); + tmpContent_tJDBCInput_6 = rs_tJDBCInput_6.getString(21); if (tmpContent_tJDBCInput_6 != null) { row4.time_zone = tmpContent_tJDBCInput_6; } else { @@ -23177,8 +23094,25 @@ row4.time_zone = null; } } - if (colQtyInRs_tJDBCInput_6 < 23) { + if (colQtyInRs_tJDBCInput_6 < 22) { row4.create_date = null; + } else { + + java.util.Date date_tJDBCInput_6 = null; + try { + date_tJDBCInput_6 = rs_tJDBCInput_6 + .getTimestamp(22); + } catch (Exception e) { + date_tJDBCInput_6 = rs_tJDBCInput_6.getDate(22); + } + row4.create_date = date_tJDBCInput_6; + + if (rs_tJDBCInput_6.wasNull()) { + row4.create_date = null; + } + } + if (colQtyInRs_tJDBCInput_6 < 23) { + row4.update_date = null; } else { java.util.Date date_tJDBCInput_6 = null; @@ -23187,23 +23121,6 @@ .getTimestamp(23); } catch (Exception e) { date_tJDBCInput_6 = rs_tJDBCInput_6.getDate(23); - } - row4.create_date = date_tJDBCInput_6; - - if (rs_tJDBCInput_6.wasNull()) { - row4.create_date = null; - } - } - if (colQtyInRs_tJDBCInput_6 < 24) { - row4.update_date = null; - } else { - - java.util.Date date_tJDBCInput_6 = null; - try { - date_tJDBCInput_6 = rs_tJDBCInput_6 - .getTimestamp(24); - } catch (Exception e) { - date_tJDBCInput_6 = rs_tJDBCInput_6.getDate(24); } row4.update_date = date_tJDBCInput_6; @@ -23377,7 +23294,6 @@ vm_configuration_tmp.initialized = row4.initialized; vm_configuration_tmp.stateless = row4.stateless; vm_configuration_tmp.fail_back = row4.fail_back; - vm_configuration_tmp.auto_suspend = row4.auto_suspend; vm_configuration_tmp.usb_policy = row4.usb_policy; vm_configuration_tmp.time_zone = StringHandling .TRIM(row4.time_zone); @@ -23539,77 +23455,69 @@ vm_configuration.fail_back); } - if (vm_configuration.auto_suspend == null) { - pstmt_tJDBCOutput_6.setNull(18, - java.sql.Types.BOOLEAN); - } else { - pstmt_tJDBCOutput_6.setBoolean(18, - vm_configuration.auto_suspend); - } - if (vm_configuration.usb_policy == null) { - pstmt_tJDBCOutput_6.setNull(19, + pstmt_tJDBCOutput_6.setNull(18, java.sql.Types.INTEGER); } else { - pstmt_tJDBCOutput_6.setShort(19, + pstmt_tJDBCOutput_6.setShort(18, vm_configuration.usb_policy); } if (vm_configuration.time_zone == null) { - pstmt_tJDBCOutput_6.setNull(20, + pstmt_tJDBCOutput_6.setNull(19, java.sql.Types.VARCHAR); } else { - pstmt_tJDBCOutput_6.setString(20, + pstmt_tJDBCOutput_6.setString(19, vm_configuration.time_zone); } if (vm_configuration.cluster_configuration_version == null) { + pstmt_tJDBCOutput_6.setNull(20, + java.sql.Types.INTEGER); + } else { + pstmt_tJDBCOutput_6 + .setInt( + 20, + vm_configuration.cluster_configuration_version); + } + + if (vm_configuration.default_host_configuration_version == null) { pstmt_tJDBCOutput_6.setNull(21, java.sql.Types.INTEGER); } else { pstmt_tJDBCOutput_6 .setInt( 21, - vm_configuration.cluster_configuration_version); - } - - if (vm_configuration.default_host_configuration_version == null) { - pstmt_tJDBCOutput_6.setNull(22, - java.sql.Types.INTEGER); - } else { - pstmt_tJDBCOutput_6 - .setInt( - 22, vm_configuration.default_host_configuration_version); } if (vm_configuration.create_date != null) { - pstmt_tJDBCOutput_6.setTimestamp(23, + pstmt_tJDBCOutput_6.setTimestamp(22, new java.sql.Timestamp( vm_configuration.create_date + .getTime())); + } else { + pstmt_tJDBCOutput_6.setNull(22, + java.sql.Types.DATE); + } + + if (vm_configuration.update_date != null) { + pstmt_tJDBCOutput_6.setTimestamp(23, + new java.sql.Timestamp( + vm_configuration.update_date .getTime())); } else { pstmt_tJDBCOutput_6.setNull(23, java.sql.Types.DATE); } - if (vm_configuration.update_date != null) { - pstmt_tJDBCOutput_6.setTimestamp(24, - new java.sql.Timestamp( - vm_configuration.update_date - .getTime())); - } else { - pstmt_tJDBCOutput_6.setNull(24, - java.sql.Types.DATE); - } - if (vm_configuration.delete_date != null) { - pstmt_tJDBCOutput_6.setTimestamp(25, + pstmt_tJDBCOutput_6.setTimestamp(24, new java.sql.Timestamp( vm_configuration.delete_date .getTime())); } else { - pstmt_tJDBCOutput_6.setNull(25, + pstmt_tJDBCOutput_6.setNull(24, java.sql.Types.DATE); } @@ -23854,12 +23762,6 @@ return this.fail_back; } - public Boolean auto_suspend; - - public Boolean getAuto_suspend() { - return this.auto_suspend; - } - public Short usb_policy; public Short getUsb_policy() { @@ -24062,13 +23964,6 @@ length = dis.readByte(); if (length == -1) { - this.auto_suspend = null; - } else { - this.auto_suspend = dis.readBoolean(); - } - - length = dis.readByte(); - if (length == -1) { this.usb_policy = null; } else { this.usb_policy = dis.readShort(); @@ -24204,15 +24099,6 @@ dos.writeBoolean(this.fail_back); } - // Boolean - - if (this.auto_suspend == null) { - dos.writeByte(-1); - } else { - dos.writeByte(0); - dos.writeBoolean(this.auto_suspend); - } - // Short if (this.usb_policy == null) { @@ -24274,7 +24160,6 @@ sb.append(",initialized=" + String.valueOf(initialized)); sb.append(",stateless=" + String.valueOf(stateless)); sb.append(",fail_back=" + String.valueOf(fail_back)); - sb.append(",auto_suspend=" + String.valueOf(auto_suspend)); sb.append(",usb_policy=" + String.valueOf(usb_policy)); sb.append(",time_zone=" + time_zone); sb.append(",cluster_configuration_version=" @@ -24442,12 +24327,6 @@ return this.fail_back; } - public Boolean auto_suspend; - - public Boolean getAuto_suspend() { - return this.auto_suspend; - } - public Short usb_policy; public Short getUsb_policy() { @@ -24653,13 +24532,6 @@ length = dis.readByte(); if (length == -1) { - this.auto_suspend = null; - } else { - this.auto_suspend = dis.readBoolean(); - } - - length = dis.readByte(); - if (length == -1) { this.usb_policy = null; } else { this.usb_policy = dis.readShort(); @@ -24806,15 +24678,6 @@ dos.writeBoolean(this.fail_back); } - // Boolean - - if (this.auto_suspend == null) { - dos.writeByte(-1); - } else { - dos.writeByte(0); - dos.writeBoolean(this.auto_suspend); - } - // Short if (this.usb_policy == null) { @@ -24874,7 +24737,6 @@ sb.append(",initialized=" + String.valueOf(initialized)); sb.append(",stateless=" + String.valueOf(stateless)); sb.append(",fail_back=" + String.valueOf(fail_back)); - sb.append(",auto_suspend=" + String.valueOf(auto_suspend)); sb.append(",usb_policy=" + String.valueOf(usb_policy)); sb.append(",time_zone=" + time_zone); sb.append(",cluster_configuration_version=" @@ -25041,12 +24903,6 @@ return this.fail_back; } - public Boolean auto_suspend; - - public Boolean getAuto_suspend() { - return this.auto_suspend; - } - public Short usb_policy; public Short getUsb_policy() { @@ -25252,13 +25108,6 @@ length = dis.readByte(); if (length == -1) { - this.auto_suspend = null; - } else { - this.auto_suspend = dis.readBoolean(); - } - - length = dis.readByte(); - if (length == -1) { this.usb_policy = null; } else { this.usb_policy = dis.readShort(); @@ -25405,15 +25254,6 @@ dos.writeBoolean(this.fail_back); } - // Boolean - - if (this.auto_suspend == null) { - dos.writeByte(-1); - } else { - dos.writeByte(0); - dos.writeBoolean(this.auto_suspend); - } - // Short if (this.usb_policy == null) { @@ -25473,7 +25313,6 @@ sb.append(",initialized=" + String.valueOf(initialized)); sb.append(",stateless=" + String.valueOf(stateless)); sb.append(",fail_back=" + String.valueOf(fail_back)); - sb.append(",auto_suspend=" + String.valueOf(auto_suspend)); sb.append(",usb_policy=" + String.valueOf(usb_policy)); sb.append(",time_zone=" + time_zone); sb.append(",cluster_configuration_version=" @@ -25577,7 +25416,7 @@ String insert_tJDBCOutput_19 = "INSERT INTO " + "vm_configuration" - + " (vm_id,vm_name,vm_description,vm_type,cluster_id,template_id,template_name,cpu_per_socket,number_of_sockets,memory_size_mb,operating_system,ad_domain,default_host,high_availability,initialized,stateless,fail_back,auto_suspend,usb_policy,time_zone,cluster_configuration_version,default_host_configuration_version,create_date,update_date,delete_date) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; + + " (vm_id,vm_name,vm_description,vm_type,cluster_id,template_id,template_name,cpu_per_socket,number_of_sockets,memory_size_mb,operating_system,ad_domain,default_host,high_availability,initialized,stateless,fail_back,usb_policy,time_zone,cluster_configuration_version,default_host_configuration_version,create_date,update_date,delete_date) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; java.sql.PreparedStatement pstmt_tJDBCOutput_19 = connection_tJDBCOutput_19 .prepareStatement(insert_tJDBCOutput_19); @@ -25639,7 +25478,7 @@ java.sql.Statement stmt_tJDBCInput_26 = conn_tJDBCInput_26 .createStatement(); - String dbquery_tJDBCInput_26 = "SELECT history_id, vm_id, upper(cast(vm_id as char(36))) as vm_join_id, vm_name, vm_description, vm_type, cluster_id, template_id, template_name, cpu_per_socket, number_of_sockets, memory_size_mb, operating_system, ad_domain, default_host, high_availability, initialized, stateless, fail_back, auto_suspend, usb_policy, time_zone, cluster_configuration_version, default_host_configuration_version, create_date, update_date FROM v3_2_latest_configuration_vms"; + String dbquery_tJDBCInput_26 = "SELECT history_id, vm_id, upper(cast(vm_id as char(36))) as vm_join_id, vm_name, vm_description, vm_type, cluster_id, template_id, template_name, cpu_per_socket, number_of_sockets, memory_size_mb, operating_system, ad_domain, default_host, high_availability, initialized, stateless, fail_back, usb_policy, time_zone, cluster_configuration_version, default_host_configuration_version, create_date, update_date FROM v3_2_latest_configuration_vms"; globalMap.put("tJDBCInput_26_QUERY", dbquery_tJDBCInput_26); @@ -25935,26 +25774,11 @@ } } if (colQtyInRs_tJDBCInput_26 < 20) { - row25.auto_suspend = null; - } else { - - if (rs_tJDBCInput_26.getObject(20) != null) { - row25.auto_suspend = rs_tJDBCInput_26 - .getBoolean(20); - } else { - row25.auto_suspend = null; - } - - if (rs_tJDBCInput_26.wasNull()) { - row25.auto_suspend = null; - } - } - if (colQtyInRs_tJDBCInput_26 < 21) { row25.usb_policy = null; } else { - if (rs_tJDBCInput_26.getObject(21) != null) { - row25.usb_policy = rs_tJDBCInput_26.getShort(21); + if (rs_tJDBCInput_26.getObject(20) != null) { + row25.usb_policy = rs_tJDBCInput_26.getShort(20); } else { row25.usb_policy = null; } @@ -25963,12 +25787,12 @@ row25.usb_policy = null; } } - if (colQtyInRs_tJDBCInput_26 < 22) { + if (colQtyInRs_tJDBCInput_26 < 21) { row25.time_zone = null; } else { tmpContent_tJDBCInput_26 = rs_tJDBCInput_26 - .getString(22); + .getString(21); if (tmpContent_tJDBCInput_26 != null) { row25.time_zone = tmpContent_tJDBCInput_26; } else { @@ -25979,13 +25803,13 @@ row25.time_zone = null; } } - if (colQtyInRs_tJDBCInput_26 < 23) { + if (colQtyInRs_tJDBCInput_26 < 22) { row25.cluster_configuration_version = null; } else { - if (rs_tJDBCInput_26.getObject(23) != null) { + if (rs_tJDBCInput_26.getObject(22) != null) { row25.cluster_configuration_version = rs_tJDBCInput_26 - .getInt(23); + .getInt(22); } else { row25.cluster_configuration_version = null; } @@ -25994,13 +25818,13 @@ row25.cluster_configuration_version = null; } } - if (colQtyInRs_tJDBCInput_26 < 24) { + if (colQtyInRs_tJDBCInput_26 < 23) { row25.default_host_configuration_version = null; } else { - if (rs_tJDBCInput_26.getObject(24) != null) { + if (rs_tJDBCInput_26.getObject(23) != null) { row25.default_host_configuration_version = rs_tJDBCInput_26 - .getInt(24); + .getInt(23); } else { row25.default_host_configuration_version = null; } @@ -26009,8 +25833,25 @@ row25.default_host_configuration_version = null; } } - if (colQtyInRs_tJDBCInput_26 < 25) { + if (colQtyInRs_tJDBCInput_26 < 24) { row25.create_date = null; + } else { + + java.util.Date date_tJDBCInput_26 = null; + try { + date_tJDBCInput_26 = rs_tJDBCInput_26 + .getTimestamp(24); + } catch (Exception e) { + date_tJDBCInput_26 = rs_tJDBCInput_26.getDate(24); + } + row25.create_date = date_tJDBCInput_26; + + if (rs_tJDBCInput_26.wasNull()) { + row25.create_date = null; + } + } + if (colQtyInRs_tJDBCInput_26 < 25) { + row25.update_date = null; } else { java.util.Date date_tJDBCInput_26 = null; @@ -26019,23 +25860,6 @@ .getTimestamp(25); } catch (Exception e) { date_tJDBCInput_26 = rs_tJDBCInput_26.getDate(25); - } - row25.create_date = date_tJDBCInput_26; - - if (rs_tJDBCInput_26.wasNull()) { - row25.create_date = null; - } - } - if (colQtyInRs_tJDBCInput_26 < 26) { - row25.update_date = null; - } else { - - java.util.Date date_tJDBCInput_26 = null; - try { - date_tJDBCInput_26 = rs_tJDBCInput_26 - .getTimestamp(26); - } catch (Exception e) { - date_tJDBCInput_26 = rs_tJDBCInput_26.getDate(26); } row25.update_date = date_tJDBCInput_26; @@ -26158,7 +25982,6 @@ delete_vms_tmp.initialized = row25.initialized; delete_vms_tmp.stateless = row25.stateless; delete_vms_tmp.fail_back = row25.fail_back; - delete_vms_tmp.auto_suspend = row25.auto_suspend; delete_vms_tmp.usb_policy = row25.usb_policy; delete_vms_tmp.time_zone = row25.time_zone; delete_vms_tmp.cluster_configuration_version = row25.cluster_configuration_version; @@ -26319,72 +26142,64 @@ delete_vms.fail_back); } - if (delete_vms.auto_suspend == null) { - pstmt_tJDBCOutput_19.setNull(18, - java.sql.Types.BOOLEAN); - } else { - pstmt_tJDBCOutput_19.setBoolean(18, - delete_vms.auto_suspend); - } - if (delete_vms.usb_policy == null) { - pstmt_tJDBCOutput_19.setNull(19, + pstmt_tJDBCOutput_19.setNull(18, java.sql.Types.INTEGER); } else { - pstmt_tJDBCOutput_19.setShort(19, + pstmt_tJDBCOutput_19.setShort(18, delete_vms.usb_policy); } if (delete_vms.time_zone == null) { - pstmt_tJDBCOutput_19.setNull(20, + pstmt_tJDBCOutput_19.setNull(19, java.sql.Types.VARCHAR); } else { - pstmt_tJDBCOutput_19.setString(20, + pstmt_tJDBCOutput_19.setString(19, delete_vms.time_zone); } if (delete_vms.cluster_configuration_version == null) { - pstmt_tJDBCOutput_19.setNull(21, + pstmt_tJDBCOutput_19.setNull(20, java.sql.Types.INTEGER); } else { - pstmt_tJDBCOutput_19.setInt(21, + pstmt_tJDBCOutput_19.setInt(20, delete_vms.cluster_configuration_version); } if (delete_vms.default_host_configuration_version == null) { - pstmt_tJDBCOutput_19.setNull(22, + pstmt_tJDBCOutput_19.setNull(21, java.sql.Types.INTEGER); } else { pstmt_tJDBCOutput_19 .setInt( - 22, + 21, delete_vms.default_host_configuration_version); } if (delete_vms.create_date != null) { - pstmt_tJDBCOutput_19.setTimestamp(23, + pstmt_tJDBCOutput_19.setTimestamp(22, new java.sql.Timestamp( delete_vms.create_date.getTime())); + } else { + pstmt_tJDBCOutput_19.setNull(22, + java.sql.Types.DATE); + } + + if (delete_vms.update_date != null) { + pstmt_tJDBCOutput_19.setTimestamp(23, + new java.sql.Timestamp( + delete_vms.update_date.getTime())); } else { pstmt_tJDBCOutput_19.setNull(23, java.sql.Types.DATE); } - if (delete_vms.update_date != null) { - pstmt_tJDBCOutput_19.setTimestamp(24, - new java.sql.Timestamp( - delete_vms.update_date.getTime())); - } else { - pstmt_tJDBCOutput_19.setNull(24, - java.sql.Types.DATE); - } - if (delete_vms.delete_date != null) { - pstmt_tJDBCOutput_19.setTimestamp(25, + pstmt_tJDBCOutput_19.setTimestamp(24, new java.sql.Timestamp( delete_vms.delete_date.getTime())); } else { - pstmt_tJDBCOutput_19.setNull(25, + pstmt_tJDBCOutput_19.setNull(24, java.sql.Types.DATE); } @@ -57647,6 +57462,6 @@ ResumeUtil resumeUtil = null; } /************************************************************************************************ - * 1566491 characters generated by Talend Open Studio for Data Integration on - * the November 19, 2012 6:18:57 PM IST + * 1561144 characters generated by Talend Open Studio for Data Integration on + * the January 2, 2013 5:00:26 PM IST ************************************************************************************************/ diff --git a/data-warehouse/history_etl/tos_project/process/ConfigurationSync_3.2.item b/data-warehouse/history_etl/tos_project/process/ConfigurationSync_3.2.item index 88c2f6a..76b6dae 100644 --- a/data-warehouse/history_etl/tos_project/process/ConfigurationSync_3.2.item +++ b/data-warehouse/history_etl/tos_project/process/ConfigurationSync_3.2.item @@ -1444,7 +1444,7 @@ <elementParameter field="TECHNICAL" name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/> <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" value="BUILT_IN"/> <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" value=""""/> - <elementParameter field="MEMO_SQL" name="QUERY" value=""SELECT 
 vm_id, 
 vm_name, 
 vm_description, 
 vm_type, 
 cluster_id,
 upper(cast(cluster_id as char(36))) as cluster_join_id, 
 template_id, 
 template_name, 
 cpu_per_socket, 
 number_of_sockets, 
 memory_size_mb, 
 operating_system, 
 ad_domain, 
 default_host,
 upper(cast(default_host as char(36))) as default_host_join_id, 
 high_availability, 
 initialized, 
 stateless, 
 fail_back, 
 auto_suspend, 
 usb_policy, 
 time_zone, 
 create_date, 
 update_date
FROM dwh_vm_configuration_history_view""/> + <elementParameter field="MEMO_SQL" name="QUERY" value=""SELECT 
 vm_id, 
 vm_name, 
 vm_description, 
 vm_type, 
 cluster_id,
 upper(cast(cluster_id as char(36))) as cluster_join_id, 
 template_id, 
 template_name, 
 cpu_per_socket, 
 number_of_sockets, 
 memory_size_mb, 
 operating_system, 
 ad_domain, 
 default_host,
 upper(cast(default_host as char(36))) as default_host_join_id, 
 high_availability, 
 initialized, 
 stateless, 
 fail_back, 
 usb_policy, 
 time_zone, 
 create_date, 
 update_date
FROM dwh_vm_configuration_history_view""/> <elementParameter field="ENCODING_TYPE" name="ENCODING" value=""ISO-8859-15""/> <elementParameter field="TECHNICAL" name="ENCODING:ENCODING_TYPE" value="ISO-8859-15"/> <elementParameter field="CHECK" name="USE_CURSOR" value="false"/> @@ -1489,13 +1489,11 @@ <elementValue elementRef="TRIM" value="false"/> <elementValue elementRef="SCHEMA_COLUMN" value="fail_back"/> <elementValue elementRef="TRIM" value="false"/> - <elementValue elementRef="SCHEMA_COLUMN" value="auto_suspend"/> + <elementValue elementRef="SCHEMA_COLUMN" value="update_date"/> <elementValue elementRef="TRIM" value="false"/> - <elementValue elementRef="SCHEMA_COLUMN" value="usb_policy"/> + <elementValue elementRef="SCHEMA_COLUMN" value="update_date"/> <elementValue elementRef="TRIM" value="false"/> - <elementValue elementRef="SCHEMA_COLUMN" value="time_zone"/> - <elementValue elementRef="TRIM" value="false"/> - <elementValue elementRef="SCHEMA_COLUMN" value="create_date"/> + <elementValue elementRef="SCHEMA_COLUMN" value="update_date"/> <elementValue elementRef="TRIM" value="false"/> <elementValue elementRef="SCHEMA_COLUMN" value="update_date"/> <elementValue elementRef="TRIM" value="false"/> @@ -1525,7 +1523,6 @@ <column comment="" key="false" length="1" name="initialized" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="stateless" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="fail_back" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> - <column comment="" key="false" length="1" name="auto_suspend" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="2" name="usb_policy" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" key="false" length="40" name="time_zone" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="8" name="create_date" nullable="true" pattern=""yyyy-MM-dd HH:mm:ss.SSSSSS"" precision="6" sourceType="TIMESTAMP" type="id_Date"/> @@ -1563,7 +1560,6 @@ <column comment="" key="false" length="1" name="initialized" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="stateless" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="fail_back" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> - <column comment="" defaultValue=""false"" key="false" length="1" name="auto_suspend" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="2" name="usb_policy" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" key="false" length="40" name="time_zone" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="4" name="cluster_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1573,7 +1569,7 @@ <column comment="" key="false" length="8" name="delete_date" nullable="true" pattern=""yyyy-MM-dd HH:mm:ss.SSSSSS"" precision="6" sourceType="TIMESTAMP" type="id_Date"/> </metadata> <nodeData xsi:type="MapperData"> - <uiProperties/> + <uiProperties shellMaximized="true"/> <varTables sizeState="INTERMEDIATE" name="Var" minimized="true"/> <outputTables sizeState="INTERMEDIATE" name="vm_configuration"> <mapperTableEntries name="vm_id" expression="row4.vm_id" type="id_Object"/> @@ -1593,7 +1589,6 @@ <mapperTableEntries name="initialized" expression="row4.initialized" type="id_Boolean" nullable="true"/> <mapperTableEntries name="stateless" expression="row4.stateless" type="id_Boolean" nullable="true"/> <mapperTableEntries name="fail_back" expression="row4.fail_back" type="id_Boolean" nullable="true"/> - <mapperTableEntries name="auto_suspend" expression="row4.auto_suspend" type="id_Boolean" nullable="true"/> <mapperTableEntries name="usb_policy" expression="row4.usb_policy" type="id_Short" nullable="true"/> <mapperTableEntries name="time_zone" expression="StringHandling.TRIM(row4.time_zone)" type="id_String" nullable="true"/> <mapperTableEntries name="cluster_configuration_version" expression="row39.history_id " type="id_Integer" nullable="true"/> @@ -1622,7 +1617,6 @@ <mapperTableEntries name="initialized" type="id_Boolean" nullable="true"/> <mapperTableEntries name="stateless" type="id_Boolean" nullable="true"/> <mapperTableEntries name="fail_back" type="id_Boolean" nullable="true"/> - <mapperTableEntries name="auto_suspend" type="id_Boolean" nullable="true"/> <mapperTableEntries name="usb_policy" type="id_Short" nullable="true"/> <mapperTableEntries name="time_zone" type="id_String" nullable="true"/> <mapperTableEntries name="create_date" type="id_Date" nullable="true"/> @@ -1814,11 +1808,6 @@ <elementValue elementRef="DELETE_KEY" value="false"/> <elementValue elementRef="UPDATABLE" value="true"/> <elementValue elementRef="INSERTABLE" value="true"/> - <elementValue elementRef="SCHEMA_COLUMN" value="auto_suspend"/> - <elementValue elementRef="UPDATE_KEY" value="false"/> - <elementValue elementRef="DELETE_KEY" value="false"/> - <elementValue elementRef="UPDATABLE" value="true"/> - <elementValue elementRef="INSERTABLE" value="true"/> <elementValue elementRef="SCHEMA_COLUMN" value="usb_policy"/> <elementValue elementRef="UPDATE_KEY" value="false"/> <elementValue elementRef="DELETE_KEY" value="false"/> @@ -1880,7 +1869,6 @@ <column comment="" key="false" length="1" name="initialized" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="stateless" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="fail_back" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> - <column comment="" defaultValue=""false"" key="false" length="1" name="auto_suspend" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="2" name="usb_policy" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" key="false" length="40" name="time_zone" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="4" name="cluster_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1907,7 +1895,6 @@ <column comment="" key="false" length="1" name="initialized" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="stateless" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="fail_back" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> - <column comment="" defaultValue=""false"" key="false" length="1" name="auto_suspend" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="2" name="usb_policy" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" key="false" length="40" name="time_zone" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="4" name="cluster_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -3903,7 +3890,7 @@ <elementParameter field="TECHNICAL" name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/> <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" value="BUILT_IN"/> <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" value=""""/> - <elementParameter field="MEMO_SQL" name="QUERY" value=""SELECT history_id, 
		vm_id, 
		upper(cast(vm_id as char(36))) as vm_join_id,
		vm_name, 
		vm_description, 
		vm_type, 
		cluster_id, 
		template_id, 
		template_name, 
		cpu_per_socket, 
		number_of_sockets, 
		memory_size_mb, 
		operating_system, 
		ad_domain, 
		default_host, 
		high_availability, 
		initialized, 
		stateless, 
		fail_back, 
		auto_suspend, 
		usb_policy, 
		time_zone, 
		cluster_configuration_version, 
		default_host_configuration_version, 
		create_date, 
		update_date&#! xD;
FROM v3_2_latest_configuration_vms""/> + <elementParameter field="MEMO_SQL" name="QUERY" value=""SELECT history_id, 
		vm_id, 
		upper(cast(vm_id as char(36))) as vm_join_id,
		vm_name, 
		vm_description, 
		vm_type, 
		cluster_id, 
		template_id, 
		template_name, 
		cpu_per_socket, 
		number_of_sockets, 
		memory_size_mb, 
		operating_system, 
		ad_domain, 
		default_host, 
		high_availability, 
		initialized, 
		stateless, 
		fail_back, 
		usb_policy, 
		time_zone, 
		cluster_configuration_version, 
		default_host_configuration_version, 
		create_date, 
		update_date
FROM v3_2_latest_configura! tion_vms""/> <elementParameter field="ENCODING_TYPE" name="ENCODING" value=""ISO-8859-15""/> <elementParameter field="TECHNICAL" name="ENCODING:ENCODING_TYPE" value="ISO-8859-15"/> <elementParameter field="CHECK" name="USE_CURSOR" value="false"/> @@ -3948,17 +3935,15 @@ <elementValue elementRef="TRIM" value="false"/> <elementValue elementRef="SCHEMA_COLUMN" value="fail_back"/> <elementValue elementRef="TRIM" value="false"/> - <elementValue elementRef="SCHEMA_COLUMN" value="auto_suspend"/> + <elementValue elementRef="SCHEMA_COLUMN" value="update_date"/> <elementValue elementRef="TRIM" value="false"/> - <elementValue elementRef="SCHEMA_COLUMN" value="usb_policy"/> + <elementValue elementRef="SCHEMA_COLUMN" value="update_date"/> <elementValue elementRef="TRIM" value="false"/> - <elementValue elementRef="SCHEMA_COLUMN" value="time_zone"/> + <elementValue elementRef="SCHEMA_COLUMN" value="update_date"/> <elementValue elementRef="TRIM" value="false"/> - <elementValue elementRef="SCHEMA_COLUMN" value="cluster_configuration_version"/> + <elementValue elementRef="SCHEMA_COLUMN" value="update_date"/> <elementValue elementRef="TRIM" value="false"/> - <elementValue elementRef="SCHEMA_COLUMN" value="default_host_configuration_version"/> - <elementValue elementRef="TRIM" value="false"/> - <elementValue elementRef="SCHEMA_COLUMN" value="create_date"/> + <elementValue elementRef="SCHEMA_COLUMN" value="update_date"/> <elementValue elementRef="TRIM" value="false"/> <elementValue elementRef="SCHEMA_COLUMN" value="update_date"/> <elementValue elementRef="TRIM" value="false"/> @@ -3988,7 +3973,6 @@ <column comment="" key="false" length="1" name="initialized" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="stateless" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="fail_back" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> - <column comment="" key="false" length="1" name="auto_suspend" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="2" name="usb_policy" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" key="false" length="40" name="time_zone" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="4" name="cluster_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -4061,7 +4045,6 @@ <column comment="" key="false" length="1" name="initialized" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="stateless" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="fail_back" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> - <column comment="" defaultValue=""false"" key="false" length="1" name="auto_suspend" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="2" name="usb_policy" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" key="false" length="40" name="time_zone" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="4" name="cluster_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -4071,7 +4054,7 @@ <column comment="" key="false" length="8" name="delete_date" nullable="true" pattern=""yyyy-MM-dd HH:mm:ss.SSSSSS"" precision="6" sourceType="TIMESTAMP" type="id_Date"/> </metadata> <nodeData xsi:type="MapperData"> - <uiProperties/> + <uiProperties shellMaximized="true"/> <varTables sizeState="INTERMEDIATE" name="Var"/> <outputTables sizeState="INTERMEDIATE" name="delete_vms" activateCondensedTool="true" rejectInnerJoin="true"> <mapperTableEntries name="vm_id" expression="row25.vm_id" type="id_Object"/> @@ -4091,7 +4074,6 @@ <mapperTableEntries name="initialized" expression="row25.initialized" type="id_Boolean" nullable="true"/> <mapperTableEntries name="stateless" expression="row25.stateless" type="id_Boolean" nullable="true"/> <mapperTableEntries name="fail_back" expression="row25.fail_back" type="id_Boolean" nullable="true"/> - <mapperTableEntries name="auto_suspend" expression="row25.auto_suspend" type="id_Boolean" nullable="true"/> <mapperTableEntries name="usb_policy" expression="row25.usb_policy" type="id_Short" nullable="true"/> <mapperTableEntries name="time_zone" expression="row25.time_zone" type="id_String" nullable="true"/> <mapperTableEntries name="cluster_configuration_version" expression="row25.cluster_configuration_version" type="id_Integer" nullable="true"/> @@ -4120,7 +4102,6 @@ <mapperTableEntries name="initialized" type="id_Boolean" nullable="true"/> <mapperTableEntries name="stateless" type="id_Boolean" nullable="true"/> <mapperTableEntries name="fail_back" type="id_Boolean" nullable="true"/> - <mapperTableEntries name="auto_suspend" type="id_Boolean" nullable="true"/> <mapperTableEntries name="usb_policy" type="id_Short" nullable="true"/> <mapperTableEntries name="time_zone" type="id_String" nullable="true"/> <mapperTableEntries name="cluster_configuration_version" type="id_Integer" nullable="true"/> @@ -4237,11 +4218,6 @@ <elementValue elementRef="DELETE_KEY" value="false"/> <elementValue elementRef="UPDATABLE" value="true"/> <elementValue elementRef="INSERTABLE" value="true"/> - <elementValue elementRef="SCHEMA_COLUMN" value="auto_suspend"/> - <elementValue elementRef="UPDATE_KEY" value="false"/> - <elementValue elementRef="DELETE_KEY" value="false"/> - <elementValue elementRef="UPDATABLE" value="true"/> - <elementValue elementRef="INSERTABLE" value="true"/> <elementValue elementRef="SCHEMA_COLUMN" value="usb_policy"/> <elementValue elementRef="UPDATE_KEY" value="false"/> <elementValue elementRef="DELETE_KEY" value="false"/> @@ -4303,7 +4279,6 @@ <column comment="" key="false" length="1" name="initialized" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="stateless" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="fail_back" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> - <column comment="" defaultValue=""false"" key="false" length="1" name="auto_suspend" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="2" name="usb_policy" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" key="false" length="40" name="time_zone" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="4" name="cluster_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -4330,7 +4305,6 @@ <column comment="" key="false" length="1" name="initialized" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="stateless" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="1" name="fail_back" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> - <column comment="" defaultValue=""false"" key="false" length="1" name="auto_suspend" nullable="true" pattern="" precision="0" sourceType="BOOL" type="id_Boolean"/> <column comment="" key="false" length="2" name="usb_policy" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" key="false" length="40" name="time_zone" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="4" name="cluster_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -6650,6 +6624,7 @@ <elementParameter field="TEXT" name="DRIVER_CLASS" value=""""/> <elementParameter field="TEXT" name="USER" value=""""/> <elementParameter field="TEXT" name="PASS" value=""""/> + <elementParameter field="DBTABLE" name="TABLE" value=""""/> <elementParameter field="QUERYSTORE_TYPE" name="QUERYSTORE" value=""""/> <elementParameter field="TECHNICAL" name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/> <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" value="BUILT_IN"/> @@ -7139,7 +7114,7 @@ <column comment="" key="false" length="8" name="delete_date" nullable="true" pattern=""yyyy-MM-dd HH:mm:ss.SSSSSS"" precision="6" sourceType="TIMESTAMP" type="id_Date"/> </metadata> <nodeData xsi:type="MapperData"> - <uiProperties shellMaximized="true"/> + <uiProperties/> <varTables sizeState="INTERMEDIATE" name="Var"/> <outputTables sizeState="INTERMEDIATE" name="insert_new_vm_device_connection"> <mapperTableEntries name="vm_id" expression="row45.vm_id " type="id_Object"/> diff --git a/data-warehouse/history_etl/tos_project/process/ConfigurationSync_3.2.properties b/data-warehouse/history_etl/tos_project/process/ConfigurationSync_3.2.properties index ecc9bf9..0cfd59d 100644 --- a/data-warehouse/history_etl/tos_project/process/ConfigurationSync_3.2.properties +++ b/data-warehouse/history_etl/tos_project/process/ConfigurationSync_3.2.properties @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"; xmlns:TalendProperties="http://www.talend.org/properties";> - <TalendProperties:Property xmi:id="_sTiOMEP_EeC5PvJxFZIIsw" id="_sTgZAEP_EeC5PvJxFZIIsw" label="ConfigurationSync" creationDate="2011-07-06T14:17:03.952+0300" modificationDate="2012-07-16T20:15:17.174+0300" version="3.2" statusCode="" item="_sTiOMkP_EeC5PvJxFZIIsw" displayName="ConfigurationSync"> + <TalendProperties:Property xmi:id="_sTiOMEP_EeC5PvJxFZIIsw" id="_sTgZAEP_EeC5PvJxFZIIsw" label="ConfigurationSync" creationDate="2011-07-06T14:17:03.952+0300" modificationDate="2013-01-02T16:59:37.912+0200" version="3.2" statusCode="" item="_sTiOMkP_EeC5PvJxFZIIsw" displayName="ConfigurationSync"> <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_sTiOMUP_EeC5PvJxFZIIsw" path=""/> diff --git a/data-warehouse/historydbscripts_postgres/create_views_3_0.sql b/data-warehouse/historydbscripts_postgres/create_views_3_0.sql index 2074aee..4b2ff27 100644 --- a/data-warehouse/historydbscripts_postgres/create_views_3_0.sql +++ b/data-warehouse/historydbscripts_postgres/create_views_3_0.sql @@ -437,7 +437,7 @@ initialized as initialized, stateless as stateless, fail_back as fail_back, - auto_suspend as auto_suspend, + FALSE as auto_suspend, usb_policy as usb_policy, time_zone as time_zone, cluster_configuration_version as cluster_configuration_version, @@ -468,7 +468,7 @@ initialized as initialized, stateless as stateless, fail_back as fail_back, - auto_suspend as auto_suspend, + FALSE as auto_suspend, usb_policy as usb_policy, time_zone as time_zone, cluster_configuration_version as cluster_configuration_version, diff --git a/data-warehouse/historydbscripts_postgres/create_views_3_1.sql b/data-warehouse/historydbscripts_postgres/create_views_3_1.sql index 5fa71e2..da4f777 100644 --- a/data-warehouse/historydbscripts_postgres/create_views_3_1.sql +++ b/data-warehouse/historydbscripts_postgres/create_views_3_1.sql @@ -441,7 +441,7 @@ initialized as initialized, stateless as stateless, fail_back as fail_back, - auto_suspend as auto_suspend, + FALSE as auto_suspend, usb_policy as usb_policy, time_zone as time_zone, cluster_configuration_version as cluster_configuration_version, @@ -472,7 +472,7 @@ initialized as initialized, stateless as stateless, fail_back as fail_back, - auto_suspend as auto_suspend, + FALSE as auto_suspend, usb_policy as usb_policy, time_zone as time_zone, cluster_configuration_version as cluster_configuration_version, diff --git a/data-warehouse/historydbscripts_postgres/create_views_3_2.sql b/data-warehouse/historydbscripts_postgres/create_views_3_2.sql index 581e986..f9342ae 100644 --- a/data-warehouse/historydbscripts_postgres/create_views_3_2.sql +++ b/data-warehouse/historydbscripts_postgres/create_views_3_2.sql @@ -441,7 +441,6 @@ initialized as initialized, stateless as stateless, fail_back as fail_back, - auto_suspend as auto_suspend, usb_policy as usb_policy, time_zone as time_zone, cluster_configuration_version as cluster_configuration_version, @@ -472,7 +471,6 @@ initialized as initialized, stateless as stateless, fail_back as fail_back, - auto_suspend as auto_suspend, usb_policy as usb_policy, time_zone as time_zone, cluster_configuration_version as cluster_configuration_version, diff --git a/data-warehouse/historydbscripts_postgres/upgrade/03_02_0030_drop_auto_suspend_column.sql b/data-warehouse/historydbscripts_postgres/upgrade/03_02_0030_drop_auto_suspend_column.sql new file mode 100644 index 0000000..2c4c714 --- /dev/null +++ b/data-warehouse/historydbscripts_postgres/upgrade/03_02_0030_drop_auto_suspend_column.sql @@ -0,0 +1 @@ +ALTER TABLE vm_configuration DROP COLUMN IF EXISTS auto_suspend; -- To view, visit http://gerrit.ovirt.org/10574 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib287d10153e48074621724dc932ea9c5f41d11bf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <yd...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
