package com.continuuity.data2.dataset2.lib.table;

import com.continuuity.api.annotation.Beta;
import com.continuuity.api.common.Bytes;
import com.continuuity.api.data.batch.BatchReadable;
import com.continuuity.api.data.batch.Split;
import com.continuuity.api.data.batch.SplitReader;
import com.continuuity.data2.dataset2.lib.AbstractDataset;
import com.continuuity.internal.data.dataset.lib.table.Row;
import com.continuuity.internal.data.dataset.lib.table.Table;

import java.util.List;

/**
 * This class implements a key/value map on top of {@link Table}. Supported
 * operations are read and write.
 */
public class KeyValueTable extends AbstractDataset implements BatchReadable<byte[], byte[]> {
  private static final byte[] COL = new byte[0];

  private final Table table;

  public KeyValueTable(String instanceName, Table table) {
    super(instanceName, table);
    this.table = table;
  }

  public void write(byte[] key, byte[] value) throws Exception {
    table.put(key, COL, value);
  }

  public void write(String key, String value) throws Exception {
    table.put(Bytes.toBytes(key), COL, Bytes.toBytes(value));
  }

  public byte[] read(byte[] key) throws Exception {
    return table.get(key, COL);
  }

  public String read(String key) throws Exception {
    byte[] value = table.get(Bytes.toBytes(key), COL);
    return value == null ? null : Bytes.toString(value);
  }

  @Override
  public List<Split> getSplits() {
    return table.getSplits();
  }

  public List<Split> getSplits(int numSplits, byte[] start, byte[] stop) {
    return table.getSplits(numSplits, start, stop);
  }

  @Override
  public SplitReader<byte[], byte[]> createSplitReader(Split split) {
    return new KeyValueScanner(split);
  }

  /**
   * The split reader for KeyValueTable.
   */
  public class KeyValueScanner extends SplitReader<byte[], byte[]> {

    // the underlying KeyValueTable's split reader
    private SplitReader<byte[], Row> reader;

    public KeyValueScanner(Split split) {
      this.reader = table.createSplitReader(split);
    }

    @Override
    public void initialize(Split split) throws InterruptedException {
      this.reader.initialize(split);
    }

    @Override
    public boolean nextKeyValue() throws InterruptedException {
      return this.reader.nextKeyValue();
    }

    @Override
    public byte[] getCurrentKey() throws InterruptedException {
      return this.reader.getCurrentKey();
    }

    @Override
    public byte[] getCurrentValue() throws InterruptedException {
      return this.reader.getCurrentValue().get(COL);
    }

    @Override
    public void close() {
      this.reader.close();
    }
  }
}

@@ -1715,22 +1715,47 @@
 Scanner(
+table.createSplitReader(
 split)
+)
 ;%0A  %7D%0A%0A 
@@ -2009,68 +2009,64 @@
 plit
- split) %7B%0A      this.reader = table.createSplitReader(split)
+Reader%3Cbyte%5B%5D, Row%3E reader) %7B%0A      this.reader = reader
 ;%0A  

Move construction of SplitReader outside of KeyValueScanner