Mailing-List: contact commits-help@fluo.incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@fluo.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: kturner@apache.org
To: commits@fluo.incubator.apache.org
Date: Thu, 04 Aug 2016 14:18:44 -0000
Message-Id: <90fc8cbc7e944f51ac3480858b9af7bb@git.apache.org>
Subject: [1/3] incubator-fluo git commit: closes #746 Misc Bytes updates
archived-at: Thu, 04 Aug 2016 14:18:52 -0000

Repository: incubator-fluo
Updated Branches:
  refs/heads/master 540097174 -> f8d0af6e9


http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/aa36c88f/modules/core/src/test/java/org/apache/fluo/core/data/SpanTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/fluo/core/data/SpanTest.java b/modules/core/src/test/java/org/apache/fluo/core/data/SpanTest.java
deleted file mode 100644
index d9b0e02..0000000
--- a/modules/core/src/test/java/org/apache/fluo/core/data/SpanTest.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.apache.fluo.core.data;
-
-import org.apache.fluo.api.data.Bytes;
-import org.apache.fluo.api.data.Column;
-import org.apache.fluo.api.data.RowColumn;
-import org.apache.fluo.api.data.Span;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Unit test for {@link Span}
- */
-public class SpanTest {
-
-  String rw1s = "rw1";
-  String cf1s = "cf1";
-  String cq1s = "cq1";
-  String cv1s = "cv1";
-  long ts1 = 51;
-  String rw2s = "rw2";
-  String cf2s = "cf2";
-  String cq2s = "cq2";
-  String cv2s = "cv2";
-  long ts2 = 51;
-  Bytes rw1b = Bytes.of(rw1s);
-  Bytes cf1b = Bytes.of(cf1s);
-  Bytes cq1b = Bytes.of(cq1s);
-  Bytes cv1b = Bytes.of(cv1s);
-  Bytes rw2b = Bytes.of(rw2s);
-  Bytes cf2b = Bytes.of(cf2s);
-  Bytes cq2b = Bytes.of(cq2s);
-  Bytes cv2b = Bytes.of(cv2s);
-
-  @Test
-  public void testRowRange() {
-    // Test with Bytes input
-    Assert.assertEquals(new Span(rw1b, true, rw2b, false), new Span.Builder().startRow(rw1b)
-        .endRow(rw2b).exclusive().build());
-    Assert.assertEquals(new Span(rw1b, false, rw2b, false), new Span.Builder().startRow(rw1b)
-        .exclusive().endRow(rw2b).exclusive().build());
-    Assert.assertEquals(new Span(rw1b, true, rw2b, true),
-        new Span.Builder().startRow(rw1b).endRow(rw2b).build());
-    Assert.assertEquals(new Span(rw1b, false, rw2b, true), new Span.Builder().startRow(rw1b)
-        .exclusive().endRow(rw2b).build());
-
-    // Test with String input
-    Assert.assertEquals(new Span(rw1b, true, rw2b, false), new Span.Builder().startRow(rw1s)
-        .endRow(rw2s).exclusive().build());
-    Assert.assertEquals(new Span(rw1b, false, rw2b, false), new Span.Builder().startRow(rw1s)
-        .exclusive().endRow(rw2s).exclusive().build());
-    Assert.assertEquals(new Span(rw1b, true, rw2b, true),
-        new Span.Builder().startRow(rw1s).endRow(rw2s).build());
-    Assert.assertEquals(new Span(rw1b, false, rw2b, true), new Span.Builder().startRow(rw1s)
-        .exclusive().endRow(rw2s).build());
-  }
-
-  @Test
-  public void testInfiniteRanges() {
-    RowColumn rc1 = new RowColumn(rw1b, new Column(cf1b));
-    RowColumn frc1 = rc1.following();
-    RowColumn rc2 = new RowColumn(rw2b, new Column(cf2b));
-    RowColumn frc2 = rc2.following();
-
-    Assert.assertEquals(new Span(RowColumn.EMPTY, true, frc2, false),
-        new Span.Builder().endRow(rw2b).fam(cf2b).build());
-    Assert.assertEquals(new Span(RowColumn.EMPTY, true, rc2, false), new Span.Builder()
-        .endRow(rw2b).fam(cf2b).exclusive().build());
-    Assert.assertEquals(new Span(rc1, true, RowColumn.EMPTY, true),
-        new Span.Builder().startRow(rw1b).fam(cf1b).build());
-    Assert.assertEquals(new Span(frc1, true, RowColumn.EMPTY, true),
-        new Span.Builder().startRow(rw1b).fam(cf1b).exclusive().build());
-  }
-
-  @Test
-  public void testRowCFRange() {
-    RowColumn rc1 = new RowColumn(rw1b, new Column(cf1b));
-    RowColumn frc1 = rc1.following();
-    RowColumn rc2 = new RowColumn(rw2b, new Column(cf2b));
-    RowColumn frc2 = rc2.following();
-
-    Assert.assertEquals(new Span(rc1, true, frc2, false),
-        new Span.Builder().startRow(rw1b).fam(cf1b).endRow(rw2b).fam(cf2b).build());
-    Assert.assertEquals(new Span(rc1, true, rc2, false), new Span.Builder().startRow(rw1b)
-        .fam(cf1b).endRow(rw2b).fam(cf2b).exclusive().build());
-    Assert.assertEquals(new Span(frc1, true, frc2, false),
-        new Span.Builder().startRow(rw1b).fam(cf1b).exclusive().endRow(rw2b).fam(cf2b).build());
-    Assert.assertEquals(new Span(frc1, true, rc2, false),
-        new Span.Builder().startRow(rw1b).fam(cf1b).exclusive().endRow(rw2b).fam(cf2b).exclusive()
-            .build());
-  }
-
-  @Test
-  public void testRowCFCQRange() {
-    RowColumn rc1 = new RowColumn(rw1b, new Column(cf1b, cq1b));
-    RowColumn frc1 = rc1.following();
-    RowColumn rc2 = new RowColumn(rw2b, new Column(cf2b, cq2b));
-    RowColumn frc2 = rc2.following();
-
-    Assert.assertEquals(new Span(rc1, true, frc2, false),
-        new Span.Builder().startRow(rw1b).fam(cf1b).qual(cq1b).endRow(rw2b).fam(cf2b).qual(cq2b)
-            .build());
-    Assert.assertEquals(new Span(rc1, true, rc2, false), new Span.Builder().startRow(rw1b)
-        .fam(cf1b).qual(cq1b).endRow(rw2b).fam(cf2b).qual(cq2b).exclusive().build());
-    Assert.assertEquals(new Span(frc1, true, frc2, false),
-        new Span.Builder().startRow(rw1b).fam(cf1b).qual(cq1b).exclusive().endRow(rw2b).fam(cf2b)
-            .qual(cq2b).build());
-    Assert.assertEquals(new Span(frc1, true, rc2, false),
-        new Span.Builder().startRow(rw1b).fam(cf1b).qual(cq1b).exclusive().endRow(rw2b).fam(cf2b)
-            .qual(cq2b).exclusive().build());
-  }
-
-  @Test
-  public void testRowCFCQCVRange() {
-    RowColumn rc1 = new RowColumn(rw1b, new Column(cf1b, cq1b, Bytes.of(cv1s)));
-    RowColumn frc1 = rc1.following();
-    RowColumn rc2 = new RowColumn(rw2b, new Column(cf2b, cq2b, Bytes.of(cv2s)));
-    RowColumn frc2 = rc2.following();
-
-    Assert.assertEquals(new Span(rc1, true, frc2, false),
-        new Span.Builder().startRow(rw1b).fam(cf1b).qual(cq1b).vis(cv1b).endRow(rw2b).fam(cf2b)
-            .qual(cq2b).vis(cv2b).build());
-    Assert.assertEquals(new Span(rc1, true, rc2, false), new Span.Builder().startRow(rw1b)
-        .fam(cf1b).qual(cq1b).vis(cv1b).endRow(rw2b).fam(cf2b).qual(cq2b).vis(cv2b).exclusive()
-        .build());
-    Assert.assertEquals(new Span(frc1, true, frc2, false),
-        new Span.Builder().startRow(rw1b).fam(cf1b).qual(cq1b).vis(cv1b).exclusive().endRow(rw2b)
-            .fam(cf2b).qual(cq2b).vis(cv2b).build());
-    Assert.assertEquals(new Span(frc1, true, rc2, false),
-        new Span.Builder().startRow(rw1b).fam(cf1b).qual(cq1b).vis(cv1b).exclusive().endRow(rw2b)
-            .fam(cf2b).qual(cq2b).vis(cv2b).exclusive().build());
-  }
-
-  @Test
-  public void testExactSpan() {
-    Span s = Span.exact(rw1b);
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(Column.EMPTY, s.getStart().getColumn());
-    Assert.assertTrue(s.isStartInclusive());
-    Assert.assertEquals(new RowColumn(rw1b).following().getRow(), s.getEnd().getRow());
-    Assert.assertEquals(Column.EMPTY, s.getEnd().getColumn());
-    Assert.assertFalse(s.isEndInclusive());
-
-    s = Span.exact(rw1b, Column.EMPTY);
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(Column.EMPTY, s.getStart().getColumn());
-    Assert.assertTrue(s.isStartInclusive());
-    Assert.assertEquals(new RowColumn(rw1b).following().getRow(), s.getEnd().getRow());
-    Assert.assertEquals(Column.EMPTY, s.getEnd().getColumn());
-    Assert.assertFalse(s.isEndInclusive());
-
-    s = Span.exact(rw1b, new Column(cf1b));
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(cf1b, s.getStart().getColumn().getFamily());
-    Assert.assertFalse(s.getStart().getColumn().isQualifierSet());
-    Assert.assertFalse(s.getStart().getColumn().isVisibilitySet());
-    Assert.assertTrue(s.isStartInclusive());
-    Assert.assertEquals(rw1b, s.getEnd().getRow());
-    Assert.assertEquals(new RowColumn(rw1b, new Column(cf1b)).following().getColumn().getFamily(),
-        s.getEnd().getColumn().getFamily());
-    Assert.assertFalse(s.getEnd().getColumn().isQualifierSet());
-    Assert.assertFalse(s.getEnd().getColumn().isVisibilitySet());
-    Assert.assertFalse(s.isEndInclusive());
-
-    s = Span.exact(rw1b, new Column(cf1b, cq1b));
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(cf1b, s.getStart().getColumn().getFamily());
-    Assert.assertEquals(cq1b, s.getStart().getColumn().getQualifier());
-    Assert.assertFalse(s.getStart().getColumn().isVisibilitySet());
-    Assert.assertTrue(s.isStartInclusive());
-    Assert.assertEquals(rw1b, s.getEnd().getRow());
-    Assert.assertEquals(cf1b, s.getEnd().getColumn().getFamily());
-    Assert.assertEquals(new RowColumn(rw1b, new Column(cf1b, cq1b)).following().getColumn()
-        .getQualifier(), s.getEnd().getColumn().getQualifier());
-    Assert.assertFalse(s.getEnd().getColumn().isVisibilitySet());
-    Assert.assertFalse(s.isEndInclusive());
-
-    s = Span.exact(rw1b, new Column(cf1b, cq1b, cv1b));
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(cf1b, s.getStart().getColumn().getFamily());
-    Assert.assertEquals(cq1b, s.getStart().getColumn().getQualifier());
-    Assert.assertEquals(cv1b, s.getStart().getColumn().getVisibility());
-    Assert.assertTrue(s.isStartInclusive());
-    Assert.assertEquals(rw1b, s.getEnd().getRow());
-    Assert.assertEquals(cf1b, s.getEnd().getColumn().getFamily());
-    Assert.assertEquals(cq1b, s.getEnd().getColumn().getQualifier());
-    Assert.assertEquals(new RowColumn(rw1b, new Column(cf1b, cq1b, cv1b)).following().getColumn()
-        .getVisibility(), s.getEnd().getColumn().getVisibility());
-    Assert.assertFalse(s.isEndInclusive());
-  }
-
-  @Test
-  public void testPrefixSpan() {
-    Span s = Span.prefix(rw1b);
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(Column.EMPTY, s.getStart().getColumn());
-    Assert.assertTrue(s.isStartInclusive());
-    Assert.assertEquals(rw2b, s.getEnd().getRow());
-    Assert.assertEquals(Column.EMPTY, s.getEnd().getColumn());
-    Assert.assertFalse(s.isEndInclusive());
-
-    s = Span.prefix(rw1b, new Column());
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(Column.EMPTY, s.getStart().getColumn());
-    Assert.assertTrue(s.isStartInclusive());
-    Assert.assertEquals(rw2b, s.getEnd().getRow());
-    Assert.assertEquals(Column.EMPTY, s.getEnd().getColumn());
-    Assert.assertFalse(s.isEndInclusive());
-
-    s = Span.prefix(rw1b, new Column(cf1b));
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(cf1b, s.getStart().getColumn().getFamily());
-    Assert.assertFalse(s.getStart().getColumn().isQualifierSet());
-    Assert.assertFalse(s.getStart().getColumn().isVisibilitySet());
-    Assert.assertTrue(s.isStartInclusive());
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(cf2b, s.getEnd().getColumn().getFamily());
-    Assert.assertFalse(s.getEnd().getColumn().isQualifierSet());
-    Assert.assertFalse(s.getEnd().getColumn().isVisibilitySet());
-    Assert.assertFalse(s.isEndInclusive());
-
-    s = Span.prefix(rw1b, new Column(cf1b, cq1b));
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(cf1b, s.getStart().getColumn().getFamily());
-    Assert.assertEquals(cq1b, s.getStart().getColumn().getQualifier());
-    Assert.assertFalse(s.getStart().getColumn().isVisibilitySet());
-    Assert.assertTrue(s.isStartInclusive());
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(cf1b, s.getEnd().getColumn().getFamily());
-    Assert.assertEquals(cq2b, s.getEnd().getColumn().getQualifier());
-    Assert.assertFalse(s.getEnd().getColumn().isVisibilitySet());
-    Assert.assertFalse(s.isEndInclusive());
-
-    s = Span.prefix(rw1b, new Column(cf1b, cq1b, cv1b));
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(cf1b, s.getStart().getColumn().getFamily());
-    Assert.assertEquals(cq1b, s.getStart().getColumn().getQualifier());
-    Assert.assertEquals(cv1b, s.getStart().getColumn().getVisibility());
-    Assert.assertTrue(s.isStartInclusive());
-    Assert.assertEquals(rw1b, s.getStart().getRow());
-    Assert.assertEquals(cf1b, s.getEnd().getColumn().getFamily());
-    Assert.assertEquals(cq1b, s.getEnd().getColumn().getQualifier());
-    Assert.assertEquals(cv2b, s.getEnd().getColumn().getVisibility());
-    Assert.assertFalse(s.isEndInclusive());
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/aa36c88f/modules/core/src/test/java/org/apache/fluo/core/util/ByteUtilTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/fluo/core/util/ByteUtilTest.java b/modules/core/src/test/java/org/apache/fluo/core/util/ByteUtilTest.java
index 7c62f58..be575ac 100644
--- a/modules/core/src/test/java/org/apache/fluo/core/util/ByteUtilTest.java
+++ b/modules/core/src/test/java/org/apache/fluo/core/util/ByteUtilTest.java
@@ -15,8 +15,11 @@
 
 package org.apache.fluo.core.util;
 
+import java.util.List;
+
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.ByteSequence;
+import org.apache.fluo.accumulo.util.ByteArrayUtil;
 import org.apache.fluo.api.data.Bytes;
 import org.apache.hadoop.io.Text;
 import org.junit.Assert;
@@ -44,4 +47,19 @@ public class ByteUtilTest {
     Assert.assertEquals(Bytes.of(s2), b2);
     Assert.assertEquals(bs2, ByteUtil.toByteSequence(b2));
   }
+
+  @Test
+  public void testConcatSplit() {
+
+    Bytes b1 = Bytes.of("str1");
+    Bytes b2 = Bytes.of("string2");
+    Bytes b3 = Bytes.of("s3");
+    byte[] ball = ByteArrayUtil.concat(b1, b2, b3);
+
+    List<Bytes> blist = ByteArrayUtil.split(ball);
+
+    Assert.assertEquals(b1, blist.get(0));
+    Assert.assertEquals(b2, blist.get(1));
+    Assert.assertEquals(b3, blist.get(2));
+  }
 }