Build #284

Plan branch:
More details of the release in https://wiki.openmrs.org/x/i4DTAw

Build: #284 was successful Changes by Michael Seaton <mseaton@pih.org>

Stages & jobs

  1. Default Stage

Code commits

Git

  • Michael Seaton <mseaton@pih.org>

    Michael Seaton <mseaton@pih.org> 74d3fd0c86c527b9ec7f6d8ed26b1a48733b0129

    Fixing dependency issue by re-including xml-apis as provided from openmrs, and excluding dom4j from poi-ooxml

    • pom.xml (version 74d3fd0c86c527b9ec7f6d8ed26b1a48733b0129)
  • Michael Seaton <mseaton@pih.org>

    Michael Seaton <mseaton@pih.org> 360dfd9b2735011e531d0e5758779176eaa12bc9

    Add additional checking to ensure that no more than one id set is added as a constraint, as this leads to the best performance on mysql 5.5. Also, consolidate logic for checking against multiple id sets in an evaluation context.

    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/AgeCohortDefinitionEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/AllPatientsCohortDefinitionEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/EncounterCohortDefinitionEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/GenderCohortDefinitionEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/PatientIdentifierCohortDefinitionEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/PatientStateCohortDefinitionEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/PersonAttributeCohortDefinitionEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/ScriptedCohortDefinitionEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/cohort/definition/evaluator/StaticCohortDefinitionEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/encounter/EncounterDataUtil.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/encounter/evaluator/AuditInfoEncounterDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/encounter/evaluator/EncounterPropertyDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/encounter/evaluator/EncounterProviderDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/encounter/evaluator/ObsForEncounterDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/encounter/evaluator/PatientToEncounterDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/encounter/evaluator/PersonToEncounterDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/encounter/evaluator/SimultaneousEncountersDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/obs/ObsDataUtil.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/obs/evaluator/EncounterToObsDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/obs/evaluator/GroupMemberObsDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/obs/evaluator/ObsPropertyDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/obs/evaluator/PatientToObsDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/obs/evaluator/PersonToObsDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/patient/evaluator/CurrentPatientStateDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/patient/evaluator/DrugOrdersForPatientDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/patient/evaluator/EncountersForPatientDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/patient/evaluator/PatientIdentifierDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/patient/evaluator/PatientPropertyDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/patient/evaluator/PreferredIdentifierDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/patient/evaluator/ProgramEnrollmentsForPatientDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/patient/evaluator/ProgramStatesForPatientDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/person/evaluator/BirthdateDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/person/evaluator/ObsActiveListPersonDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/person/evaluator/ObsForPersonDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/person/evaluator/PersonAttributeDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/person/evaluator/PersonPropertyDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/person/evaluator/PreferredAddressDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/person/evaluator/PreferredNameDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/person/evaluator/RelationshipsForPersonDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/data/person/evaluator/VitalStatusDataEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/evaluation/querybuilder/HqlQueryBuilder.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/query/encounter/evaluator/BasicEncounterQueryEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/query/encounter/evaluator/MostRecentEncounterForPatientQueryEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/query/obs/evaluator/AllObsQueryEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/query/obs/evaluator/BasicObsQueryEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/main/java/org/openmrs/module/reporting/query/person/evaluator/AllPersonQueryEvaluator.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/test/java/org/openmrs/module/reporting/evaluation/querybuilder/HqlQueryBuilderTest.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
    • api/src/test/java/org/openmrs/module/reporting/evaluation/service/EvaluationServiceTest.java (version 360dfd9b2735011e531d0e5758779176eaa12bc9)
  • Michael Seaton <mseaton@pih.org>

    Michael Seaton <mseaton@pih.org> 4ce6fa3576bff7551d24957989779165dec94218

    Expand handling of constraints against id sets, in order to best take advantage of mysql 5.6 performance improvements while also support efficient queries in earlier versions.

    • api/src/main/java/org/openmrs/module/reporting/evaluation/querybuilder/HqlQueryBuilder.java (version 4ce6fa3576bff7551d24957989779165dec94218)