Frank Kobzik has posted comments on this change. Change subject: core: GraphicsInfo db persistence part ......................................................................
Patch Set 11: (5 comments) (adding comments) http://gerrit.ovirt.org/#/c/28570/11/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java File backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDAODbFacadeImpl.java: Line 326: entity.setVdsGroupSpiceProxy(rs.getString("vds_group_spice_proxy")); Line 327: entity.setNextRunConfigurationExists(rs.getBoolean("next_run_config_exists")); Line 328: entity.getGraphicsInfos().get(GraphicsType.SPICE).setIp(rs.getString("spice_ip")); Line 329: entity.getGraphicsInfos().get(GraphicsType.SPICE).setPort(getInteger(rs, "spice_port")); Line 330: entity.getGraphicsInfos().get(GraphicsType.SPICE).setTlsPort(getInteger(rs, "spice_tls_port")); > is it different from using the standard: Good point. Probably not. I did this workaround because rs.getInteger returns primitive int (it has no notion of null). But if "((Integer) getObject(..))" returns Integer (with null when value in db is NULL), this is precisely what I need. Anyway - I deleted it here and used VmDynamic row mapper to avoid duplication. Line 331: entity.getGraphicsInfos().get(GraphicsType.VNC).setIp(rs.getString("vnc_ip")); Line 332: entity.getGraphicsInfos().get(GraphicsType.VNC).setPort(getInteger(rs, "vnc_port")); Line 333: return entity; Line 334: } http://gerrit.ovirt.org/#/c/28570/11/packaging/dbscripts/upgrade/03_06_0140_add_graphics_info_columns.sql File packaging/dbscripts/upgrade/03_06_0140_add_graphics_info_columns.sql: Line 19: _create_date, Line 20: _update_date, Line 21: alias) Line 22: SELECT Line 23: '00000000-0000-0000-0000-000000000000', > new guid Done Line 24: vm_guid, Line 25: 'graphics', Line 26: 'spice', Line 27: '', Line 55: _create_date, Line 56: _update_date, Line 57: alias) Line 58: SELECT Line 59: '00000000-0000-0000-0000-000000000001', > same Done Line 60: vm_guid, Line 61: 'graphics', Line 62: 'vnc', Line 63: '', Line 84: select fn_db_add_column('vm_dynamic', 'vnc_port', 'integer default NULL'); Line 85: select fn_db_add_column('vm_dynamic', 'vnc_ip', 'varchar(255) default NULL'); Line 86: Line 87: -- update added colums Line 88: -- todo should be rewritten > whitespace Done Line 89: create or replace function adjust_spice_port() returns void Line 90: as $function$ Line 91: begin Line 92: if (exists (select 1 from information_schema.columns where table_name ilike 'vm_dynamic' and column_name ilike 'display')) then http://gerrit.ovirt.org/#/c/28570/11/packaging/dbscripts/vms_sp.sql File packaging/dbscripts/vms_sp.sql: Line 287: v_spice_port, Line 288: v_spice_tls_port, Line 289: v_spice_ip, Line 290: v_vnc_port, Line 291: v_vnc_ip > white space Done Line 292: ); Line 293: END; $procedure$ Line 294: LANGUAGE plpgsql; Line 295: -- To view, visit http://gerrit.ovirt.org/28570 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5a129454fc64aa34493b0495fb76f22f3d667e14 Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> Gerrit-Reviewer: Arik Hadas <[email protected]> Gerrit-Reviewer: Frank Kobzik <[email protected]> Gerrit-Reviewer: Omer Frenkel <[email protected]> Gerrit-Reviewer: Roy Golan <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
