Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HIVE-243. ^C breaks out of running query, but not whole CLI (George D…
…jabarov via Ning Zhang) git-svn-id: https://svn.apache.org/repos/asf/hive/trunk@1104625 13f79535-47bb-0310-9956-ffa450edef68
- Loading branch information
Ning Zhang
committed
May 17, 2011
1 parent
dc92949
commit 49bc14f
Showing
5 changed files
with
313 additions
and
150 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
common/src/java/org/apache/hadoop/hive/common/HiveInterruptCallback.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/** | ||
* 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.hadoop.hive.common; | ||
|
||
public interface HiveInterruptCallback { | ||
/** | ||
* Request interrupting of the processing | ||
*/ | ||
void interrupt(); | ||
} |
70 changes: 70 additions & 0 deletions
70
common/src/java/org/apache/hadoop/hive/common/HiveInterruptUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
/** | ||
* 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.hadoop.hive.common; | ||
|
||
import java.util.ArrayList; | ||
import java.util.List; | ||
|
||
public class HiveInterruptUtils { | ||
|
||
/** | ||
* A list of currently running comments that needs cleanup when the command is canceled | ||
*/ | ||
private static List<HiveInterruptCallback> interruptCallbacks = new ArrayList<HiveInterruptCallback>(); | ||
|
||
public static HiveInterruptCallback add(HiveInterruptCallback command) { | ||
synchronized (interruptCallbacks) { | ||
interruptCallbacks.add(command); | ||
} | ||
return command; | ||
} | ||
|
||
public static HiveInterruptCallback remove(HiveInterruptCallback command) { | ||
synchronized (interruptCallbacks) { | ||
interruptCallbacks.remove(command); | ||
} | ||
return command; | ||
} | ||
|
||
/** | ||
* Request interruption of current hive command | ||
*/ | ||
public static void interrupt() { | ||
synchronized (interruptCallbacks) { | ||
for (HiveInterruptCallback resource : new ArrayList<HiveInterruptCallback>(interruptCallbacks)) { | ||
resource.interrupt(); | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* Checks if the current thread has been interrupted and throws RuntimeException is it has. | ||
*/ | ||
public static void checkInterrupted() { | ||
if (Thread.currentThread().isInterrupted()) { | ||
InterruptedException interrupt = null; | ||
try { | ||
Thread.sleep(0); | ||
} catch (InterruptedException e) { | ||
interrupt = e; | ||
} | ||
throw new RuntimeException("Interuppted", interrupt); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.