Uploaded image for project: 'Tajo'
  1. Tajo
  2. TAJO-751

JDBC driver should support cancel() method.

    Details

    • Type: Improvement
    • Status: Resolved
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 0.11.0, 0.10.2
    • Component/s: JDBC Driver
    • Labels:
      None

      Description

      Some OLAP or ETL tool call JDBC's cancel() function when a query is too late. So Tajo's JDBC should support cancel() function in Statement or PreparedStatement class.

        Activity

        Hide
        githubbot ASF GitHub Bot added a comment -

        GitHub user navis opened a pull request:

        https://github.com/apache/tajo/pull/459

        TAJO-751 JDBC driver should support cancel() method

        Not yet added test cases

        You can merge this pull request into a Git repository by running:

        $ git pull https://github.com/navis/tajo TAJO-751

        Alternatively you can review and apply these changes as the patch at:

        https://github.com/apache/tajo/pull/459.patch

        To close this pull request, make a commit to your master/trunk branch
        with (at least) the following in the commit message:

        This closes #459


        commit fb0e6e98338f277b052d29bbb002c26a67d76ea3
        Author: navis.ryu <navis@apache.org>
        Date: 2015-03-24T07:07:40Z

        TAJO-751 JDBC driver should support cancel() method


        Show
        githubbot ASF GitHub Bot added a comment - GitHub user navis opened a pull request: https://github.com/apache/tajo/pull/459 TAJO-751 JDBC driver should support cancel() method Not yet added test cases You can merge this pull request into a Git repository by running: $ git pull https://github.com/navis/tajo TAJO-751 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tajo/pull/459.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #459 commit fb0e6e98338f277b052d29bbb002c26a67d76ea3 Author: navis.ryu <navis@apache.org> Date: 2015-03-24T07:07:40Z TAJO-751 JDBC driver should support cancel() method
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-86292815

        @navis

        Thanks for your contribution. But I failed to run unit test. For the reference, 51 cases were failures and 3 cases were errors. I attached some log messages as following:

        ```
        Tests run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 2.248 sec <<< FAILURE! - in org.apache.tajo.querymaster.TestTaskStatusUpdate
        case3(org.apache.tajo.querymaster.TestTaskStatusUpdate) Time elapsed: 1.093 sec <<< FAILURE!
        java.lang.AssertionError: expected:<4> but was:<2>
        at org.junit.Assert.fail(Assert.java:88)
        at org.junit.Assert.failNotEquals(Assert.java:743)
        at org.junit.Assert.assertEquals(Assert.java:118)
        at org.junit.Assert.assertEquals(Assert.java:555)
        at org.junit.Assert.assertEquals(Assert.java:542)
        at org.apache.tajo.querymaster.TestTaskStatusUpdate.assertStatus(TestTaskStatusUpdate.java:164)
        at org.apache.tajo.querymaster.TestTaskStatusUpdate.case3(TestTaskStatusUpdate.java:111)
        ```

        ```
        testInsertOverwriteIntoParquet(org.apache.tajo.engine.query.TestInsertQuery) Time elapsed: 0.002 sec <<< ERROR!
        com.google.protobuf.ServiceException: relation "TestInsertQuery.parquet_table" already exists

        at org.apache.tajo.client.QueryClientImpl.executeQueryAndGetResult(QueryClientImpl.java:210)
        at org.apache.tajo.client.TajoClientImpl.executeQueryAndGetResult(TajoClientImpl.java:110)
        at org.apache.tajo.QueryTestCaseBase.executeString(QueryTestCaseBase.java:323)
        at org.apache.tajo.engine.query.TestInsertQuery.testInsertOverwriteIntoParquet(TestInsertQuery.java:546)
        ```

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-86292815 @navis Thanks for your contribution. But I failed to run unit test. For the reference, 51 cases were failures and 3 cases were errors. I attached some log messages as following: ``` Tests run: 3, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 2.248 sec <<< FAILURE! - in org.apache.tajo.querymaster.TestTaskStatusUpdate case3(org.apache.tajo.querymaster.TestTaskStatusUpdate) Time elapsed: 1.093 sec <<< FAILURE! java.lang.AssertionError: expected:<4> but was:<2> at org.junit.Assert.fail(Assert.java:88) at org.junit.Assert.failNotEquals(Assert.java:743) at org.junit.Assert.assertEquals(Assert.java:118) at org.junit.Assert.assertEquals(Assert.java:555) at org.junit.Assert.assertEquals(Assert.java:542) at org.apache.tajo.querymaster.TestTaskStatusUpdate.assertStatus(TestTaskStatusUpdate.java:164) at org.apache.tajo.querymaster.TestTaskStatusUpdate.case3(TestTaskStatusUpdate.java:111) ``` ``` testInsertOverwriteIntoParquet(org.apache.tajo.engine.query.TestInsertQuery) Time elapsed: 0.002 sec <<< ERROR! com.google.protobuf.ServiceException: relation "TestInsertQuery.parquet_table" already exists at org.apache.tajo.client.QueryClientImpl.executeQueryAndGetResult(QueryClientImpl.java:210) at org.apache.tajo.client.TajoClientImpl.executeQueryAndGetResult(TajoClientImpl.java:110) at org.apache.tajo.QueryTestCaseBase.executeString(QueryTestCaseBase.java:323) at org.apache.tajo.engine.query.TestInsertQuery.testInsertOverwriteIntoParquet(TestInsertQuery.java:546) ```
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user navis commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-86849080

        Fixed test fail

        Show
        githubbot ASF GitHub Bot added a comment - Github user navis commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-86849080 Fixed test fail
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-87507713

        Thanks @navis
        I'll review today.

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-87507713 Thanks @navis I'll review today.
        Hide
        jrlee Jungryong Lee added a comment -

        Thanks Navis.
        I am waiting for this feature.
        I have evaluated Spotfire with this patch.
        When I evaluate your patch, client always submits killQuery to Master and it takes about 10 secs.
        Spotfire always calls cancel method before close method when it finishes query job.
        For this reason, it takes at least 10 secs with Spotfire even though query finishes within 1 sec.
        It will be great if client doesn't send killQuery for already finished query.

        Show
        jrlee Jungryong Lee added a comment - Thanks Navis . I am waiting for this feature. I have evaluated Spotfire with this patch. When I evaluate your patch, client always submits killQuery to Master and it takes about 10 secs. Spotfire always calls cancel method before close method when it finishes query job. For this reason, it takes at least 10 secs with Spotfire even though query finishes within 1 sec. It will be great if client doesn't send killQuery for already finished query.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user navis commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-87581061

        Addressed comment by Jungryong Lee.

        Show
        githubbot ASF GitHub Bot added a comment - Github user navis commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-87581061 Addressed comment by Jungryong Lee.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-87584300

        @navis

        Could you rebase this? I failed to merge the patch as following:
        ```
        Auto-merging tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java
        CONFLICT (content): Merge conflict in tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java
        Auto-merging tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java
        Auto-merging tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
        Automatic merge failed; fix conflicts and then commit the result.
        ```

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-87584300 @navis Could you rebase this? I failed to merge the patch as following: ``` Auto-merging tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java CONFLICT (content): Merge conflict in tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java Auto-merging tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java Auto-merging tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java Automatic merge failed; fix conflicts and then commit the result. ```
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user navis commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-87590221

        rebased to master

        Show
        githubbot ASF GitHub Bot added a comment - Github user navis commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-87590221 rebased to master
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-87592232

        @navis

        Could you check it again?
        I still fail to merge this.

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-87592232 @navis Could you check it again? I still fail to merge this.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user navis commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-87593303

        Sorry, I've missed recent update of master.

        Show
        githubbot ASF GitHub Bot added a comment - Github user navis commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-87593303 Sorry, I've missed recent update of master.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-87594045

        No problem.

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-87594045 No problem.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-88753611

        @navis

        Thanks for your contribution.
        Could you add some unit test cases for this issue?

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-88753611 @navis Thanks for your contribution. Could you add some unit test cases for this issue?
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user navis commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-90777286

        Added a testcase & minor refactorings

        Show
        githubbot ASF GitHub Bot added a comment - Github user navis commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-90777286 Added a testcase & minor refactorings
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user navis commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-93183569

        @blrunner Could you review this?

        Show
        githubbot ASF GitHub Bot added a comment - Github user navis commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-93183569 @blrunner Could you review this?
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-93184797

        @navis

        Sorry for late review.
        I'll review this again soon.

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-93184797 @navis Sorry for late review. I'll review this again soon.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-93272754

        Hi @navis

        I failed to build this as follows.

        ```
        -------------------------------------------------------------------------------
        Test set: org.apache.tajo.cli.tsql.TestTajoCli
        -------------------------------------------------------------------------------
        Tests run: 18, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 5.29 sec <<< FAILURE! - in org.apache.tajo.cli.tsql.TestTajoCli
        testHelpSessionVars(org.apache.tajo.cli.tsql.TestTajoCli) Time elapsed: 0.01 sec <<< FAILURE!
        org.junit.ComparisonFailure: expected:<...me from Master
        \set [FETCH_BLOCK] [true or false] - W...> but was:<...me from Master
        \set [BLOCK_ON_RESULT] [true or false] - W...>
        at org.junit.Assert.assertEquals(Assert.java:115)
        at org.junit.Assert.assertEquals(Assert.java:144)
        at org.apache.tajo.cli.tsql.TestTajoCli.assertOutputResult(TestTajoCli.java:117)
        at org.apache.tajo.cli.tsql.TestTajoCli.assertOutputResult(TestTajoCli.java:99)
        at org.apache.tajo.cli.tsql.TestTajoCli.assertOutputResult(TestTajoCli.java:95)
        at org.apache.tajo.cli.tsql.TestTajoCli.testHelpSessionVars(TestTajoCli.java:366)
        ```

        Could you check above error?

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-93272754 Hi @navis I failed to build this as follows. ``` ------------------------------------------------------------------------------- Test set: org.apache.tajo.cli.tsql.TestTajoCli ------------------------------------------------------------------------------- Tests run: 18, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 5.29 sec <<< FAILURE! - in org.apache.tajo.cli.tsql.TestTajoCli testHelpSessionVars(org.apache.tajo.cli.tsql.TestTajoCli) Time elapsed: 0.01 sec <<< FAILURE! org.junit.ComparisonFailure: expected:<...me from Master \set [FETCH_BLOCK] [true or false] - W...> but was:<...me from Master \set [BLOCK_ON_RESULT] [true or false] - W...> at org.junit.Assert.assertEquals(Assert.java:115) at org.junit.Assert.assertEquals(Assert.java:144) at org.apache.tajo.cli.tsql.TestTajoCli.assertOutputResult(TestTajoCli.java:117) at org.apache.tajo.cli.tsql.TestTajoCli.assertOutputResult(TestTajoCli.java:99) at org.apache.tajo.cli.tsql.TestTajoCli.assertOutputResult(TestTajoCli.java:95) at org.apache.tajo.cli.tsql.TestTajoCli.testHelpSessionVars(TestTajoCli.java:366) ``` Could you check above error?
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user navis commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-93274136

        seemed needed to be rebased. I'll do that

        Show
        githubbot ASF GitHub Bot added a comment - Github user navis commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-93274136 seemed needed to be rebased. I'll do that
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-93274338

        Okay, thanks.

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-93274338 Okay, thanks.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user navis commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-93365045

        done.

        Show
        githubbot ASF GitHub Bot added a comment - Github user navis commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-93365045 done.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-93589115

        Thanks @navis
        I'll review this today.

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-93589115 Thanks @navis I'll review this today.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on a diff in the pull request:

        https://github.com/apache/tajo/pull/459#discussion_r28492503

        — Diff: tajo-client/src/main/java/org/apache/tajo/jdbc/WaitingResultSet.java —
        @@ -0,0 +1,71 @@
        +/**
        + * Licensed to the Apache Software Foundation (ASF) under one
        + * or more contributor license agreements. See the NOTICE file
        + * distributed with this work for additional information
        + * regarding copyright ownership. The ASF licenses this file
        + * to you under the Apache License, Version 2.0 (the
        + * "License"); you may not use this file except in compliance
        + * with the License. You may obtain a copy of the License at
        + *
        + * http://www.apache.org/licenses/LICENSE-2.0
        + *
        + * Unless required by applicable law or agreed to in writing, software
        + * distributed under the License is distributed on an "AS IS" BASIS,
        + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
        + * See the License for the specific language governing permissions and
        + * limitations under the License.
        + */
        +
        +package org.apache.tajo.jdbc;
        +
        +import com.google.protobuf.ServiceException;
        +import org.apache.tajo.QueryId;
        +import org.apache.tajo.TajoProtos;
        +import org.apache.tajo.catalog.CatalogUtil;
        +import org.apache.tajo.catalog.Schema;
        +import org.apache.tajo.catalog.TableDesc;
        +import org.apache.tajo.client.QueryClient;
        +import org.apache.tajo.client.QueryStatus;
        +import org.apache.tajo.client.TajoClientUtil;
        +import org.apache.tajo.ipc.ClientProtos;
        +
        +import java.sql.SQLException;
        +
        +/**
        + * Blocks on schema retrieval if it's not ready
        + */
        +public class WaitingResultSet extends FetchResultSet {
        +
        + public WaitingResultSet(QueryClient tajoClient, QueryId queryId, int fetchRowNum)
        + throws SQLException

        { + super(tajoClient, null, queryId, fetchRowNum); + }

        +
        + @Override
        + public boolean next() throws SQLException

        { + getSchema(); + return super.next(); + }

        +
        + @Override
        + protected Schema getSchema() throws SQLException {
        + return schema == null ? schema = waitOnResult() : schema;
        — End diff –

        Could you explain why you check schema?

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on a diff in the pull request: https://github.com/apache/tajo/pull/459#discussion_r28492503 — Diff: tajo-client/src/main/java/org/apache/tajo/jdbc/WaitingResultSet.java — @@ -0,0 +1,71 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tajo.jdbc; + +import com.google.protobuf.ServiceException; +import org.apache.tajo.QueryId; +import org.apache.tajo.TajoProtos; +import org.apache.tajo.catalog.CatalogUtil; +import org.apache.tajo.catalog.Schema; +import org.apache.tajo.catalog.TableDesc; +import org.apache.tajo.client.QueryClient; +import org.apache.tajo.client.QueryStatus; +import org.apache.tajo.client.TajoClientUtil; +import org.apache.tajo.ipc.ClientProtos; + +import java.sql.SQLException; + +/** + * Blocks on schema retrieval if it's not ready + */ +public class WaitingResultSet extends FetchResultSet { + + public WaitingResultSet(QueryClient tajoClient, QueryId queryId, int fetchRowNum) + throws SQLException { + super(tajoClient, null, queryId, fetchRowNum); + } + + @Override + public boolean next() throws SQLException { + getSchema(); + return super.next(); + } + + @Override + protected Schema getSchema() throws SQLException { + return schema == null ? schema = waitOnResult() : schema; — End diff – Could you explain why you check schema?
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on a diff in the pull request:

        https://github.com/apache/tajo/pull/459#discussion_r28495611

        — Diff: tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java —
        @@ -623,6 +623,12 @@ public BoolProto killQuery(RpcController controller, QueryIdRequest request) thr
        try {
        context.getSessionManager().touch(request.getSessionId().getId());
        QueryId queryId = new QueryId(request.getQueryId());
        +
        + QueryInProgress progress = context.getQueryJobManager().getQueryInProgress(queryId);
        + if (progress == null || progress.isFinishState() || progress.isFinishing()) {
        — End diff –

        Do we need to check the kill wait status surely?

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on a diff in the pull request: https://github.com/apache/tajo/pull/459#discussion_r28495611 — Diff: tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java — @@ -623,6 +623,12 @@ public BoolProto killQuery(RpcController controller, QueryIdRequest request) thr try { context.getSessionManager().touch(request.getSessionId().getId()); QueryId queryId = new QueryId(request.getQueryId()); + + QueryInProgress progress = context.getQueryJobManager().getQueryInProgress(queryId); + if (progress == null || progress.isFinishState() || progress.isFinishing()) { — End diff – Do we need to check the kill wait status surely?
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/459#issuecomment-93695955

        Hi @navis

        This looks good overall to me and I leaved some comments.
        In addition, if possible, could rebase this again? I failed to merge as follows.

        ```
        Removing tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/RpcConnectionPool.java
        Auto-merging tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java
        Auto-merging tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
        CONFLICT (content): Merge conflict in tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
        Auto-merging tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java
        Automatic merge failed; fix conflicts and then commit the result.
        ```

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/459#issuecomment-93695955 Hi @navis This looks good overall to me and I leaved some comments. In addition, if possible, could rebase this again? I failed to merge as follows. ``` Removing tajo-rpc/tajo-rpc-protobuf/src/main/java/org/apache/tajo/rpc/RpcConnectionPool.java Auto-merging tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java Auto-merging tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java CONFLICT (content): Merge conflict in tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java Auto-merging tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java Automatic merge failed; fix conflicts and then commit the result. ```
        Hide
        githubbot ASF GitHub Bot added a comment -

        GitHub user jihoonson opened a pull request:

        https://github.com/apache/tajo/pull/605

        TAJO-751: JDBC driver should support cancel() method.

        This is the rebased patch of navis' work (#459).
        While merging the patch into master, I've found some conflict codes and thus removed them.
        This patch looks good to me. Here is my +1, and I'll commit if there aren't any objections.

        You can merge this pull request into a Git repository by running:

        $ git pull https://github.com/jihoonson/tajo-2 TAJO-751

        Alternatively you can review and apply these changes as the patch at:

        https://github.com/apache/tajo/pull/605.patch

        To close this pull request, make a commit to your master/trunk branch
        with (at least) the following in the commit message:

        This closes #605


        commit b7bf01e77b12895607357e9b8a66fd02545b7946
        Author: navis.ryu <navis@apache.org>
        Date: 2015-03-24T07:07:40Z

        TAJO-751 JDBC driver should support cancel() method

        commit 659a8d870f09d2b6f2ed15ecb1f17a48a1bb82b7
        Author: navis.ryu <navis@apache.org>
        Date: 2015-04-08T01:34:09Z

        TAJO-751 Added a test and some minor refactorings

        commit 8f412ff5c5b12c968ffb0cbed01e414e636442e5
        Author: Jihoon Son <jihoonson@apache.org>
        Date: 2015-06-16T22:58:07Z

        Merged into master and removed some conflic codes


        Show
        githubbot ASF GitHub Bot added a comment - GitHub user jihoonson opened a pull request: https://github.com/apache/tajo/pull/605 TAJO-751 : JDBC driver should support cancel() method. This is the rebased patch of navis' work (#459). While merging the patch into master, I've found some conflict codes and thus removed them. This patch looks good to me. Here is my +1, and I'll commit if there aren't any objections. You can merge this pull request into a Git repository by running: $ git pull https://github.com/jihoonson/tajo-2 TAJO-751 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/tajo/pull/605.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #605 commit b7bf01e77b12895607357e9b8a66fd02545b7946 Author: navis.ryu <navis@apache.org> Date: 2015-03-24T07:07:40Z TAJO-751 JDBC driver should support cancel() method commit 659a8d870f09d2b6f2ed15ecb1f17a48a1bb82b7 Author: navis.ryu <navis@apache.org> Date: 2015-04-08T01:34:09Z TAJO-751 Added a test and some minor refactorings commit 8f412ff5c5b12c968ffb0cbed01e414e636442e5 Author: Jihoon Son <jihoonson@apache.org> Date: 2015-06-16T22:58:07Z Merged into master and removed some conflic codes
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user jihoonson commented on the pull request:

        https://github.com/apache/tajo/pull/605#issuecomment-112598231

        Anyway, I think that it would be great if this patch is included in 0.10.2.

        Show
        githubbot ASF GitHub Bot added a comment - Github user jihoonson commented on the pull request: https://github.com/apache/tajo/pull/605#issuecomment-112598231 Anyway, I think that it would be great if this patch is included in 0.10.2.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user blrunner commented on the pull request:

        https://github.com/apache/tajo/pull/605#issuecomment-113338827

        +1

        Thanks @jihoonson and @navis
        This patch looks good overall.

        Show
        githubbot ASF GitHub Bot added a comment - Github user blrunner commented on the pull request: https://github.com/apache/tajo/pull/605#issuecomment-113338827 +1 Thanks @jihoonson and @navis This patch looks good overall.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user hyunsik commented on a diff in the pull request:

        https://github.com/apache/tajo/pull/605#discussion_r32796985

        — Diff: tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java —
        @@ -319,7 +374,9 @@ public void setCursorName(String name) throws SQLException {

        • Not necessary.
          */
          @Override
        • public void setEscapeProcessing(boolean enable) throws SQLException {}
          + public void setEscapeProcessing(boolean enable) throws SQLException {
            • End diff –

        Throwing SQLFeatureNotSupportedException may cause JDBC applications to not work. It would be better to print out a warning message.

        Show
        githubbot ASF GitHub Bot added a comment - Github user hyunsik commented on a diff in the pull request: https://github.com/apache/tajo/pull/605#discussion_r32796985 — Diff: tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java — @@ -319,7 +374,9 @@ public void setCursorName(String name) throws SQLException { Not necessary. */ @Override public void setEscapeProcessing(boolean enable) throws SQLException {} + public void setEscapeProcessing(boolean enable) throws SQLException { End diff – Throwing SQLFeatureNotSupportedException may cause JDBC applications to not work. It would be better to print out a warning message.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user jihoonson commented on a diff in the pull request:

        https://github.com/apache/tajo/pull/605#discussion_r32883566

        — Diff: tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java —
        @@ -319,7 +374,9 @@ public void setCursorName(String name) throws SQLException {

        • Not necessary.
          */
          @Override
        • public void setEscapeProcessing(boolean enable) throws SQLException {}
          + public void setEscapeProcessing(boolean enable) throws SQLException {
            • End diff –

        Done.

        Show
        githubbot ASF GitHub Bot added a comment - Github user jihoonson commented on a diff in the pull request: https://github.com/apache/tajo/pull/605#discussion_r32883566 — Diff: tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java — @@ -319,7 +374,9 @@ public void setCursorName(String name) throws SQLException { Not necessary. */ @Override public void setEscapeProcessing(boolean enable) throws SQLException {} + public void setEscapeProcessing(boolean enable) throws SQLException { End diff – Done.
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user hyunsik commented on the pull request:

        https://github.com/apache/tajo/pull/605#issuecomment-114333315

        +1

        Show
        githubbot ASF GitHub Bot added a comment - Github user hyunsik commented on the pull request: https://github.com/apache/tajo/pull/605#issuecomment-114333315 +1
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user asfgit closed the pull request at:

        https://github.com/apache/tajo/pull/605

        Show
        githubbot ASF GitHub Bot added a comment - Github user asfgit closed the pull request at: https://github.com/apache/tajo/pull/605
        Hide
        githubbot ASF GitHub Bot added a comment -

        Github user asfgit closed the pull request at:

        https://github.com/apache/tajo/pull/459

        Show
        githubbot ASF GitHub Bot added a comment - Github user asfgit closed the pull request at: https://github.com/apache/tajo/pull/459
        Hide
        jihoonson Jihoon Son added a comment -

        Committed to branch-0.10.2 and master.
        Thanks Navis.

        Show
        jihoonson Jihoon Son added a comment - Committed to branch-0.10.2 and master. Thanks Navis .
        Hide
        hudson Hudson added a comment -

        ABORTED: Integrated in Tajo-master-CODEGEN-build #373 (See https://builds.apache.org/job/Tajo-master-CODEGEN-build/373/)
        TAJO-751: JDBC driver should support cancel() method. (jihoonson: rev 0f7ff8f01170665000ac7d2edc1d28710de69af4)

        • tajo-client/src/main/java/org/apache/tajo/jdbc/FetchResultSet.java
        • tajo-client/src/main/java/org/apache/tajo/client/TajoClientUtil.java
        • CHANGES
        • tajo-client/src/main/java/org/apache/tajo/jdbc/TajoMemoryResultSet.java
        • tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoMetaDataResultSet.java
        • tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
        • tajo-client/src/main/java/org/apache/tajo/jdbc/WaitingResultSet.java
        • tajo-core/src/test/java/org/apache/tajo/jdbc/TestTajoJdbc.java
        • tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java
        • tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java
        • tajo-common/src/main/java/org/apache/tajo/util/KeyValueSet.java
        • tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
        • tajo-client/src/main/java/org/apache/tajo/jdbc/TajoResultSetBase.java
        • tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java
        • tajo-jdbc/src/main/java/org/apache/tajo/jdbc/JdbcConnection.java
        • tajo-common/src/main/java/org/apache/tajo/QueryId.java
        • tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java
        • tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
        • tajo-common/src/main/java/org/apache/tajo/OverridableConf.java
        • tajo-common/src/main/java/org/apache/tajo/SessionVars.java
        • tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java
        • tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
        • tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result
        Show
        hudson Hudson added a comment - ABORTED: Integrated in Tajo-master-CODEGEN-build #373 (See https://builds.apache.org/job/Tajo-master-CODEGEN-build/373/ ) TAJO-751 : JDBC driver should support cancel() method. (jihoonson: rev 0f7ff8f01170665000ac7d2edc1d28710de69af4) tajo-client/src/main/java/org/apache/tajo/jdbc/FetchResultSet.java tajo-client/src/main/java/org/apache/tajo/client/TajoClientUtil.java CHANGES tajo-client/src/main/java/org/apache/tajo/jdbc/TajoMemoryResultSet.java tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoMetaDataResultSet.java tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java tajo-client/src/main/java/org/apache/tajo/jdbc/WaitingResultSet.java tajo-core/src/test/java/org/apache/tajo/jdbc/TestTajoJdbc.java tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java tajo-common/src/main/java/org/apache/tajo/util/KeyValueSet.java tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java tajo-client/src/main/java/org/apache/tajo/jdbc/TajoResultSetBase.java tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java tajo-jdbc/src/main/java/org/apache/tajo/jdbc/JdbcConnection.java tajo-common/src/main/java/org/apache/tajo/QueryId.java tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java tajo-common/src/main/java/org/apache/tajo/OverridableConf.java tajo-common/src/main/java/org/apache/tajo/SessionVars.java tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result
        Hide
        hudson Hudson added a comment -

        FAILURE: Integrated in Tajo-master-build #734 (See https://builds.apache.org/job/Tajo-master-build/734/)
        TAJO-751: JDBC driver should support cancel() method. (jihoonson: rev 0f7ff8f01170665000ac7d2edc1d28710de69af4)

        • CHANGES
        • tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoMetaDataResultSet.java
        • tajo-common/src/main/java/org/apache/tajo/QueryId.java
        • tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
        • tajo-client/src/main/java/org/apache/tajo/jdbc/FetchResultSet.java
        • tajo-client/src/main/java/org/apache/tajo/client/TajoClientUtil.java
        • tajo-client/src/main/java/org/apache/tajo/jdbc/WaitingResultSet.java
        • tajo-client/src/main/java/org/apache/tajo/jdbc/TajoResultSetBase.java
        • tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result
        • tajo-core/src/test/java/org/apache/tajo/jdbc/TestTajoJdbc.java
        • tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java
        • tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java
        • tajo-client/src/main/java/org/apache/tajo/jdbc/TajoMemoryResultSet.java
        • tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java
        • tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
        • tajo-common/src/main/java/org/apache/tajo/OverridableConf.java
        • tajo-common/src/main/java/org/apache/tajo/util/KeyValueSet.java
        • tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java
        • tajo-common/src/main/java/org/apache/tajo/SessionVars.java
        • tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java
        • tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java
        • tajo-jdbc/src/main/java/org/apache/tajo/jdbc/JdbcConnection.java
        • tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java
        Show
        hudson Hudson added a comment - FAILURE: Integrated in Tajo-master-build #734 (See https://builds.apache.org/job/Tajo-master-build/734/ ) TAJO-751 : JDBC driver should support cancel() method. (jihoonson: rev 0f7ff8f01170665000ac7d2edc1d28710de69af4) CHANGES tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoMetaDataResultSet.java tajo-common/src/main/java/org/apache/tajo/QueryId.java tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java tajo-client/src/main/java/org/apache/tajo/jdbc/FetchResultSet.java tajo-client/src/main/java/org/apache/tajo/client/TajoClientUtil.java tajo-client/src/main/java/org/apache/tajo/jdbc/WaitingResultSet.java tajo-client/src/main/java/org/apache/tajo/jdbc/TajoResultSetBase.java tajo-core/src/test/resources/results/TestTajoCli/testHelpSessionVars.result tajo-core/src/test/java/org/apache/tajo/jdbc/TestTajoJdbc.java tajo-client/src/main/java/org/apache/tajo/client/TajoClient.java tajo-core/src/main/java/org/apache/tajo/master/TajoMasterClientService.java tajo-client/src/main/java/org/apache/tajo/jdbc/TajoMemoryResultSet.java tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoPreparedStatement.java tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java tajo-common/src/main/java/org/apache/tajo/OverridableConf.java tajo-common/src/main/java/org/apache/tajo/util/KeyValueSet.java tajo-client/src/main/java/org/apache/tajo/client/QueryClientImpl.java tajo-common/src/main/java/org/apache/tajo/SessionVars.java tajo-jdbc/src/main/java/org/apache/tajo/jdbc/TajoStatement.java tajo-core/src/main/java/org/apache/tajo/master/QueryInProgress.java tajo-jdbc/src/main/java/org/apache/tajo/jdbc/JdbcConnection.java tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java

          People

          • Assignee:
            navis Navis
            Reporter:
            hjkim Hyoungjun Kim
          • Votes:
            0 Vote for this issue
            Watchers:
            5 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development