Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6EBCC200C01 for ; Thu, 5 Jan 2017 04:58:32 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6D67B160B44; Thu, 5 Jan 2017 03:58:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B7C21160B3A for ; Thu, 5 Jan 2017 04:58:31 +0100 (CET) Received: (qmail 82005 invoked by uid 500); 5 Jan 2017 03:58:25 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 81996 invoked by uid 99); 5 Jan 2017 03:58:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jan 2017 03:58:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BBCACDF9F9; Thu, 5 Jan 2017 03:58:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liyang@apache.org To: commits@kylin.apache.org Message-Id: <9973e69e9d6e44d0bdf2191c22b88d95@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: kylin git commit: revert 53b6c8c18033f92feadd2295456fa4f31011b5bb Date: Thu, 5 Jan 2017 03:58:25 +0000 (UTC) archived-at: Thu, 05 Jan 2017 03:58:32 -0000 Repository: kylin Updated Branches: refs/heads/master 7e71df947 -> e6a84c569 revert 53b6c8c18033f92feadd2295456fa4f31011b5bb Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e6a84c56 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e6a84c56 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e6a84c56 Branch: refs/heads/master Commit: e6a84c56961063f4ba83919ec1f689e9f37d1719 Parents: 7e71df9 Author: Hongbin Ma Authored: Thu Jan 5 11:57:29 2017 +0800 Committer: Hongbin Ma Committed: Thu Jan 5 11:57:40 2017 +0800 ---------------------------------------------------------------------- .../hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e6a84c56/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java index de53d0d..21a0efb 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java @@ -236,8 +236,8 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement } final MutableBoolean scanNormalComplete = new MutableBoolean(true); - final long deadline = scanReq.getStartTime() + scanReq.getTimeout(); - logger.info("deadline is " + deadline); + final long deadline = serviceStartTime + scanReq.getTimeout(); + logger.info("deadline(local) is " + deadline); final long storagePushDownLimit = scanReq.getStoragePushDownLimit(); final CellListIterator cellListIterator = new CellListIterator() {