accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] branch master updated: Fix LoadPlanTest failure
Date Fri, 14 Sep 2018 04:16:19 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new ed8f597  Fix LoadPlanTest failure
ed8f597 is described below

commit ed8f597e61d784f892ba5d770c636da2c010fd07
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Fri Sep 14 00:14:11 2018 -0400

    Fix LoadPlanTest failure
    
    Fix failure due to apparent rename of RangeType enums during
    development, without accompanying rename in test.
    
    Also, clean up the punctuation and fix a typo in the javadoc for
    RangeType enum values.
---
 .../org/apache/accumulo/core/data/LoadPlan.java    | 10 ++++-----
 .../apache/accumulo/core/data/LoadPlanTest.java    | 26 +++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/data/LoadPlan.java b/core/src/main/java/org/apache/accumulo/core/data/LoadPlan.java
index 19e4659..58dfabf 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/LoadPlan.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/LoadPlan.java
@@ -60,17 +60,17 @@ public class LoadPlan {
    */
   public enum RangeType {
     /**
-     * Range that correspond to one or more tablets in a table. For a range of this type
the start
+     * Range that corresponds to one or more tablets in a table. For a range of this type,
the start
      * row and end row can be null. The start row is exclusive and the end row is inclusive
(like
      * Accumulo tablets). A common use case for this would be when files were partitioned
using a
-     * tables splits. When using this range type the start and end row must exist as splits
in the
+     * table's splits. When using this range type, the start and end row must exist as splits
in the
      * table or an exception will be thrown at load time.
      */
     TABLE,
     /**
-     * Range that correspond to known rows in a file. For this range type the start row and
end row
-     * must be non-null. The start row and end row are both considered inclusive. At load
time these
-     * data ranges will be mapped to tablet ranges.
+     * Range that correspond to known rows in a file. For this range type, the start row
and end row
+     * must be non-null. The start row and end row are both considered inclusive. At load
time,
+     * these data ranges will be mapped to table ranges.
      */
     FILE
   }
diff --git a/core/src/test/java/org/apache/accumulo/core/data/LoadPlanTest.java b/core/src/test/java/org/apache/accumulo/core/data/LoadPlanTest.java
index 0851568..94c942b 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/LoadPlanTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/LoadPlanTest.java
@@ -73,19 +73,19 @@ public class LoadPlanTest {
         .build();
 
     Set<String> expected = new HashSet<>();
-    expected.add("f1.rf:DATA:1112:1145");
-    expected.add("f2.rf:DATA:abc:def");
-    expected.add("f3.rf:DATA:368:479");
-    expected.add("f4.rf:TABLET:null:aaa");
-    expected.add("f5.rf:TABLET:yyy:null");
-    expected.add("f6.rf:TABLET:null:bbb");
-    expected.add("f7.rf:TABLET:www:null");
-    expected.add("f8.rf:TABLET:null:ccc");
-    expected.add("f9.rf:TABLET:xxx:null");
-    expected.add("fa.rf:TABLET:1138:1147");
-    expected.add("fb.rf:TABLET:heg:klt");
-    expected.add("fc.rf:TABLET:agt:ctt");
-    expected.add("fd.rf:TABLET:null:null");
+    expected.add("f1.rf:FILE:1112:1145");
+    expected.add("f2.rf:FILE:abc:def");
+    expected.add("f3.rf:FILE:368:479");
+    expected.add("f4.rf:TABLE:null:aaa");
+    expected.add("f5.rf:TABLE:yyy:null");
+    expected.add("f6.rf:TABLE:null:bbb");
+    expected.add("f7.rf:TABLE:www:null");
+    expected.add("f8.rf:TABLE:null:ccc");
+    expected.add("f9.rf:TABLE:xxx:null");
+    expected.add("fa.rf:TABLE:1138:1147");
+    expected.add("fb.rf:TABLE:heg:klt");
+    expected.add("fc.rf:TABLE:agt:ctt");
+    expected.add("fd.rf:TABLE:null:null");
 
     Set<String> actual = loadPlan.getDestinations().stream().map(LoadPlanTest::toString)
         .collect(toSet());


Mime
View raw message