Repository: oozie Updated Branches: refs/heads/master 430e51070 -> 34e329338
OOZIE-3082 Move org.apache.oozie.action.hadoop.ActionStats to Oozie ShareLib (asasvari) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/34e32933 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/34e32933 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/34e32933 Branch: refs/heads/master Commit: 34e3293384eae246485dc35af901c5fd421ac9b2 Parents: 430e510 Author: Attila Sasvari <asasv...@cloudera.com> Authored: Wed Oct 11 10:56:43 2017 +0200 Committer: Attila Sasvari <asasv...@cloudera.com> Committed: Wed Oct 11 10:57:22 2017 +0200 ---------------------------------------------------------------------- .../apache/oozie/action/hadoop/ActionStats.java | 39 -------------------- .../apache/oozie/action/hadoop/ActionType.java | 27 -------------- release-log.txt | 1 + .../apache/oozie/action/hadoop/ActionStats.java | 39 ++++++++++++++++++++ .../apache/oozie/action/hadoop/ActionType.java | 27 ++++++++++++++ 5 files changed, 67 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/34e32933/core/src/main/java/org/apache/oozie/action/hadoop/ActionStats.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/ActionStats.java b/core/src/main/java/org/apache/oozie/action/hadoop/ActionStats.java deleted file mode 100644 index d5c36aa..0000000 --- a/core/src/main/java/org/apache/oozie/action/hadoop/ActionStats.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 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.oozie.action.hadoop; - -/** - * Abstract class that represents the statistics for any type of Oozie action. - */ -public abstract class ActionStats { - protected ActionType currentActionType; - - /** - * Return the statistics in JSON format. Sub-classes must override this - * method to provide statistics for their particular action type. - * - * @return a JSON string with the statistics information. - */ - public abstract String toJSON(); - - public ActionType getCurrentActionType() { - return currentActionType; - } -} http://git-wip-us.apache.org/repos/asf/oozie/blob/34e32933/core/src/main/java/org/apache/oozie/action/hadoop/ActionType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/ActionType.java b/core/src/main/java/org/apache/oozie/action/hadoop/ActionType.java deleted file mode 100644 index aae0a0c..0000000 --- a/core/src/main/java/org/apache/oozie/action/hadoop/ActionType.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * 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.oozie.action.hadoop; - -/** - * Enumerator that lists the various kinds of actions supported by Oozie. - */ -public enum ActionType { - MAP_REDUCE, PIG, HIVE -} http://git-wip-us.apache.org/repos/asf/oozie/blob/34e32933/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 6495e69..f7adedd 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3082 Move org.apache.oozie.action.hadoop.ActionStats to Oozie ShareLib (asasvari) OOZIE-3077 SLA documentation fixes (satishsaley) OOZIE-3031 Coord job with only unresolved dependencies doesn't timeout (puru via satishsaley) OOZIE-3079 Filtering coordinators returns bundle id as null (satishsaley) http://git-wip-us.apache.org/repos/asf/oozie/blob/34e32933/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ActionStats.java ---------------------------------------------------------------------- diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ActionStats.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ActionStats.java new file mode 100644 index 0000000..d5c36aa --- /dev/null +++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ActionStats.java @@ -0,0 +1,39 @@ +/** + * 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.oozie.action.hadoop; + +/** + * Abstract class that represents the statistics for any type of Oozie action. + */ +public abstract class ActionStats { + protected ActionType currentActionType; + + /** + * Return the statistics in JSON format. Sub-classes must override this + * method to provide statistics for their particular action type. + * + * @return a JSON string with the statistics information. + */ + public abstract String toJSON(); + + public ActionType getCurrentActionType() { + return currentActionType; + } +} http://git-wip-us.apache.org/repos/asf/oozie/blob/34e32933/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ActionType.java ---------------------------------------------------------------------- diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ActionType.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ActionType.java new file mode 100644 index 0000000..aae0a0c --- /dev/null +++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ActionType.java @@ -0,0 +1,27 @@ +/** + * 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.oozie.action.hadoop; + +/** + * Enumerator that lists the various kinds of actions supported by Oozie. + */ +public enum ActionType { + MAP_REDUCE, PIG, HIVE +}
