Yaniv Dary has uploaded a new change for review. Change subject: etl: fixed issue with user_logged_in_to_guest column null handling ......................................................................
etl: fixed issue with user_logged_in_to_guest column null handling etl did not handle null values well, this is now fixed. Change-Id: I63a336b2b848ab6ae5431aff8ab00e2b83a45695 Bug-Url: https://bugzilla.redhat.com/1057412 Signed-off-by: Yaniv Dary <[email protected]> --- M data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtodaily_3_3/AggregationToDaily.java M data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtohourly_3_3/AggregationToHourly.java M data-warehouse/history_etl/tos_project/configuration/ExpressionBuilder/AggregationToHourly.xml M data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.3.item M data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.3.properties M data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.3.item M data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.3.properties M data-warehouse/history_etl/tos_project/talend.project 8 files changed, 16 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/10/23710/1 diff --git a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtodaily_3_3/AggregationToDaily.java b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtodaily_3_3/AggregationToDaily.java index 8796522..906b0fa 100644 --- a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtodaily_3_3/AggregationToDaily.java +++ b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtodaily_3_3/AggregationToDaily.java @@ -23214,7 +23214,8 @@ // # Output table : 'complete_aggregate_users' complete_aggregate_users_tmp.history_datetime = row14.history_datetime; complete_aggregate_users_tmp.user_name = row14.user_name; - complete_aggregate_users_tmp.user_logged_in_to_guest = row14.user_logged_in_to_guest > 0; + complete_aggregate_users_tmp.user_logged_in_to_guest = row14.user_logged_in_to_guest != null ? row14.user_logged_in_to_guest > 0 + : null; complete_aggregate_users_tmp.vm_id = row14.vm_id; complete_aggregate_users_tmp.session_time_in_minutes = row14.session_time_in_minutes; complete_aggregate_users_tmp.cpu_usage_percent = row14.cpu_usage_percent; @@ -24884,6 +24885,6 @@ ResumeUtil resumeUtil = null; } /************************************************************************************************ - * 730023 characters generated by Talend Open Studio for Data Integration on the - * August 11, 2013 6:45:18 PM IDT + * 730069 characters generated by Talend Open Studio for Data Integration on the + * January 26, 2014 2:27:51 PM IST ************************************************************************************************/ diff --git a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtohourly_3_3/AggregationToHourly.java b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtohourly_3_3/AggregationToHourly.java index 593bcf4..80ff666 100644 --- a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtohourly_3_3/AggregationToHourly.java +++ b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtohourly_3_3/AggregationToHourly.java @@ -23215,7 +23215,8 @@ // # Output table : 'complete_aggregation' complete_aggregation_tmp.history_datetime = row14.history_datetime; complete_aggregation_tmp.user_name = row14.user_name; - complete_aggregation_tmp.user_logged_in_to_guest = row14.user_logged_in_to_guest > 0; + complete_aggregation_tmp.user_logged_in_to_guest = row14.user_logged_in_to_guest != null ? row14.user_logged_in_to_guest > 0 + : null; complete_aggregation_tmp.vm_id = row14.vm_id; complete_aggregation_tmp.session_time_in_minutes = row14.session_time_in_minutes; complete_aggregation_tmp.cpu_usage_percent = row14.cpu_usage_percent; @@ -24881,6 +24882,6 @@ ResumeUtil resumeUtil = null; } /************************************************************************************************ - * 730156 characters generated by Talend Open Studio for Data Integration on the - * August 11, 2013 6:45:16 PM IDT + * 730203 characters generated by Talend Open Studio for Data Integration on the + * January 26, 2014 2:27:49 PM IST ************************************************************************************************/ diff --git a/data-warehouse/history_etl/tos_project/configuration/ExpressionBuilder/AggregationToHourly.xml b/data-warehouse/history_etl/tos_project/configuration/ExpressionBuilder/AggregationToHourly.xml index c3563c8..c140fdd 100644 --- a/data-warehouse/history_etl/tos_project/configuration/ExpressionBuilder/AggregationToHourly.xml +++ b/data-warehouse/history_etl/tos_project/configuration/ExpressionBuilder/AggregationToHourly.xml @@ -76,7 +76,7 @@ <variables name="row11.var_value" value="null" talendType="id_String" nullable="true"/> <variables name="row11.var_datetime" value="null" talendType="id_Date" nullable="true"/> </expression:EMFExpression> - <expression:EMFExpression id="null=>complete_aggregation=>user_logged_in_to_guest" expression="row14.user_logged_in_to_guest == 1"> + <expression:EMFExpression id="null=>complete_aggregation=>user_logged_in_to_guest" expression="row14.user_logged_in_to_guest != null ? row14.user_logged_in_to_guest > 0 : null"> <variables name="row14.history_datetime" value="null" talendType="id_Date"/> <variables name="row14.user_name" value="null" talendType="id_String" nullable="true"/> <variables name="row14.user_logged_in_to_guest" value="null" talendType="id_Integer" nullable="true"/> diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.3.item b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.3.item index ac81d78..e343cad 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.3.item +++ b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.3.item @@ -2630,7 +2630,7 @@ <column comment="" key="false" length="4" name="current_host_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer" usefulColumn="true"/> </metadata> <nodeData xsi:type="MapperData"> - <uiProperties shellMaximized="true"/> + <uiProperties/> <varTables sizeState="INTERMEDIATE" name="Var" minimized="true"/> <outputTables sizeState="INTERMEDIATE" name="copyOfvm_aggregate_history"> <mapperTableEntries name="history_datetime" expression="RoutineHistoryETL.startOfDay(row13.history_datetime) " type="id_Date"/> @@ -2807,7 +2807,7 @@ <outputTables sizeState="INTERMEDIATE" name="complete_aggregate_users"> <mapperTableEntries name="history_datetime" expression="row14.history_datetime" type="id_Date"/> <mapperTableEntries name="user_name" expression="row14.user_name" type="id_String" nullable="true"/> - <mapperTableEntries name="user_logged_in_to_guest" expression="row14.user_logged_in_to_guest > 0 " type="id_Boolean" nullable="true"/> + <mapperTableEntries name="user_logged_in_to_guest" expression="row14.user_logged_in_to_guest != null ? row14.user_logged_in_to_guest > 0 : null" type="id_Boolean" nullable="true"/> <mapperTableEntries name="vm_id" expression="row14.vm_id" type="id_Object"/> <mapperTableEntries name="session_time_in_minutes" expression="row14.session_time_in_minutes" type="id_Double"/> <mapperTableEntries name="cpu_usage_percent" expression="row14.cpu_usage_percent" type="id_Short" nullable="true"/> diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.3.properties b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.3.properties index 6745f37..9aa2365 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.3.properties +++ b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_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="_6qukwEi2EeCv8PaoeAjHHg" id="_s0iQoFShEeCW44CWrpjEnA" label="AggregationToDaily" creationDate="2011-07-06T14:17:29.833+0300" modificationDate="2013-10-09T13:19:49.383+0300" version="3.3" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToDaily"> + <TalendProperties:Property xmi:id="_6qukwEi2EeCv8PaoeAjHHg" id="_s0iQoFShEeCW44CWrpjEnA" label="AggregationToDaily" creationDate="2011-07-06T14:17:29.833+0300" modificationDate="2014-01-26T14:05:18.570+0200" version="3.3" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToDaily"> <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_s1bogFShEeCW44CWrpjEnA" path=""/> diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.3.item b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.3.item index 2bb241b..6abc7ea 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.3.item +++ b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.3.item @@ -2634,7 +2634,7 @@ <column comment="" key="false" length="4" name="current_host_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer" usefulColumn="true"/> </metadata> <nodeData xsi:type="MapperData"> - <uiProperties shellMaximized="true"/> + <uiProperties/> <varTables sizeState="INTERMEDIATE" name="Var" minimized="true"/> <outputTables sizeState="INTERMEDIATE" name="vm_users_aggregate_history"> <mapperTableEntries name="history_datetime" expression="RoutineHistoryETL.startOfHour(row13.history_datetime) " type="id_Date"/> @@ -2811,7 +2811,7 @@ <outputTables sizeState="INTERMEDIATE" name="complete_aggregation"> <mapperTableEntries name="history_datetime" expression="row14.history_datetime" type="id_Date"/> <mapperTableEntries name="user_name" expression="row14.user_name" type="id_String" nullable="true"/> - <mapperTableEntries name="user_logged_in_to_guest" expression="row14.user_logged_in_to_guest > 0" type="id_Boolean" nullable="true"/> + <mapperTableEntries name="user_logged_in_to_guest" expression="row14.user_logged_in_to_guest != null ? row14.user_logged_in_to_guest > 0 : null" type="id_Boolean" nullable="true"/> <mapperTableEntries name="vm_id" expression="row14.vm_id" type="id_Object"/> <mapperTableEntries name="session_time_in_minutes" expression="row14.session_time_in_minutes" type="id_Double"/> <mapperTableEntries name="cpu_usage_percent" expression="row14.cpu_usage_percent" type="id_Short" nullable="true"/> diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.3.properties b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.3.properties index 803b4bd..1736b03 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.3.properties +++ b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_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="_6qukwEi2EeCv8PaoeAjHHg" id="_6qsvkEi2EeCv8PaoeAjHHg" label="AggregationToHourly" creationDate="2011-07-06T14:17:18.376+0300" modificationDate="2013-10-09T13:18:38.433+0300" version="3.3" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToHourly"> + <TalendProperties:Property xmi:id="_6qukwEi2EeCv8PaoeAjHHg" id="_6qsvkEi2EeCv8PaoeAjHHg" label="AggregationToHourly" creationDate="2011-07-06T14:17:18.376+0300" modificationDate="2014-01-26T14:27:19.782+0200" version="3.3" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToHourly"> <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_6qukwUi2EeCv8PaoeAjHHg" path=""/> diff --git a/data-warehouse/history_etl/tos_project/talend.project b/data-warehouse/history_etl/tos_project/talend.project index 48892d0..0efced1 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="_57PdITS7EeOTfd89-tMnqg" id="org.talend.repository.model.migration.UpdateExistentMigrationTasksToAdaptNewMigrationSystemMigrationTask" breaks="5.1.1" version="5.1.2" status="ok"/> + <migrationTask xmi:id="_4bEHgYaDEeOtb6QZ3nAwdQ" 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/23710 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63a336b2b848ab6ae5431aff8ab00e2b83a45695 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
