[ckan-changes] [ckan/ckan] eddc7a: [#2034] sort and limit in subqueries before unions

[GitHub]

  Branch: refs/heads/2034-activity-query-performance-1
  Home:   https://github.com/ckan/ckan
  Commit: eddc7a735de0e400faf381b1bf9391972c94b403
      https://github.com/ckan/ckan/commit/eddc7a735de0e400faf381b1bf9391972c94b403
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] sort and limit in subqueries before unions


  Commit: 6060ee4fa2c60de7c952f7a5bcaa7063230f0c30
      https://github.com/ckan/ckan/commit/6060ee4fa2c60de7c952f7a5bcaa7063230f0c30
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] real subqueries required for limits inside unions


  Commit: e4fb845c2170e1d4f8510dccbc1723557bad6cfa
      https://github.com/ckan/ckan/commit/e4fb845c2170e1d4f8510dccbc1723557bad6cfa
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] distinct now required before offset+limit


  Commit: 272a428c582bfcefd164bcf147fd03cec9d54d84
      https://github.com/ckan/ckan/commit/272a428c582bfcefd164bcf147fd03cec9d54d84
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/lib/base.py
    R ckan/lib/field_types.py
    M ckan/logic/converters.py
    A ckan/new_tests/lib/test_base.py
    M ckan/public/base/css/main.css
    M ckan/templates/package/snippets/package_basic_fields.html
    R ckan/tests/functional/test_cors.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/reclineview/theme/public/recline_view.js
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 2034-activity-query-performance-1


  Commit: c04c273c31845a293b8e7b135e89b5d066b6e9f2
      https://github.com/ckan/ckan/commit/c04c273c31845a293b8e7b135e89b5d066b6e9f2
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  [#2034] apply distinct after union


  Commit: db7a5ce571f3a9626c2b71b02c18865be01be6c8
      https://github.com/ckan/ckan/commit/db7a5ce571f3a9626c2b71b02c18865be01be6c8
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py

  Log Message:
  -----------
  [#2034] bodge together and get more info from activity tests that only fail on travis


  Commit: b38c126b6140388d8815100886d2f32b578a343c
      https://github.com/ckan/ckan/commit/b38c126b6140388d8815100886d2f32b578a343c
  Author: Ian Ward <ian at excess.org>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  [#2034] provide more information from travis failures


Compare: https://github.com/ckan/ckan/compare/eddc7a735de0^...b38c126b6140