Repository: incubator-s2graph Updated Branches: refs/heads/master 6082be918 -> 51e6ea34b
[S2GRAPH-43]: Bug on offset when Interval is given on query. add check for columnFilter on queryParam. JIRA: [S2GRAPH-43] https://issues.apache.org/jira/browse/S2GRAPH-43 Pull Request: Closes #26 Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/51e6ea34 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/51e6ea34 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/51e6ea34 Branch: refs/heads/master Commit: 51e6ea34bdfef9730aa99bf34405a336b4ee4282 Parents: 6082be9 Author: DO YUNG YOON <[email protected]> Authored: Tue Feb 23 17:31:56 2016 +0900 Committer: DO YUNG YOON <[email protected]> Committed: Tue Feb 23 17:31:56 2016 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ s2core/src/main/scala/com/kakao/s2graph/core/QueryParam.scala | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/51e6ea34/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 8278b26..1a64beb 100644 --- a/CHANGES +++ b/CHANGES @@ -44,6 +44,8 @@ Release 0.12.1 - unreleased S2GRAPH-42: Bug on EdgeTransformer with specific cases (Committed by DOYUNG YOON). + S2GRAPH-43: Bug on offset when Interval is given on query (Committed by DOYUNG YOON). + TASKS S2GRAPH-2: Update document and quick start environment to have recent set-up command changes. http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/51e6ea34/s2core/src/main/scala/com/kakao/s2graph/core/QueryParam.scala ---------------------------------------------------------------------- diff --git a/s2core/src/main/scala/com/kakao/s2graph/core/QueryParam.scala b/s2core/src/main/scala/com/kakao/s2graph/core/QueryParam.scala index 3f0dfbe..b886441 100644 --- a/s2core/src/main/scala/com/kakao/s2graph/core/QueryParam.scala +++ b/s2core/src/main/scala/com/kakao/s2graph/core/QueryParam.scala @@ -345,7 +345,7 @@ case class QueryParam(labelWithDir: LabelWithDirection, timestamp: Long = System def limit(offset: Int, limit: Int): QueryParam = { /** since degree info is located on first always */ - if (offset == 0) { + if (offset == 0 && this.columnRangeFilter == null) { this.limit = limit + 1 this.offset = offset } else {
