Yaniv Dary has uploaded a new change for review. Change subject: etl: fixed issue with os info enum updates ......................................................................
etl: fixed issue with os info enum updates Change-Id: I0fc626f27feb9667f91c42ec11de23bab700008a Signed-off-by: Yaniv Dary <[email protected]> --- M data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/osenumupdate_3_3/OsEnumUpdate.java M data-warehouse/history_etl/tos_project/process/OsEnumUpdate_3.3.item M data-warehouse/history_etl/tos_project/process/OsEnumUpdate_3.3.properties M data-warehouse/history_etl/tos_project/talend.project 4 files changed, 62 insertions(+), 535 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/90/19690/1 diff --git a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/osenumupdate_3_3/OsEnumUpdate.java b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/osenumupdate_3_3/OsEnumUpdate.java index 129fd38..82f0dac 100644 --- a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/osenumupdate_3_3/OsEnumUpdate.java +++ b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/osenumupdate_3_3/OsEnumUpdate.java @@ -482,16 +482,6 @@ tJDBCInput_2_onSubJobError(exception, errorComponent, globalMap); } - public void tMap_1_error(java.lang.Exception exception, - String errorComponent, final java.util.Map<String, Object> globalMap) - throws TalendException { - end_Hash.put("tMap_1", System.currentTimeMillis()); - - status = "failure"; - - tJDBCInput_2_onSubJobError(exception, errorComponent, globalMap); - } - public void tJDBCOutput_1_error(java.lang.Exception exception, String errorComponent, final java.util.Map<String, Object> globalMap) throws TalendException { @@ -1846,8 +1836,8 @@ globalMap.put("tRowGenerator_1_SUBPROCESS_STATE", 1); } - public static class host_changesStruct implements - routines.system.IPersistableRow<host_changesStruct> { + public static class row2Struct implements + routines.system.IPersistableRow<row2Struct> { final static byte[] commonByteArrayLock_OVIRT_ENGINE_DWH_OsEnumUpdate = new byte[0]; static byte[] commonByteArray_OVIRT_ENGINE_DWH_OsEnumUpdate = new byte[0]; protected static final int DEFAULT_HASHCODE = 1; @@ -1916,7 +1906,7 @@ return false; if (getClass() != obj.getClass()) return false; - final host_changesStruct other = (host_changesStruct) obj; + final row2Struct other = (row2Struct) obj; if (this.enum_type == null) { if (other.enum_type != null) @@ -1939,7 +1929,7 @@ return true; } - public void copyDataTo(host_changesStruct other) { + public void copyDataTo(row2Struct other) { other.enum_type = this.enum_type; other.enum_key = this.enum_key; @@ -1948,200 +1938,12 @@ } - public void copyKeysDataTo(host_changesStruct other) { + public void copyKeysDataTo(row2Struct other) { other.enum_type = this.enum_type; other.enum_key = this.enum_key; other.language_code = this.language_code; - } - - private String readString(ObjectInputStream dis) throws IOException { - String strReturn = null; - int length = 0; - length = dis.readInt(); - if (length == -1) { - strReturn = null; - } else { - if (length > commonByteArray_OVIRT_ENGINE_DWH_OsEnumUpdate.length) { - if (length < 1024 - && commonByteArray_OVIRT_ENGINE_DWH_OsEnumUpdate.length == 0) { - commonByteArray_OVIRT_ENGINE_DWH_OsEnumUpdate = new byte[1024]; - } else { - commonByteArray_OVIRT_ENGINE_DWH_OsEnumUpdate = new byte[2 * length]; - } - } - dis.readFully(commonByteArray_OVIRT_ENGINE_DWH_OsEnumUpdate, 0, - length); - strReturn = new String( - commonByteArray_OVIRT_ENGINE_DWH_OsEnumUpdate, 0, - length, utf8Charset); - } - return strReturn; - } - - private void writeString(String str, ObjectOutputStream dos) - throws IOException { - if (str == null) { - dos.writeInt(-1); - } else { - byte[] byteArray = str.getBytes(utf8Charset); - dos.writeInt(byteArray.length); - dos.write(byteArray); - } - } - - public void readData(ObjectInputStream dis) { - - synchronized (commonByteArrayLock_OVIRT_ENGINE_DWH_OsEnumUpdate) { - - try { - - int length = 0; - - this.enum_type = readString(dis); - - length = dis.readByte(); - if (length == -1) { - this.enum_key = null; - } else { - this.enum_key = dis.readShort(); - } - - this.language_code = readString(dis); - - this.value = readString(dis); - - } catch (IOException e) { - throw new RuntimeException(e); - - } - - } - - } - - public void writeData(ObjectOutputStream dos) { - try { - - // String - - writeString(this.enum_type, dos); - - // Short - - if (this.enum_key == null) { - dos.writeByte(-1); - } else { - dos.writeByte(0); - dos.writeShort(this.enum_key); - } - - // String - - writeString(this.language_code, dos); - - // String - - writeString(this.value, dos); - - } catch (IOException e) { - throw new RuntimeException(e); - } - - } - - public String toString() { - - StringBuilder sb = new StringBuilder(); - sb.append(super.toString()); - sb.append("["); - sb.append("enum_type=" + enum_type); - sb.append(",enum_key=" + String.valueOf(enum_key)); - sb.append(",language_code=" + language_code); - sb.append(",value=" + value); - sb.append("]"); - - return sb.toString(); - } - - /** - * Compare keys - */ - public int compareTo(host_changesStruct other) { - - int returnValue = -1; - - returnValue = checkNullsAndCompare(this.enum_type, other.enum_type); - if (returnValue != 0) { - return returnValue; - } - - returnValue = checkNullsAndCompare(this.enum_key, other.enum_key); - if (returnValue != 0) { - return returnValue; - } - - returnValue = checkNullsAndCompare(this.language_code, - other.language_code); - if (returnValue != 0) { - return returnValue; - } - - return returnValue; - } - - private int checkNullsAndCompare(Object object1, Object object2) { - int returnValue = 0; - if (object1 instanceof Comparable && object2 instanceof Comparable) { - returnValue = ((Comparable) object1).compareTo(object2); - } else if (object1 != null && object2 != null) { - returnValue = compareStrings(object1.toString(), - object2.toString()); - } else if (object1 == null && object2 != null) { - returnValue = 1; - } else if (object1 != null && object2 == null) { - returnValue = -1; - } else { - returnValue = 0; - } - - return returnValue; - } - - private int compareStrings(String string1, String string2) { - return string1.compareTo(string2); - } - - } - - public static class row2Struct implements - routines.system.IPersistableRow<row2Struct> { - final static byte[] commonByteArrayLock_OVIRT_ENGINE_DWH_OsEnumUpdate = new byte[0]; - static byte[] commonByteArray_OVIRT_ENGINE_DWH_OsEnumUpdate = new byte[0]; - - public String enum_type; - - public String getEnum_type() { - return this.enum_type; - } - - public Short enum_key; - - public Short getEnum_key() { - return this.enum_key; - } - - public String language_code; - - public String getLanguage_code() { - return this.language_code; - } - - public String value; - - public String getValue() { - return this.value; } private String readString(ObjectInputStream dis) throws IOException { @@ -2260,6 +2062,22 @@ int returnValue = -1; + returnValue = checkNullsAndCompare(this.enum_type, other.enum_type); + if (returnValue != 0) { + return returnValue; + } + + returnValue = checkNullsAndCompare(this.enum_key, other.enum_key); + if (returnValue != 0) { + return returnValue; + } + + returnValue = checkNullsAndCompare(this.language_code, + other.language_code); + if (returnValue != 0) { + return returnValue; + } + return returnValue; } @@ -2309,7 +2127,6 @@ globalResumeTicket = true; row2Struct row2 = new row2Struct(); - host_changesStruct host_changes = new host_changesStruct(); /** * [tJDBCOutput_1 begin ] start @@ -2356,36 +2173,6 @@ /** * [tJDBCOutput_1 begin ] stop - */ - - /** - * [tMap_1 begin ] start - */ - - ok_Hash.put("tMap_1", false); - start_Hash.put("tMap_1", System.currentTimeMillis()); - currentComponent = "tMap_1"; - - int tos_count_tMap_1 = 0; - - // ############################### - // # Lookup's keys initialization - // ############################### - - // ############################### - // # Vars initialization - class Var__tMap_1__Struct { - } - Var__tMap_1__Struct Var__tMap_1 = new Var__tMap_1__Struct(); - // ############################### - - // ############################### - // # Outputs initialization - host_changesStruct host_changes_tmp = new host_changesStruct(); - // ############################### - - /** - * [tMap_1 begin ] stop */ /** @@ -2519,100 +2306,50 @@ */ /** - * [tMap_1 main ] start + * [tJDBCOutput_1 main ] start */ - currentComponent = "tMap_1"; + currentComponent = "tJDBCOutput_1"; - boolean hasCasePrimitiveKeyWithNull_tMap_1 = false; + whetherReject_tJDBCOutput_1 = false; + if (row2.enum_type == null) { + pstmt_tJDBCOutput_1.setNull(1, java.sql.Types.VARCHAR); + } else { + pstmt_tJDBCOutput_1.setString(1, row2.enum_type); + } - // ############################### - // # Input tables (lookups) - boolean rejectedInnerJoin_tMap_1 = false; - boolean mainRowRejected_tMap_1 = false; + if (row2.enum_key == null) { + pstmt_tJDBCOutput_1.setNull(2, java.sql.Types.INTEGER); + } else { + pstmt_tJDBCOutput_1.setShort(2, row2.enum_key); + } - // ############################### - { // start of Var scope + if (row2.language_code == null) { + pstmt_tJDBCOutput_1.setNull(3, java.sql.Types.VARCHAR); + } else { + pstmt_tJDBCOutput_1.setString(3, row2.language_code); + } - // ############################### - // # Vars tables + if (row2.value == null) { + pstmt_tJDBCOutput_1.setNull(4, java.sql.Types.VARCHAR); + } else { + pstmt_tJDBCOutput_1.setString(4, row2.value); + } - Var__tMap_1__Struct Var = Var__tMap_1;// ############################### - // ############################### - // # Output tables + try { + insertedCount_tJDBCOutput_1 = insertedCount_tJDBCOutput_1 + + pstmt_tJDBCOutput_1.executeUpdate(); + nb_line_tJDBCOutput_1++; + } catch (java.lang.Exception e) { + whetherReject_tJDBCOutput_1 = true; + throw (e); + } - host_changes = null; - - // ###### START REJECTS ##### - // ############################### - - } // end of Var scope - - rejectedInnerJoin_tMap_1 = false; - - tos_count_tMap_1++; + tos_count_tJDBCOutput_1++; /** - * [tMap_1 main ] stop + * [tJDBCOutput_1 main ] stop */ - // Start of branch "host_changes" - if (host_changes != null) { - - /** - * [tJDBCOutput_1 main ] start - */ - - currentComponent = "tJDBCOutput_1"; - - whetherReject_tJDBCOutput_1 = false; - if (host_changes.enum_type == null) { - pstmt_tJDBCOutput_1.setNull(1, - java.sql.Types.VARCHAR); - } else { - pstmt_tJDBCOutput_1.setString(1, - host_changes.enum_type); - } - - if (host_changes.enum_key == null) { - pstmt_tJDBCOutput_1.setNull(2, - java.sql.Types.INTEGER); - } else { - pstmt_tJDBCOutput_1.setShort(2, - host_changes.enum_key); - } - - if (host_changes.language_code == null) { - pstmt_tJDBCOutput_1.setNull(3, - java.sql.Types.VARCHAR); - } else { - pstmt_tJDBCOutput_1.setString(3, - host_changes.language_code); - } - - if (host_changes.value == null) { - pstmt_tJDBCOutput_1.setNull(4, - java.sql.Types.VARCHAR); - } else { - pstmt_tJDBCOutput_1 - .setString(4, host_changes.value); - } - - try { - insertedCount_tJDBCOutput_1 = insertedCount_tJDBCOutput_1 - + pstmt_tJDBCOutput_1.executeUpdate(); - nb_line_tJDBCOutput_1++; - } catch (java.lang.Exception e) { - whetherReject_tJDBCOutput_1 = true; - throw (e); - } - - tos_count_tJDBCOutput_1++; - - /** - * [tJDBCOutput_1 main ] stop - */ - - } // End of branch "host_changes" /** * [tJDBCInput_2 end ] start @@ -2631,23 +2368,6 @@ /** * [tJDBCInput_2 end ] stop - */ - - /** - * [tMap_1 end ] start - */ - - currentComponent = "tMap_1"; - - // ############################### - // # Lookup hashes releasing - // ############################### - - ok_Hash.put("tMap_1", true); - end_Hash.put("tMap_1", System.currentTimeMillis()); - - /** - * [tMap_1 end ] stop */ /** @@ -4525,6 +4245,6 @@ ResumeUtil resumeUtil = null; } /************************************************************************************************ - * 125510 characters generated by Talend Open Studio for Data Integration on the - * September 17, 2013 5:28:57 PM IDT + * 118753 characters generated by Talend Open Studio for Data Integration on the + * September 30, 2013 5:02:44 PM IDT ************************************************************************************************/ diff --git a/data-warehouse/history_etl/tos_project/process/OsEnumUpdate_3.3.item b/data-warehouse/history_etl/tos_project/process/OsEnumUpdate_3.3.item index fcc11ce..57697bd 100644 --- a/data-warehouse/history_etl/tos_project/process/OsEnumUpdate_3.3.item +++ b/data-warehouse/history_etl/tos_project/process/OsEnumUpdate_3.3.item @@ -144,43 +144,7 @@ <column comment="" key="false" name="value" nullable="true" pattern="" sourceType="" type="id_String" usefulColumn="true"/> </metadata> </node> - <node componentName="tMap" componentVersion="2.1" offsetLabelX="0" offsetLabelY="0" posX="576" posY="124"> - <elementParameter field="TEXT" name="UNIQUE_NAME" value="tMap_1"/> - <elementParameter field="EXTERNAL" name="MAP" value=""/> - <elementParameter field="CLOSED_LIST" name="LINK_STYLE" value="AUTO"/> - <elementParameter field="DIRECTORY" name="TEMPORARY_DATA_DIRECTORY" value=""/> - <elementParameter field="IMAGE" name="PREVIEW" value="_wS9RAB-CEeOn18i66-1ZcQ-tMap_1-PREVIEW.bmp"/> - <elementParameter field="CHECK" name="DIE_ON_ERROR" value="true"/> - <elementParameter field="CHECK" name="LKUP_PARALLELIZE" value="false"/> - <elementParameter field="TEXT" name="ROWS_BUFFER_SIZE" value="2000000"/> - <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/> - <elementParameter field="CHECK" name="INFORMATION" value="false"/> - <elementParameter field="MEMO" name="COMMENT" value=""/> - <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/> - <metadata connector="FLOW" label="host_configuration" name="host_changes"> - <column comment="" key="true" name="enum_type" nullable="true" pattern="" sourceType="" type="id_String" usefulColumn="true"/> - <column comment="" key="true" name="enum_key" nullable="true" pattern="" sourceType="" type="id_Short" usefulColumn="true"/> - <column comment="" key="true" name="language_code" nullable="true" pattern="" sourceType="" type="id_String" usefulColumn="true"/> - <column comment="" key="false" name="value" nullable="true" pattern="" sourceType="" type="id_String" usefulColumn="true"/> - </metadata> - <nodeData xsi:type="MapperData"> - <uiProperties/> - <varTables sizeState="INTERMEDIATE" name="Var"/> - <outputTables sizeState="INTERMEDIATE" name="host_changes" activateCondensedTool="true" rejectInnerJoin="true"> - <mapperTableEntries name="enum_type" type="id_String" nullable="true"/> - <mapperTableEntries name="enum_key" type="id_Short" nullable="true"/> - <mapperTableEntries name="language_code" type="id_String" nullable="true"/> - <mapperTableEntries name="value" type="id_String" nullable="true"/> - </outputTables> - <inputTables sizeState="INTERMEDIATE" name="row2" matchingMode="UNIQUE_MATCH" lookupMode="LOAD_ONCE"> - <mapperTableEntries name="enum_type" type="id_String" nullable="true"/> - <mapperTableEntries name="enum_key" type="id_Short" nullable="true"/> - <mapperTableEntries name="language_code" type="id_String" nullable="true"/> - <mapperTableEntries name="value" type="id_String" nullable="true"/> - </inputTables> - </nodeData> - </node> - <node componentName="tJDBCOutput" componentVersion="0.102" offsetLabelX="0" offsetLabelY="0" posX="576" posY="224"> + <node componentName="tJDBCOutput" componentVersion="0.102" offsetLabelX="0" offsetLabelY="0" posX="576" posY="128"> <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCOutput_1"/> <elementParameter field="CHECK" name="END_OF_FLOW" value="true"/> <elementParameter field="CHECK" name="USE_EXISTING_CONNECTION" value="true"/> @@ -363,7 +327,7 @@ <column comment="" key="false" length="35" name="var_datetime" nullable="true" pattern=""yyyy-MM-dd HH:mm:ss.SSSSSS"" precision="6" sourceType="DATETIME" type="id_Date" usefulColumn="true"/> </metadata> <nodeData xsi:type="MapperData"> - <uiProperties shellMaximized="true"/> + <uiProperties/> <varTables sizeState="INTERMEDIATE" name="Var" minimized="true"/> <outputTables sizeState="INTERMEDIATE" name="update_lastSync"> <mapperTableEntries name="var_name" expression="row4.var_name" type="id_String"/> @@ -508,82 +472,16 @@ <elementParameter field="CHECK" name="ACTIVATE" value="true"/> <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnComponentOk1"/> </connection> - <connection connectorName="FLOW" label="row2" lineStyle="0" metaname="tJDBCInput_2" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_2" target="tMap_1"> + <connection connectorName="FLOW" label="row2" lineStyle="0" metaname="tJDBCInput_2" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_2" target="tJDBCOutput_1"> <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" value="true"/> <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER"> - <elementValue elementRef="TRACE_COLUMN" value="host_id"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="host_unique_id"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="host_name"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="cluster_id"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="cluster_join_id"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="host_type"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="fqdn_or_ip"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="memory_size_mb"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="swap_size_mb"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="cpu_model"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="number_of_cores"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="host_os"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="pm_ip_address"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="kernel_version"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="kvm_version"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="vdsm_version"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="vdsm_port"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="create_date"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="update_date"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="host_join_id"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="cpu_speed_mh"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="number_of_sockets"/> + <elementValue elementRef="TRACE_COLUMN" value="enum_type"/> <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> <elementValue elementRef="TRACE_COLUMN" value="enum_key"/> <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> <elementValue elementRef="TRACE_COLUMN" value="language_code"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="enum_type"/> <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> <elementValue elementRef="TRACE_COLUMN" value="value"/> @@ -602,97 +500,6 @@ <connection connectorName="SUBJOB_OK" label="OnSubjobOk" lineStyle="1" metaname="tJDBCInput_2" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_2" target="tJDBCInput_5"> <elementParameter field="CHECK" name="ACTIVATE" value="true"/> <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnSubjobOk2"/> - </connection> - <connection connectorName="FLOW" label="host_changes" lineStyle="0" metaname="host_changes" offsetLabelX="0" offsetLabelY="0" source="tMap_1" target="tJDBCOutput_1"> - <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" value="true"/> - <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER"> - <elementValue elementRef="TRACE_COLUMN" value="pm_ip_address"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="memory_size_mb"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="kernel_version"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="host_unique_id"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="cluster_id"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="host_name"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="fqdn_or_ip"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="host_type"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="swap_size_mb"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="vdsm_port"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="host_id"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="create_date"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="host_os"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="delete_date"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="kvm_version"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="update_date"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="number_of_cores"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="cluster_configuration_version"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="cpu_model"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="vdsm_version"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="cpu_speed_mh"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="number_of_sockets"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="enum_key"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="language_code"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="enum_type"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - <elementValue elementRef="TRACE_COLUMN" value="value"/> - <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/> - <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/> - </elementParameter> - <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/> - <elementParameter field="CHECK" name="USEROWLABEL" value="true"/> - <elementParameter field="TEXT" name="METTERLABEL" value=""MyLabel""/> - <elementParameter field="CLOSED_LIST" name="ABSOLUTE" value="Absolute"/> - <elementParameter field="CONNECTION_LIST" name="CONNECTIONS" value=""/> - <elementParameter field="TABLE" name="THRESHLODS"/> - <elementParameter field="CHECK" name="ACTIVATE" value="true"/> - <elementParameter field="TEXT" name="UNIQUE_NAME" value="host_changes"/> </connection> <connection connectorName="FLOW" label="row3" lineStyle="0" metaname="tJDBCInput_4" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_4" target="tContextLoad_1"> <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" value="true"/> diff --git a/data-warehouse/history_etl/tos_project/process/OsEnumUpdate_3.3.properties b/data-warehouse/history_etl/tos_project/process/OsEnumUpdate_3.3.properties index 400d4ea..bb7b60d 100644 --- a/data-warehouse/history_etl/tos_project/process/OsEnumUpdate_3.3.properties +++ b/data-warehouse/history_etl/tos_project/process/OsEnumUpdate_3.3.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="_nVAjoKilEeCjo5NG37_jcg" id="_wS9RAB-CEeOn18i66-1ZcQ" label="OsEnumUpdate" creationDate="2011-07-07T17:30:03.304+0300" modificationDate="2013-09-17T17:26:48.011+0300" version="3.3" statusCode="" item="_nVAjoqilEeCjo5NG37_jcg" displayName="OsEnumUpdate"> + <TalendProperties:Property xmi:id="_nVAjoKilEeCjo5NG37_jcg" id="_wS9RAB-CEeOn18i66-1ZcQ" label="OsEnumUpdate" creationDate="2011-07-07T17:30:03.304+0300" modificationDate="2013-09-30T17:02:01.444+0300" version="3.3" statusCode="" item="_nVAjoqilEeCjo5NG37_jcg" displayName="OsEnumUpdate"> <author href="../talend.project#_9rn8MCu-EeGwyfNuL-eF9g"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_wTs34B-CEeOn18i66-1ZcQ" path=""/> diff --git a/data-warehouse/history_etl/tos_project/talend.project b/data-warehouse/history_etl/tos_project/talend.project index 9f57d0b..274644a 100644 --- a/data-warehouse/history_etl/tos_project/talend.project +++ b/data-warehouse/history_etl/tos_project/talend.project @@ -852,7 +852,7 @@ <migrationTask xmi:id="_G1Uu69vkEeKmz4H4vIrR2g" id="org.talend.repository.model.migration.ChangePigVersionOfPigLoadMigrationTask" breaks="5.3.0" version="5.3.0" status="ok"/> <migrationTask xmi:id="_G1VV4NvkEeKmz4H4vIrR2g" id="org.talend.repository.model.migration.ChangeHadoopVersionsOfReferenceComponentsMigrationTask" breaks="5.3.0" version="5.3.0" status="ok"/> <migrationTask xmi:id="_G1VV4dvkEeKmz4H4vIrR2g" id="org.talend.repository.model.migration.AutoUpdateRelationsMigrationTask" breaks="5.1.1" version="5.1.2" status="ok"/> - <migrationTask xmi:id="_dsN_YR-CEeOn18i66-1ZcQ" id="org.talend.repository.model.migration.UpdateExistentMigrationTasksToAdaptNewMigrationSystemMigrationTask" breaks="5.1.1" version="5.1.2" status="ok"/> + <migrationTask xmi:id="_rXKqASnWEeORcf7J-W1A5w" id="org.talend.repository.model.migration.UpdateExistentMigrationTasksToAdaptNewMigrationSystemMigrationTask" breaks="5.1.1" version="5.1.2" status="ok"/> </TalendProperties:Project> <TalendProperties:User xmi:id="_SapC4EJlEeCWRqOtaF5m-w" login="[email protected]" password="D41D8CD98F00B204E9800998ECF8427E"/> <TalendProperties:User xmi:id="_9rn8MCu-EeGwyfNuL-eF9g" login="[email protected]" password="D41D8CD98F00B204E9800998ECF8427E"/> -- To view, visit http://gerrit.ovirt.org/19690 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fc626f27feb9667f91c42ec11de23bab700008a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
