From 0657b3a908910241cbf709a7b1387766d1e12e8b Mon Sep 17 00:00:00 2001 From: "puspendu.banerjee@gmail.com" Date: Tue, 2 Feb 2016 15:04:37 -0600 Subject: [PATCH 1/3] Performance improvement. test Timeout Mitigation. less IO, less dependency on /dev/(u)random. --- .../apache/nifi/controller/TestStandardFlowFileQueue.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java index 32d8566fa40d..9dfcbb5342b6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java @@ -533,10 +533,13 @@ public TestFlowFile(final Map attributes, final long size) { this.size = size; if (!attributes.containsKey(CoreAttributes.UUID.key())) { - attributes.put(CoreAttributes.UUID.key(), UUID.randomUUID().toString()); + attributes.put(CoreAttributes.UUID.key(), createFakeUUID().toString()); } } + private static Long createFakeUUID(){ + return idGenerator.incrementAndGet(); + } @Override public long getId() { From 58748b6c5bf0ff9578c056a8b44940998d07e86c Mon Sep 17 00:00:00 2001 From: "puspendu.banerjee@gmail.com" Date: Wed, 3 Feb 2016 05:11:20 -0600 Subject: [PATCH 2/3] Incorporated comments for UUID format conformance & optimized. --- .../apache/nifi/controller/TestStandardFlowFileQueue.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java index 9dfcbb5342b6..4eaee5897cee 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java @@ -533,12 +533,13 @@ public TestFlowFile(final Map attributes, final long size) { this.size = size; if (!attributes.containsKey(CoreAttributes.UUID.key())) { - attributes.put(CoreAttributes.UUID.key(), createFakeUUID().toString()); + attributes.put(CoreAttributes.UUID.key(), createFakeUUID()); } } - private static Long createFakeUUID(){ - return idGenerator.incrementAndGet(); + private static String createFakeUUID(){ + final String s=Long.toHexString(idGenerator.incrementAndGet()); + return new StringBuffer("00000000-0000-0000-0000000000000000".substring(0,(35-s.length()))+s).insert(23, '-').toString(); } @Override From dd2022be75b3fd6bed3e22bd32e1b2416ff500ac Mon Sep 17 00:00:00 2001 From: "puspendu.banerjee@gmail.com" Date: Wed, 3 Feb 2016 05:28:14 -0600 Subject: [PATCH 3/3] polised to satisfy this test-case. we don't need incrementAndGet --- .../org/apache/nifi/controller/TestStandardFlowFileQueue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java index 4eaee5897cee..b84ae90b69f2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/TestStandardFlowFileQueue.java @@ -537,8 +537,8 @@ public TestFlowFile(final Map attributes, final long size) { } } - private static String createFakeUUID(){ - final String s=Long.toHexString(idGenerator.incrementAndGet()); + private String createFakeUUID(){ + final String s=Long.toHexString(id); return new StringBuffer("00000000-0000-0000-0000000000000000".substring(0,(35-s.length()))+s).insert(23, '-').toString(); }