From 3afc619ada6460db92fc623e43ebe9211d07bd8d Mon Sep 17 00:00:00 2001
From: Matt Casters <mattcasters@gmail.com>
Date: Fri, 5 Mar 2021 11:09:10 +0100
Subject: [PATCH] issue #35 : reduce metastore locking

---
 pom.xml                                                   | 6 +++---
 .../env/xp/JobStartCheckEnvironmentExtensionPoint.java    | 8 ++++++++
 .../env/xp/TransStartCheckEnvironmentExtensionPoint.java  | 8 ++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 54d4056..fc3102a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.pentaho</groupId>
     <artifactId>pentaho-ce-jar-parent-pom</artifactId>
-    <version>8.1-SNAPSHOT</version>
+    <version>8.2.0.7-719</version>
   </parent>
   <artifactId>kettle-environment</artifactId>
   <name>${project.artifactId}</name>
@@ -19,7 +19,7 @@
     </license>
   </licenses>
   <properties>
-    <pentaho-kettle.version>8.1-SNAPSHOT</pentaho-kettle.version>
+    <pentaho-kettle.version>8.2.0.7-719</pentaho-kettle.version>
     <mockito-all.version>1.9.5</mockito-all.version>
     <junit.version>4.4</junit.version>
     <jackson-version>2.10.0</jackson-version>
@@ -143,5 +143,5 @@
   </dependencyManagement>
 
   <groupId>kettle-environment</groupId>
-  <version>1.7.1-SNAPSHOT</version>
+  <version>1.7.2-SNAPSHOT</version>
 </project>
diff --git a/src/main/java/org/kettle/env/xp/JobStartCheckEnvironmentExtensionPoint.java b/src/main/java/org/kettle/env/xp/JobStartCheckEnvironmentExtensionPoint.java
index 5c85f88..0d63a36 100644
--- a/src/main/java/org/kettle/env/xp/JobStartCheckEnvironmentExtensionPoint.java
+++ b/src/main/java/org/kettle/env/xp/JobStartCheckEnvironmentExtensionPoint.java
@@ -26,6 +26,14 @@ public class JobStartCheckEnvironmentExtensionPoint implements ExtensionPointInt
 
     Job job = (Job) object;
 
+    // Only check for top level jobs
+    if (job.getParentTrans()!=null) {
+      return;
+    }
+    if (job.getParentJob()!=null) {
+      return;
+    }
+
     String jobFilename = job.getFilename();
 
     try {
diff --git a/src/main/java/org/kettle/env/xp/TransStartCheckEnvironmentExtensionPoint.java b/src/main/java/org/kettle/env/xp/TransStartCheckEnvironmentExtensionPoint.java
index e66f6ff..ec7b64c 100644
--- a/src/main/java/org/kettle/env/xp/TransStartCheckEnvironmentExtensionPoint.java
+++ b/src/main/java/org/kettle/env/xp/TransStartCheckEnvironmentExtensionPoint.java
@@ -35,6 +35,14 @@ public class TransStartCheckEnvironmentExtensionPoint implements ExtensionPointI
 
     Trans trans = (Trans) object;
 
+    // Only check for top level transformations
+    if (trans.getParentTrans()!=null) {
+      return;
+    }
+    if (trans.getParentJob()!=null) {
+      return;
+    }
+
     String transFilename = trans.getFilename();
 
     try {