You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by am...@apache.org on 2019/03/25 16:38:35 UTC
[atlas] branch master updated: ATLAS-3089: PC Framework Moved to
Intg Module
This is an automated email from the ASF dual-hosted git repository.
amestry pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/master by this push:
new 3ba4a3f ATLAS-3089: PC Framework Moved to Intg Module
3ba4a3f is described below
commit 3ba4a3fe670c36b71f42d3579264a0f060af1090
Author: Ashutosh Mestry <am...@hortonworks.com>
AuthorDate: Fri Mar 22 16:13:13 2019 -0700
ATLAS-3089: PC Framework Moved to Intg Module
---
.../graphdb/janus/migration/JsonNodeProcessManager.java | 6 +++---
.../graphdb/janus/migration/PostProcessManager.java | 6 +++---
.../main/java/org/apache/atlas}/pc/WorkItemBuilder.java | 2 +-
.../java/org/apache/atlas}/pc/WorkItemConsumer.java | 17 ++++++++---------
.../main/java/org/apache/atlas}/pc/WorkItemManager.java | 2 +-
.../java/org/apache/atlas/pc}/WorkItemConsumerTest.java | 3 +--
.../java/org/apache/atlas/pc}/WorkItemManagerTest.java | 5 +----
7 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/JsonNodeProcessManager.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/JsonNodeProcessManager.java
index e2f418e..fb1e684 100644
--- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/JsonNodeProcessManager.java
+++ b/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);
}
diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/PostProcessManager.java b/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/PostProcessManager.java
index 7046f8c..cf18501 100644
--- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/PostProcessManager.java
+++ b/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;
diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemBuilder.java b/intg/src/main/java/org/apache/atlas/pc/WorkItemBuilder.java
similarity index 93%
rename from graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemBuilder.java
rename to intg/src/main/java/org/apache/atlas/pc/WorkItemBuilder.java
index 257b633..6dcb29d 100644
--- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemBuilder.java
+++ b/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;
diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemConsumer.java b/intg/src/main/java/org/apache/atlas/pc/WorkItemConsumer.java
similarity index 82%
rename from graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemConsumer.java
rename to intg/src/main/java/org/apache/atlas/pc/WorkItemConsumer.java
index 39b50de..df2cb67 100644
--- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemConsumer.java
+++ b/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;
}
}
}
diff --git a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemManager.java b/intg/src/main/java/org/apache/atlas/pc/WorkItemManager.java
similarity index 97%
rename from graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemManager.java
rename to intg/src/main/java/org/apache/atlas/pc/WorkItemManager.java
index d50ada4..8ac6f11 100644
--- a/graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/migration/pc/WorkItemManager.java
+++ b/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;
diff --git a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/WorkItemConsumerTest.java b/intg/src/test/java/org/apache/atlas/pc/WorkItemConsumerTest.java
similarity index 95%
rename from graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/WorkItemConsumerTest.java
rename to intg/src/test/java/org/apache/atlas/pc/WorkItemConsumerTest.java
index 4cd4c2c..6c88b9e 100644
--- a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/WorkItemConsumerTest.java
+++ b/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;
diff --git a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/WorkItemManagerTest.java b/intg/src/test/java/org/apache/atlas/pc/WorkItemManagerTest.java
similarity index 92%
rename from graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/WorkItemManagerTest.java
rename to intg/src/test/java/org/apache/atlas/pc/WorkItemManagerTest.java
index 25488bd..e72bdd0 100644
--- a/graphdb/janus/src/test/java/org/apache/atlas/repository/graphdb/janus/migration/WorkItemManagerTest.java
+++ b/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;