accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phrocker <...@git.apache.org>
Subject [GitHub] accumulo pull request #134: ACCUMULO-4391 Source deepcopies cannot be used s...
Date Thu, 08 Sep 2016 17:10:41 GMT
Github user phrocker commented on a diff in the pull request:

    https://github.com/apache/accumulo/pull/134#discussion_r78048496
  
    --- Diff: core/src/test/java/org/apache/accumulo/core/file/rfile/MultiThreadedRFileTest.java
---
    @@ -0,0 +1,387 @@
    +/*
    + * 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.file.rfile;
    +
    +import java.io.File;
    +import java.io.IOException;
    +import java.io.PrintWriter;
    +import java.io.StringWriter;
    +import java.util.ArrayList;
    +import java.util.Collection;
    +import java.util.Collections;
    +import java.util.HashMap;
    +import java.util.List;
    +import java.util.Map;
    +import java.util.Random;
    +import java.util.concurrent.LinkedBlockingQueue;
    +import java.util.concurrent.ThreadPoolExecutor;
    +import java.util.concurrent.TimeUnit;
    +import org.apache.accumulo.core.conf.AccumuloConfiguration;
    +import org.apache.accumulo.core.data.ArrayByteSequence;
    +import org.apache.accumulo.core.data.ByteSequence;
    +import org.apache.accumulo.core.data.Key;
    +import org.apache.accumulo.core.data.Range;
    +import org.apache.accumulo.core.data.Value;
    +import org.apache.accumulo.core.file.FileSKVIterator;
    +import org.apache.accumulo.core.file.blockfile.impl.CachableBlockFile;
    +import org.apache.accumulo.core.file.rfile.RFile.Reader;
    +import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
    +import org.apache.accumulo.core.iterators.system.ColumnFamilySkippingIterator;
    +import org.apache.accumulo.core.util.CachedConfiguration;
    +import org.apache.accumulo.core.util.NamingThreadFactory;
    +import org.apache.commons.lang3.mutable.MutableInt;
    +import org.apache.hadoop.conf.Configuration;
    +import org.apache.hadoop.fs.FSDataInputStream;
    +import org.apache.hadoop.fs.FSDataOutputStream;
    +import org.apache.hadoop.fs.FileSystem;
    +import org.apache.hadoop.fs.Path;
    +import org.apache.log4j.Level;
    +import org.apache.log4j.Logger;
    +import org.junit.Rule;
    +import org.junit.Test;
    +import org.junit.rules.TemporaryFolder;
    +
    +import static org.junit.Assert.assertEquals;
    +import static org.junit.Assert.assertFalse;
    +import static org.junit.Assert.assertTrue;
    +
    +public class MultiThreadedRFileTest {
    +
    +  private static final Collection<ByteSequence> EMPTY_COL_FAMS = new ArrayList<ByteSequence>();
    +
    +  @Rule
    +  public TemporaryFolder tempFolder = new TemporaryFolder(new File(System.getProperty("user.dir")
+ "/target"));
    +
    +  static {
    +    Logger.getLogger(org.apache.hadoop.io.compress.CodecPool.class).setLevel(Level.OFF);
    +    Logger.getLogger(org.apache.hadoop.util.NativeCodeLoader.class).setLevel(Level.OFF);
    +  }
    +
    +  private static void checkIndex(Reader reader) throws IOException {
    +    FileSKVIterator indexIter = reader.getIndex();
    +
    +    if (indexIter.hasTop()) {
    +      Key lastKey = new Key(indexIter.getTopKey());
    +
    +      if (reader.getFirstKey().compareTo(lastKey) > 0)
    +        throw new RuntimeException("First key out of order " + reader.getFirstKey() +
" " + lastKey);
    +
    +      indexIter.next();
    +
    +      while (indexIter.hasTop()) {
    +        if (lastKey.compareTo(indexIter.getTopKey()) > 0)
    +          throw new RuntimeException("Indext out of order " + lastKey + " " + indexIter.getTopKey());
    +
    +        lastKey = new Key(indexIter.getTopKey());
    +        indexIter.next();
    +
    +      }
    +
    +      if (!reader.getLastKey().equals(lastKey)) {
    +        throw new RuntimeException("Last key out of order " + reader.getLastKey() + "
" + lastKey);
    +      }
    +    }
    +  }
    +
    +  public static class TestRFile {
    --- End diff --
    
    I had to double check. Sorry I may have been mistaken. I had **this** change because I
was experimenting with other BCFile related changes in the branch prior to reverting. Everything
else was vanilla. I had none of the other changes and saw no test failures. Is that because
they're not covered or because 1.7 differs? Sorry for the confusion @keith-turner . 
      @Override
       public int available() throws IOException {
    -    int avail = in.available();
    -    if (pos + avail > end) {
    -      avail = (int) (end - pos);
    -    }
    -
    -    return avail;
    +    return (int) (end - pos);
       }


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message