Yaniv Dary has uploaded a new change for review. Change subject: etl: fixed aggregation process (#894716) ......................................................................
etl: fixed aggregation process (#894716) Fixed issue that caused tables not to aggregate. Bug-Url: https://bugzilla.redhat.com/894716 Change-Id: I5155b6d57e8d838c8234e93b49d36fbd45960f5c Signed-off-by: Yaniv Dary <[email protected]> --- M data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtodaily_3_2/AggregationToDaily.java M data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtohourly_3_2/AggregationToHourly.java M data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.item M data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.properties M data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.item M data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.properties 6 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/39/11039/1 diff --git a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtodaily_3_2/AggregationToDaily.java b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtodaily_3_2/AggregationToDaily.java index b8136bd..82b2696 100644 --- a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtodaily_3_2/AggregationToDaily.java +++ b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtodaily_3_2/AggregationToDaily.java @@ -21871,7 +21871,7 @@ int batchSizeCounter_tJDBCOutput_10 = 0; String insert_tJDBCOutput_10 = "INSERT INTO " - + "vm_users_daily_history" + + "statistics_vms_users_usage_daily" + " (history_datetime,user_name,vm_id,session_time_in_minutes,cpu_usage_percent,max_cpu_usage,memory_usage_percent,max_memory_usage,user_cpu_usage_percent,max_user_cpu_usage_percent,system_cpu_usage_percent,max_system_cpu_usage_percent,vm_ip,currently_running_on_host,vm_configuration_version,current_host_configuration_version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; java.sql.PreparedStatement pstmt_tJDBCOutput_10 = connection_tJDBCOutput_10 .prepareStatement(insert_tJDBCOutput_10); @@ -23523,6 +23523,6 @@ ResumeUtil resumeUtil = null; } /************************************************************************************************ - * 679174 characters generated by Talend Open Studio for Data Integration on the - * January 2, 2013 1:56:57 PM IST + * 679184 characters generated by Talend Open Studio for Data Integration on the + * January 15, 2013 2:29:32 PM IST ************************************************************************************************/ diff --git a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtohourly_3_2/AggregationToHourly.java b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtohourly_3_2/AggregationToHourly.java index c93fbf4..1f6b539 100644 --- a/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtohourly_3_2/AggregationToHourly.java +++ b/data-warehouse/history_etl/etl_sources/historyETLProcedure/src/main/java/ovirt_engine_dwh/aggregationtohourly_3_2/AggregationToHourly.java @@ -21870,7 +21870,7 @@ int batchSizeCounter_tJDBCOutput_10 = 0; String insert_tJDBCOutput_10 = "INSERT INTO " - + "vm_users_hourly_history" + + "statistics_vms_users_usage_hourly" + " (history_datetime,user_name,vm_id,session_time_in_minutes,cpu_usage_percent,max_cpu_usage,memory_usage_percent,max_memory_usage,user_cpu_usage_percent,max_user_cpu_usage_percent,system_cpu_usage_percent,max_system_cpu_usage_percent,vm_ip,currently_running_on_host,vm_configuration_version,current_host_configuration_version) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; java.sql.PreparedStatement pstmt_tJDBCOutput_10 = connection_tJDBCOutput_10 .prepareStatement(insert_tJDBCOutput_10); @@ -23522,6 +23522,6 @@ ResumeUtil resumeUtil = null; } /************************************************************************************************ - * 679517 characters generated by Talend Open Studio for Data Integration on the - * January 2, 2013 1:56:55 PM IST + * 679527 characters generated by Talend Open Studio for Data Integration on the + * January 15, 2013 2:29:30 PM IST ************************************************************************************************/ diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.item b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.item index 33c8993..14aefd3 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.item +++ b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.item @@ -1774,7 +1774,7 @@ <column comment="" key="false" length="4" name="storage_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> </metadata> <nodeData xsi:type="MapperData"> - <uiProperties shellMaximized="true"/> + <uiProperties/> <varTables sizeState="INTERMEDIATE" name="Var" minimized="true"/> <outputTables sizeState="INTERMEDIATE" name="storage_aggregate"> <mapperTableEntries name="history_datetime" expression="RoutineHistoryETL.startOfDay(row16.history_datetime)" type="id_Date"/> @@ -2674,7 +2674,7 @@ <elementParameter field="TEXT" name="DRIVER_CLASS" value=""""/> <elementParameter field="TEXT" name="USER" value=""""/> <elementParameter field="TEXT" name="PASS" value=""""/> - <elementParameter field="TEXT" name="TABLE" value=""vm_users_daily_history""/> + <elementParameter field="TEXT" name="TABLE" value=""statistics_vms_users_usage_daily""/> <elementParameter field="CLOSED_LIST" name="DATA_ACTION" value="INSERT"/> <elementParameter field="CHECK" name="CLEAR_TABLE" value="false"/> <elementParameter field="CHECK" name="DIE_ON_ERROR" value="true"/> diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.properties b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.properties index 6330b45..108f606 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.properties +++ b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_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="_6qukwEi2EeCv8PaoeAjHHg" id="_s0iQoFShEeCW44CWrpjEnA" label="AggregationToDaily" creationDate="2011-07-06T14:17:29.833+0300" modificationDate="2013-01-02T13:55:59.765+0200" version="3.2" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToDaily"> + <TalendProperties:Property xmi:id="_6qukwEi2EeCv8PaoeAjHHg" id="_s0iQoFShEeCW44CWrpjEnA" label="AggregationToDaily" creationDate="2011-07-06T14:17:29.833+0300" modificationDate="2013-01-15T14:27:27.192+0200" version="3.2" 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.2.item b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.item index 117bd5f..bed24d0 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.item +++ b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.item @@ -1774,7 +1774,7 @@ <column comment="" key="false" length="4" name="storage_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> </metadata> <nodeData xsi:type="MapperData"> - <uiProperties shellMaximized="true"/> + <uiProperties/> <varTables sizeState="INTERMEDIATE" name="Var" minimized="true"/> <outputTables sizeState="INTERMEDIATE" name="storage_aggregate"> <mapperTableEntries name="history_datetime" expression="RoutineHistoryETL.startOfHour(row16.history_datetime)" type="id_Date"/> @@ -2541,7 +2541,7 @@ <column comment="" key="false" length="4" name="current_host_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> </metadata> <nodeData xsi:type="MapperData"> - <uiProperties/> + <uiProperties shellMaximized="true"/> <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"/> @@ -2674,7 +2674,7 @@ <elementParameter field="TEXT" name="DRIVER_CLASS" value=""""/> <elementParameter field="TEXT" name="USER" value=""""/> <elementParameter field="TEXT" name="PASS" value=""""/> - <elementParameter field="TEXT" name="TABLE" value=""vm_users_hourly_history""/> + <elementParameter field="TEXT" name="TABLE" value=""statistics_vms_users_usage_hourly""/> <elementParameter field="CLOSED_LIST" name="DATA_ACTION" value="INSERT"/> <elementParameter field="CHECK" name="CLEAR_TABLE" value="false"/> <elementParameter field="CHECK" name="DIE_ON_ERROR" value="true"/> diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.properties b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.properties index 5b27c90..1a0f793 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.properties +++ b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_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="_6qukwEi2EeCv8PaoeAjHHg" id="_6qsvkEi2EeCv8PaoeAjHHg" label="AggregationToHourly" creationDate="2011-07-06T14:17:18.376+0300" modificationDate="2013-01-02T13:53:28.783+0200" version="3.2" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToHourly"> + <TalendProperties:Property xmi:id="_6qukwEi2EeCv8PaoeAjHHg" id="_6qsvkEi2EeCv8PaoeAjHHg" label="AggregationToHourly" creationDate="2011-07-06T14:17:18.376+0300" modificationDate="2013-01-15T14:27:03.519+0200" version="3.2" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToHourly"> <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_6qukwUi2EeCv8PaoeAjHHg" path=""/> -- To view, visit http://gerrit.ovirt.org/11039 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5155b6d57e8d838c8234e93b49d36fbd45960f5c 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
