[PHOENIX-901] Ensure ConnectionQueryServices only initialized once

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 3.0.0, 4.0.0
• Assignee: James R. Taylor
• Reporter: James R. Taylor
• Created: 27/Mar/14 21:46
• Updated: 21/Nov/15 02:17
• Resolved: 28/Mar/14 17:09

Description

We should call connectionQueryServices#init in the else block of this code:

    @Override
    protected ConnectionQueryServices getConnectionQueryServices(String url, Properties info) throws SQLException {
        checkClosed();

        ConnectionInfo connInfo = ConnectionInfo.create(url);
        ConnectionInfo normalizedConnInfo = connInfo.normalize(getQueryServices().getProps());
        ConnectionQueryServices connectionQueryServices = connectionQueryServicesMap.get(normalizedConnInfo);
        if (connectionQueryServices == null) {
            if (normalizedConnInfo.isConnectionless()) {
                connectionQueryServices = new ConnectionlessQueryServicesImpl(getQueryServices());
            } else {
                connectionQueryServices = new ConnectionQueryServicesImpl(getQueryServices(), normalizedConnInfo);
            }
            connectionQueryServices.init(url, info);
            ConnectionQueryServices prevValue = connectionQueryServicesMap.putIfAbsent(normalizedConnInfo, connectionQueryServices);
            if (prevValue != null) {
                connectionQueryServices = prevValue;
            }
        }
        return connectionQueryServices;
    }

like this instead:

    @Override
    protected ConnectionQueryServices getConnectionQueryServices(String url, Properties info) throws SQLException {
        checkClosed();

        ConnectionInfo connInfo = ConnectionInfo.create(url);
        ConnectionInfo normalizedConnInfo = connInfo.normalize(getQueryServices().getProps());
        ConnectionQueryServices connectionQueryServices = connectionQueryServicesMap.get(normalizedConnInfo);
        if (connectionQueryServices == null) {
            if (normalizedConnInfo.isConnectionless()) {
                connectionQueryServices = new ConnectionlessQueryServicesImpl(getQueryServices());
            } else {
                connectionQueryServices = new ConnectionQueryServicesImpl(getQueryServices(), normalizedConnInfo);
            }
            ConnectionQueryServices prevValue = connectionQueryServicesMap.putIfAbsent(normalizedConnInfo, connectionQueryServices);
            if (prevValue != null) {
                connectionQueryServices = prevValue;
            } else {
                connectionQueryServices.init(url, info);
            }
        }
        return connectionQueryServices;
    }

This has the potential to open multiple HConnections, but it's unclear if this causes harm, as the same, original ConnectionQueryService is returned and used.