accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [6/6] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Fri, 25 Jul 2014 04:17:49 GMT
Merge branch '1.6.1-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46ab1f61
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46ab1f61
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46ab1f61

Branch: refs/heads/master
Commit: 46ab1f6168ec52d410d561fcff7e308be5f3f98b
Parents: c45315a ceb1a74
Author: Josh Elser <elserj@apache.org>
Authored: Fri Jul 25 00:17:11 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Jul 25 00:17:11 2014 -0400

----------------------------------------------------------------------
 .../accumulo/core/client/mapreduce/RangeInputSplitTest.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/46ab1f61/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
----------------------------------------------------------------------
diff --cc mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
index 295aa5d,0000000..5115bf7
mode 100644,000000..100644
--- a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
+++ b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplitTest.java
@@@ -1,123 -1,0 +1,125 @@@
 +/*
 + * 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.accumulo.core.client.mapreduce;
 +
 +import java.io.ByteArrayInputStream;
 +import java.io.ByteArrayOutputStream;
 +import java.io.DataInputStream;
 +import java.io.DataOutputStream;
 +import java.io.IOException;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.HashSet;
 +import java.util.Set;
 +
 +import org.apache.accumulo.core.client.IteratorSetting;
 +import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 +import org.apache.accumulo.core.data.Key;
 +import org.apache.accumulo.core.data.Range;
 +import org.apache.accumulo.core.iterators.user.SummingCombiner;
 +import org.apache.accumulo.core.iterators.user.WholeRowIterator;
 +import org.apache.accumulo.core.security.Authorizations;
 +import org.apache.accumulo.core.util.Pair;
 +import org.apache.hadoop.io.Text;
 +import org.apache.log4j.Level;
 +import org.junit.Assert;
 +import org.junit.Test;
 +
 +public class RangeInputSplitTest {
 +
 +  @Test
 +  public void testSimpleWritable() throws IOException {
 +    RangeInputSplit split = new RangeInputSplit("table", "1", new Range(new Key("a"), new
Key("b")), new String[]{"localhost"});
 +    
 +    ByteArrayOutputStream baos = new ByteArrayOutputStream();
 +    DataOutputStream dos = new DataOutputStream(baos);
 +    split.write(dos);
 +    
 +    RangeInputSplit newSplit = new RangeInputSplit();
 +    
 +    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
 +    DataInputStream dis = new DataInputStream(bais);
 +    newSplit.readFields(dis);
 +    
 +    Assert.assertEquals(split.getTableName(), newSplit.getTableName());
 +    Assert.assertEquals(split.getTableId(), newSplit.getTableId());
 +    Assert.assertEquals(split.getRange(), newSplit.getRange());
 +    Assert.assertTrue(Arrays.equals(split.getLocations(), newSplit.getLocations()));
 +  }
 +
 +  @Test
 +  public void testAllFieldsWritable() throws IOException {
 +    RangeInputSplit split = new RangeInputSplit("table", "1", new Range(new Key("a"), new
Key("b")), new String[]{"localhost"});
 +    
 +    Set<Pair<Text,Text>> fetchedColumns = new HashSet<Pair<Text,Text>>();
 +    
 +    fetchedColumns.add(new Pair<Text,Text>(new Text("colf1"), new Text("colq1")));
 +    fetchedColumns.add(new Pair<Text,Text>(new Text("colf2"), new Text("colq2")));
 +
 +    // Fake some iterators
 +    ArrayList<IteratorSetting> iterators = new ArrayList<IteratorSetting>();
 +    IteratorSetting setting = new IteratorSetting(50, SummingCombiner.class);
 +    setting.addOption("foo", "bar");
 +    iterators.add(setting);
 +
 +    setting = new IteratorSetting(100, WholeRowIterator.class);
 +    setting.addOption("bar", "foo");
 +    iterators.add(setting);
-     
++
++    split.setTable("table");
 +    split.setAuths(new Authorizations("foo"));
 +    split.setOffline(true);
 +    split.setIsolatedScan(true);
 +    split.setUsesLocalIterators(true);
 +    split.setFetchedColumns(fetchedColumns);
 +    split.setToken(new PasswordToken("password"));
 +    split.setPrincipal("root");
 +    split.setInstanceName("instance");
 +    split.setMockInstance(true);
 +    split.setZooKeepers("localhost");
 +    split.setIterators(iterators);
 +    split.setLogLevel(Level.WARN);
 +    
 +    ByteArrayOutputStream baos = new ByteArrayOutputStream();
 +    DataOutputStream dos = new DataOutputStream(baos);
 +    split.write(dos);
 +    
 +    RangeInputSplit newSplit = new RangeInputSplit();
 +    
 +    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
 +    DataInputStream dis = new DataInputStream(bais);
 +    newSplit.readFields(dis);
 +    
 +    Assert.assertEquals(split.getRange(), newSplit.getRange());
 +    Assert.assertArrayEquals(split.getLocations(), newSplit.getLocations());
-     
++
++    Assert.assertEquals(split.getTable(), newSplit.getTable());
 +    Assert.assertEquals(split.getAuths(), newSplit.getAuths());
 +    Assert.assertEquals(split.isOffline(), newSplit.isOffline());
 +    Assert.assertEquals(split.isIsolatedScan(), newSplit.isOffline());
 +    Assert.assertEquals(split.usesLocalIterators(), newSplit.usesLocalIterators());
 +    Assert.assertEquals(split.getFetchedColumns(), newSplit.getFetchedColumns());
 +    Assert.assertEquals(split.getToken(), newSplit.getToken());
 +    Assert.assertEquals(split.getPrincipal(), newSplit.getPrincipal());
 +    Assert.assertEquals(split.getInstanceName(), newSplit.getInstanceName());
 +    Assert.assertEquals(split.isMockInstance(), newSplit.isMockInstance());
 +    Assert.assertEquals(split.getZooKeepers(), newSplit.getZooKeepers());
 +    Assert.assertEquals(split.getIterators(), newSplit.getIterators());
 +    Assert.assertEquals(split.getLogLevel(), newSplit.getLogLevel());
 +  }
 +  
 +}


Mime
View raw message