http://git-wip-us.apache.org/repos/asf/giraph/blob/45851391/giraph/src/main/java/org/apache/giraph/graph/partition/ByteArrayPartition.java
----------------------------------------------------------------------
diff --git 
a/giraph/src/main/java/org/apache/giraph/graph/partition/ByteArrayPartition.java
 
b/giraph/src/main/java/org/apache/giraph/graph/partition/ByteArrayPartition.java
deleted file mode 100644
index 5460a55..0000000
--- 
a/giraph/src/main/java/org/apache/giraph/graph/partition/ByteArrayPartition.java
+++ /dev/null
@@ -1,277 +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.giraph.graph.partition;
-
-import com.google.common.collect.MapMaker;
-
-import com.google.common.primitives.Ints;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
-
-import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration;
-import org.apache.giraph.graph.Vertex;
-import org.apache.giraph.utils.UnsafeByteArrayInputStream;
-import org.apache.giraph.utils.WritableUtils;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.io.WritableComparable;
-import org.apache.hadoop.util.Progressable;
-import org.apache.log4j.Logger;
-
-/**
- * Byte array based partition.  Should reduce the amount of memory used since
- * the entire graph is compressed into byte arrays.  Must guarantee, however,
- * that only one thread at a time will call getVertex since it is a singleton.
- *
- * @param <I> Vertex index value
- * @param <V> Vertex value
- * @param <E> Edge value
- * @param <M> Message data
- */
-public class ByteArrayPartition<I extends WritableComparable,
-    V extends Writable, E extends Writable, M extends Writable>
-    implements Partition<I, V, E, M> {
-  /** Class logger */
-  private static final Logger LOG = Logger.getLogger(ByteArrayPartition.class);
-  /** Configuration from the worker */
-  private ImmutableClassesGiraphConfiguration<I, V, E, M> conf;
-  /** Partition id */
-  private int id;
-  /**
-   * Vertex map for this range (keyed by index).  Note that the byte[] is a
-   * serialized vertex with the first four bytes as the length of the vertex
-   * to read.
-   */
-  private ConcurrentMap<I, byte[]> vertexMap;
-  /** Context used to report progress */
-  private Progressable progressable;
-  /** Representative vertex */
-  private Vertex<I, V, E, M> representativeVertex;
-  /** Use unsafe serialization */
-  private boolean useUnsafeSerialization;
-
-  /**
-   * Constructor for reflection.
-   */
-  public ByteArrayPartition() { }
-
-  @Override
-  public void initialize(int partitionId, Progressable progressable) {
-    setId(partitionId);
-    setProgressable(progressable);
-    vertexMap = new MapMaker().concurrencyLevel(
-        conf.getNettyServerExecutionConcurrency()).makeMap();
-    representativeVertex = conf.createVertex();
-    useUnsafeSerialization = conf.useUnsafeSerialization();
-  }
-
-  @Override
-  public Vertex<I, V, E, M> getVertex(I vertexIndex) {
-    byte[] vertexData = vertexMap.get(vertexIndex);
-    if (vertexData == null) {
-      return null;
-    }
-    WritableUtils.readFieldsFromByteArrayWithSize(
-        vertexData, representativeVertex, useUnsafeSerialization);
-    return representativeVertex;
-  }
-
-  @Override
-  public Vertex<I, V, E, M> putVertex(Vertex<I, V, E, M> vertex) {
-    byte[] vertexData =
-        WritableUtils.writeToByteArrayWithSize(vertex, useUnsafeSerialization);
-    byte[] oldVertexBytes = vertexMap.put(vertex.getId(), vertexData);
-    if (oldVertexBytes == null) {
-      return null;
-    } else {
-      WritableUtils.readFieldsFromByteArrayWithSize(
-          oldVertexBytes, representativeVertex, useUnsafeSerialization);
-      return representativeVertex;
-    }
-  }
-
-  @Override
-  public Vertex<I, V, E, M> removeVertex(I vertexIndex) {
-    byte[] vertexBytes = vertexMap.remove(vertexIndex);
-    if (vertexBytes == null) {
-      return null;
-    }
-    WritableUtils.readFieldsFromByteArrayWithSize(vertexBytes,
-        representativeVertex, useUnsafeSerialization);
-    return representativeVertex;
-  }
-
-  @Override
-  public void addPartition(Partition<I, V, E, M> partition) {
-    // Only work with other ByteArrayPartition instances
-    if (!(partition instanceof ByteArrayPartition)) {
-      throw new IllegalStateException("addPartition: Cannot add partition " +
-          "of type " + partition.getClass());
-    }
-
-    ByteArrayPartition<I, V, E, M> byteArrayPartition =
-        (ByteArrayPartition<I, V, E, M>) partition;
-    for (Map.Entry<I, byte[]> entry :
-        byteArrayPartition.vertexMap.entrySet()) {
-      vertexMap.put(entry.getKey(), entry.getValue());
-    }
-  }
-
-  @Override
-  public long getVertexCount() {
-    return vertexMap.size();
-  }
-
-  @Override
-  public long getEdgeCount() {
-    long edges = 0;
-    for (byte[] vertexBytes : vertexMap.values()) {
-      WritableUtils.readFieldsFromByteArrayWithSize(vertexBytes,
-          representativeVertex, useUnsafeSerialization);
-      edges += representativeVertex.getNumEdges();
-    }
-    return edges;
-  }
-
-  @Override
-  public int getId() {
-    return id;
-  }
-
-  @Override
-  public void setId(int id) {
-    this.id = id;
-  }
-
-  @Override
-  public void setProgressable(Progressable progressable) {
-    this.progressable = progressable;
-  }
-
-  @Override
-  public void saveVertex(Vertex<I, V, E, M> vertex) {
-    // Reuse the old buffer whenever possible
-    byte[] oldVertexData = vertexMap.get(vertex.getId());
-    if (oldVertexData != null) {
-      vertexMap.put(vertex.getId(),
-          WritableUtils.writeToByteArrayWithSize(
-              vertex, oldVertexData, useUnsafeSerialization));
-    } else {
-      vertexMap.put(vertex.getId(),
-          WritableUtils.writeToByteArrayWithSize(
-              vertex, useUnsafeSerialization));
-    }
-  }
-
-  @Override
-  public void write(DataOutput output) throws IOException {
-    output.writeInt(id);
-    output.writeInt(vertexMap.size());
-    for (Map.Entry<I, byte[]> entry : vertexMap.entrySet()) {
-      if (progressable != null) {
-        progressable.progress();
-      }
-      entry.getKey().write(output);
-      // Note here that we are writing the size of the vertex data first
-      // as it is encoded in the first four bytes of the byte[]
-      int vertexDataSize;
-      if (useUnsafeSerialization) {
-        vertexDataSize = UnsafeByteArrayInputStream.getInt(entry.getValue(),
-            0);
-      } else {
-        vertexDataSize = Ints.fromByteArray(entry.getValue());
-      }
-
-      output.writeInt(vertexDataSize);
-      output.write(entry.getValue(), 0, vertexDataSize);
-    }
-  }
-
-  @Override
-  public void readFields(DataInput input) throws IOException {
-    id = input.readInt();
-    int size = input.readInt();
-    vertexMap = new MapMaker().concurrencyLevel(
-        conf.getNettyServerExecutionConcurrency()).initialCapacity(
-        size).makeMap();
-    representativeVertex = conf.createVertex();
-    useUnsafeSerialization = conf.useUnsafeSerialization();
-    for (int i = 0; i < size; ++i) {
-      if (progressable != null) {
-        progressable.progress();
-      }
-      I vertexId = conf.createVertexId();
-      vertexId.readFields(input);
-      int vertexDataSize = input.readInt();
-      byte[] vertexData = new byte[vertexDataSize];
-      input.readFully(vertexData);
-      if (vertexMap.put(vertexId, vertexData) != null) {
-        throw new IllegalStateException("readFields: Already saw vertex " +
-            vertexId);
-      }
-    }
-  }
-
-  @Override
-  public void setConf(
-      ImmutableClassesGiraphConfiguration<I, V, E, M> configuration) {
-    conf = configuration;
-  }
-
-  @Override
-  public ImmutableClassesGiraphConfiguration<I, V, E, M> getConf() {
-    return conf;
-  }
-
-  @Override
-  public Iterator<Vertex<I, V, E, M>> iterator() {
-    return new RepresentativeVertexIterator();
-  }
-
-  /**
-   * Iterator that deserializes a vertex from a byte array on the fly, using
-   * the same representative vertex object.
-   */
-  private class RepresentativeVertexIterator implements
-      Iterator<Vertex<I, V, E, M>> {
-    /** Iterator to the vertex values */
-    private Iterator<byte[]> vertexDataIterator =
-        vertexMap.values().iterator();
-
-    @Override
-    public boolean hasNext() {
-      return vertexDataIterator.hasNext();
-    }
-
-    @Override
-    public Vertex<I, V, E, M> next() {
-      WritableUtils.readFieldsFromByteArrayWithSize(
-          vertexDataIterator.next(), representativeVertex,
-          useUnsafeSerialization);
-      return representativeVertex;
-    }
-
-    @Override
-    public void remove() {
-      throw new IllegalAccessError("remove: This method is not supported.");
-    }
-  }
-}

Reply via email to