Timeout on rather simple/small query

[jheeffer]

dataset: https://github.com/open-numbers/ddf--gapminder--population/tree/develop
environment: waffle server dev
query:

{
  "language": "en",
  "from": "datapoints",
  "animatable": "year",
  "select": {
    "key": [
      "country",
      "year"
    ],
    "value": [
      "population"
    ]
  },
  "where": {
    "$and": [
      {
        "year": "$year"
      }
    ]
  },
  "join": {
    "$year": {
      "key": "year",
      "where": {
        "year": {
          "$gte": "1993",
          "$lte": "2015"
        }
      }
    }
  },
  "order_by": [
    "year"
  ],
  "dataset": "open-numbers/ddf--gapminder--population#develop"
}

reponse: Request Time out

expected: Correct response on first query since it's not asking for a whole lot of data (compared to other queries).

note: Currently waffle server dev has the result cached and thus it does return data correctly