You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by th...@apache.org on 2016/01/12 19:14:55 UTC
[2/2] hive git commit: HIVE-12660 : addendum for branch-1
HIVE-12660 : addendum for branch-1
Conflicts:
service/src/java/org/apache/hive/service/cli/operation/OperationManager.java
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/fd22de06
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/fd22de06
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/fd22de06
Branch: refs/heads/branch-1
Commit: fd22de06c574e2246521b44c0e92f2a53123261b
Parents: 2462bc8
Author: Thejas Nair <th...@hortonworks.com>
Authored: Mon Jan 11 13:21:27 2016 -0800
Committer: Thejas Nair <th...@hortonworks.com>
Committed: Tue Jan 12 10:14:39 2016 -0800
----------------------------------------------------------------------
.../apache/hive/service/cli/operation/OperationManager.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/fd22de06/service/src/java/org/apache/hive/service/cli/operation/OperationManager.java
----------------------------------------------------------------------
diff --git a/service/src/java/org/apache/hive/service/cli/operation/OperationManager.java b/service/src/java/org/apache/hive/service/cli/operation/OperationManager.java
index 5bc9fef..dfc3bd7 100644
--- a/service/src/java/org/apache/hive/service/cli/operation/OperationManager.java
+++ b/service/src/java/org/apache/hive/service/cli/operation/OperationManager.java
@@ -20,6 +20,9 @@ package org.apache.hive.service.cli.operation;
import java.sql.SQLException;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -284,6 +287,10 @@ public class OperationManager extends AbstractService {
return schema;
}
+ public Collection<Operation> getOperations() {
+ return Collections.unmodifiableCollection(handleToOperation.values());
+ }
+
public OperationLog getOperationLogByThread() {
return OperationLog.getCurrentOperationLog();
}