[tez] branch master updated: TEZ-4127. TestMergeManager#testOnDiskMergerFilenames fails with dot directory name

[jeagles]

This is an automated email from the ASF dual-hosted git repository.

jeagles pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tez.git


The following commit(s) were added to refs/heads/master by this push:
     new f12fd5c  TEZ-4127. TestMergeManager#testOnDiskMergerFilenames fails 
with dot directory name
f12fd5c is described below

commit f12fd5caf965680aa0c56adbe963dad3dca8bd3f
Author: Jonathan Eagles <jeag...@apache.org>
AuthorDate: Thu Feb 27 09:04:15 2020 -0600

    TEZ-4127. TestMergeManager#testOnDiskMergerFilenames fails with dot 
directory name
---
 .../library/common/shuffle/orderedgrouped/TestMergeManager.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestMergeManager.java
 
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestMergeManager.java
index 5737578..92d9125 100644
--- 
a/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestMergeManager.java
+++ 
b/tez-runtime-library/src/test/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/TestMergeManager.java
@@ -757,9 +757,9 @@ public class TestMergeManager {
     assertEquals(m2Path.toString().length(), m3Path.toString().length());
 
     // Ensure the filenames are used correctly - based on the first file given 
to the merger.
-    String m1Prefix = m1Path.toString().substring(0, 
m1Path.toString().indexOf("."));
-    String m2Prefix = m2Path.toString().substring(0, 
m2Path.toString().indexOf("."));
-    String m3Prefix = m3Path.toString().substring(0, 
m3Path.toString().indexOf("."));
+    String m1Prefix = m1Path.toString().substring(0, 
m1Path.toString().lastIndexOf('.'));
+    String m2Prefix = m2Path.toString().substring(0, 
m2Path.toString().lastIndexOf('.'));
+    String m3Prefix = m3Path.toString().substring(0, 
m3Path.toString().lastIndexOf('.'));
 
     assertEquals(m1Prefix, m2Prefix);
     assertNotEquals(m1Prefix, m3Prefix);