ATLAS-3089: PC Framework Moved to Intg Module

graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/JsonNodeProcessManager.java

@@ -19,8 +19,8 @@
 package org.apache.atlas.repository.graphdb.janus.migration;
 
 import org.apache.tinkerpop.shaded.jackson.databind.JsonNode;
-import org.apache.atlas.repository.graphdb.janus.migration.pc.WorkItemBuilder;
-import org.apache.atlas.repository.graphdb.janus.migration.pc.WorkItemConsumer;
+import org.apache.atlas.pc.WorkItemBuilder;
+import org.apache.atlas.pc.WorkItemConsumer;
 import org.apache.atlas.repository.graphdb.janus.migration.JsonNodeParsers.ParseElement;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.slf4j.Logger;
@@ -206,7 +206,7 @@ public class JsonNodeProcessManager {
         }
     }
 
-    static class WorkItemManager extends org.apache.atlas.repository.graphdb.janus.migration.pc.WorkItemManager {
+    static class WorkItemManager extends org.apache.atlas.pc.WorkItemManager {
         public WorkItemManager(WorkItemBuilder builder, int batchSize, int numWorkers) {
             super(builder, batchSize, numWorkers);
         }

graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/PostProcessManager.java

@@ -18,9 +18,9 @@
 
 package org.apache.atlas.repository.graphdb.janus.migration;
 
-import org.apache.atlas.repository.graphdb.janus.migration.pc.WorkItemBuilder;
-import org.apache.atlas.repository.graphdb.janus.migration.pc.WorkItemConsumer;
-import org.apache.atlas.repository.graphdb.janus.migration.pc.WorkItemManager;
+import org.apache.atlas.pc.WorkItemBuilder;
+import org.apache.atlas.pc.WorkItemConsumer;
+import org.apache.atlas.pc.WorkItemManager;
 import org.apache.atlas.repository.graphdb.janus.migration.postProcess.PostProcessListProperty;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.Vertex;

graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemBuilder.java → intg/src/main/java/org/apache/atlas/pc/WorkItemBuilder.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.atlas.repository.graphdb.janus.migration.pc;
+package org.apache.atlas.pc;
 
 import java.util.concurrent.BlockingQueue;
 

graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemConsumer.java → intg/src/main/java/org/apache/atlas/pc/WorkItemConsumer.java

@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 
-package org.apache.atlas.repository.graphdb.janus.migration.pc;
+package org.apache.atlas.pc;
 
-import com.google.common.base.Stopwatch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,7 +31,7 @@ public abstract class WorkItemConsumer<T> implements Runnable {
 
     private final BlockingQueue<T> queue;
     private       boolean          isDirty              = false;
-    private       long             maxCommitTimeSeconds = 0;
+    private       long maxCommitTimeInMs = 0;
 
     public WorkItemConsumer(BlockingQueue<T> queue) {
         this.queue = queue;
@@ -58,7 +57,7 @@ public abstract class WorkItemConsumer<T> implements Runnable {
     }
 
     public long getMaxCommitTimeSeconds() {
-        return (this.maxCommitTimeSeconds > 0 ? this.maxCommitTimeSeconds : 15);
+        return (this.maxCommitTimeInMs > 0 ? this.maxCommitTimeInMs / 1000 : 15);
     }
 
     protected void commitDirty() {
@@ -71,13 +70,13 @@ public abstract class WorkItemConsumer<T> implements Runnable {
     }
 
     protected void commit() {
-        Stopwatch sw = Stopwatch.createStarted();
+        long start = System.currentTimeMillis();
 
         doCommit();
 
-        sw.stop();
+        long end = System.currentTimeMillis();
 
-        updateCommitTime(sw.elapsed(TimeUnit.SECONDS));
+        updateCommitTime((end - start));
 
         isDirty = false;
     }
@@ -87,8 +86,8 @@ public abstract class WorkItemConsumer<T> implements Runnable {
     protected abstract void processItem(T item);
 
     protected void updateCommitTime(long commitTime) {
-        if (this.maxCommitTimeSeconds < commitTime) {
-            this.maxCommitTimeSeconds = commitTime;
+        if (this.maxCommitTimeInMs < commitTime) {
+            this.maxCommitTimeInMs = commitTime;
         }
     }
 }

graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemManager.java → intg/src/main/java/org/apache/atlas/pc/WorkItemManager.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.atlas.repository.graphdb.janus.migration.pc;
+package org.apache.atlas.pc;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/WorkItemConsumerTest.java → intg/src/test/java/org/apache/atlas/pc/WorkItemConsumerTest.java

@@ -16,9 +16,8 @@
  * limitations under the License.
  */
 
-package org.apache.atlas.repository.graphdb.janus.migration;
+package org.apache.atlas.pc;
 
-import org.apache.atlas.repository.graphdb.janus.migration.pc.WorkItemConsumer;
 import org.testng.annotations.Test;
 
 import java.util.concurrent.BlockingQueue;

graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/WorkItemManagerTest.java → intg/src/test/java/org/apache/atlas/pc/WorkItemManagerTest.java

@@ -16,11 +16,8 @@
  * limitations under the License.
  */
 
-package org.apache.atlas.repository.graphdb.janus.migration;
+package org.apache.atlas.pc;
 
-import org.apache.atlas.repository.graphdb.janus.migration.pc.WorkItemBuilder;
-import org.apache.atlas.repository.graphdb.janus.migration.pc.WorkItemConsumer;
-import org.apache.atlas.repository.graphdb.janus.migration.pc.WorkItemManager;
 import org.apache.commons.lang3.RandomUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;