moving spark to connector, removing duplication iterator, moving main license file to apache

LICENSE

@@ -1,21 +1,202 @@
-    MIT License
 
-    Copyright (c) Microsoft Corporation.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    Permission is hereby granted, free of charge, to any person obtaining a copy
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
 
-    The above copyright notice and this permission notice shall be included in all
+   1. Definitions.
-    copies or substantial portions of the Software.
 
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      "License" shall mean the terms and conditions for use, reproduction,
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      and distribution as defined by Sections 1 through 9 of this document.
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+      "Licensor" shall mean the copyright owner or entity authorized by
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+      the copyright owner that is granting the License.
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+
-    SOFTWARE
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.

duplication-iterator/pom.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.accumulo</groupId>
-  <artifactId>accumulo-duplication-iterator</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>Accumulo Duplication Iterator</name>
-  <properties>
-    <encoding>UTF-8</encoding>
-    <accumulo.version>2.0.0</accumulo.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.accumulo</groupId>
-      <artifactId>accumulo-core</artifactId>
-      <version>${accumulo.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>2.22.2</version>
-              <configuration>
-              	<trimStackTrace>false</trimStackTrace>
-              </configuration>
-          </plugin>
-        </plugins>
-    </build>
- </project>

duplication-iterator/src/main/java/org/apache/accumulo/iterator/DuplicationIterator.java

@@ -1,202 +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.accumulo.iterator;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-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.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.util.Pair;
-import org.apache.hadoop.io.Text;
-
-public class DuplicationIterator implements SortedKeyValueIterator<Key, Value>, OptionDescriber {
-	public static final String OPTION_COUNT = "count";
-	public static final String OPTION_DELIMITER = "delimiter";
-	// TODO
-	// proposed option & feature
-	// - check if delimiter exists in row key
-	// - try to parse duplication count after delimiter
-	// - if the number of digits matches the current number, skip row
-	//
-	// * pro: avoid unwanted execution
-	// * cons: can't distinguish between count 20 and 50, since it has the same
-	// number of digits
-	// private static final String OPTION_CHECK_DELIMITER = "check_delimiter";
-
-	private SortedKeyValueIterator<Key, Value> source;
-	private int targetDuplicationCount;
-	private String keyFormat;
-
-	private Key topKey;
-	private Value topValue;
-	private int currentDuplicationIndex;
-	private String delimiter;
-
-	private Iterator<Pair<Key, Value>> keysIterator;
-	private ArrayList<Pair<Key, Value>> keys = new ArrayList<>();
-
-	@Override
-	public void init(SortedKeyValueIterator<Key, Value> source, Map<String, String> options, IteratorEnvironment env)
-			throws IOException {
-		this.source = source;
-		this.targetDuplicationCount = Integer.parseInt(options.getOrDefault(OPTION_COUNT, "1"));
-		this.delimiter = options.getOrDefault(OPTION_DELIMITER, "_");
-
-		int digits = (int) (Math.log10(targetDuplicationCount) + 1);
-		this.keyFormat = "%s%s%0" + digits + "d";
-	}
-
-	@Override
-	public boolean hasTop() {
-		return topKey != null;
-	}
-
-	private void prepKeys() throws IOException {
-		if (keysIterator != null) {
-			// current iterator still has values
-			if (keysIterator.hasNext()) {
-				setTop(keysIterator.next());
-				return;
-			}
-
-			// should we duplicate more?
-			if (currentDuplicationIndex < targetDuplicationCount) {
-				currentDuplicationIndex++;
-
-				keysIterator = keys.iterator();
-				setTop(keysIterator.next());
-
-				return;
-			}
-
-			keys.clear();
-		}
-
-		do {
-			if (!source.hasTop())
-				return;
-
-			Text currentRow = new Text(source.getTopKey().getRow());
-
-			while (source.hasTop() && source.getTopKey().getRow().equals(currentRow)) {
-				// collect all cells
-				keys.add(new Pair<Key, Value>(new Key(source.getTopKey()), new Value(source.getTopValue())));
-
-				// move forward
-				source.next();
-			}
-		} while (keys.isEmpty());
-
-		currentDuplicationIndex = 0;
-
-		keysIterator = keys.iterator();
-		setTop(keysIterator.next());
-
-		// ### source data
-		// row key, column family, column qualifier, value
-		// abc, cf1, cq1, v1 -> abc00, abc01, ... abc09
-		// abc, cf2, cq1, v2
-		// def, cf1, cq1, v3
-
-		// ### output data
-		// abc, cf1, cq1, v1 <--
-		// abc, cf2, cq1, v2 <--
-		// abc00, cf1, cq1, v1 <-- dups start
-		// abc00, cf2, cq1, v2
-	}
-
-	@Override
-	public void next() throws IOException {
-		topKey = null;
-		topValue = null;
-
-		prepKeys();
-	}
-
-	@Override
-	public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) throws IOException {
-		this.source.seek(range, columnFamilies, inclusive);
-
-		prepKeys();
-	}
-
-	private void setTop(Pair<Key, Value> top) {
-		// form new key by appending currentDuplicationIndex
-		String row = top.getFirst().getRow().toString();
-
-		this.topKey = new Key(new Text(String.format(keyFormat, row, delimiter, currentDuplicationIndex)),
-				top.getFirst().getColumnFamily(), top.getFirst().getColumnQualifier());
-		this.topValue = top.getSecond();
-	}
-
-	@Override
-	public Key getTopKey() {
-		return topKey;
-	}
-
-	@Override
-	public Value getTopValue() {
-		return topValue;
-	}
-
-	@Override
-	public SortedKeyValueIterator<Key, Value> deepCopy(IteratorEnvironment env) {
-		DuplicationIterator copy = new DuplicationIterator();
-		copy.source = source;
-		copy.targetDuplicationCount = targetDuplicationCount;
-		copy.keyFormat = keyFormat;
-
-		// skipping current
-
-		return copy;
-	}
-
-	@Override
-	public IteratorOptions describeOptions() {
-		HashMap<String, String> namedOptions = new HashMap<>();
-		namedOptions.put(OPTION_COUNT, "Number of duplicates rows to produce");
-		namedOptions.put(OPTION_DELIMITER, "Delimiter to use between row key and duplication index");
-
-		return new IteratorOptions(getClass().getSimpleName(),
-				"Duplicates values by appending an index to each row key", namedOptions, null);
-	}
-
-	@Override
-	public boolean validateOptions(Map<String, String> options) {
-		String count = options.get(OPTION_COUNT);
-		if (count != null) {
-			try {
-				Integer.parseInt(count);
-			} catch (NumberFormatException ne) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-}

duplication-iterator/src/test/java/org/apache/accumulo/iterator/DefaultIteratorEnvironment.java

@@ -1,55 +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.accumulo.iterator;
-
-import java.io.IOException;
-
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.DefaultConfiguration;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.iterators.system.MapFileIterator;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-
-public class DefaultIteratorEnvironment implements IteratorEnvironment {
-
-	AccumuloConfiguration conf;
-	Configuration hadoopConf = new Configuration();
-
-	public DefaultIteratorEnvironment(AccumuloConfiguration conf) {
-		this.conf = conf;
-	}
-
-	public DefaultIteratorEnvironment() {
-		this.conf = DefaultConfiguration.getInstance();
-	}
-
-	@Deprecated
-	@Override
-	public SortedKeyValueIterator<Key, Value> reserveMapFileReader(String mapFileName) throws IOException {
-		FileSystem fs = FileSystem.get(hadoopConf);
-		return new MapFileIterator(fs, mapFileName, hadoopConf);
-	}
-
-	@Override
-	public boolean isSamplingEnabled() {
-		return false;
-	}
-}

duplication-iterator/src/test/java/org/apache/accumulo/iterator/DuplicationIteratorTest.java

@@ -1,96 +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.accumulo.iterator;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.HashSet;
-import java.util.TreeMap;
-import java.util.Collection;
-
-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.data.ByteSequence;
-import org.apache.accumulo.core.iterators.SortedMapIterator;
-import org.junit.Test;
-
-public class DuplicationIteratorTest {
-	private static final Collection<ByteSequence> EMPTY_SET = new HashSet<>();
-
-	@Test
-	public void testDuplication() throws IOException {
-		SortedMap<Key, Value> map = new TreeMap<>();
-		map.put(new Key("key1", "cf1", "cq1"), new Value("Hello"));
-		map.put(new Key("key1", "cf2", ""), new Value("abc"));
-
-		map.put(new Key("key2", "cf2"), new Value("def"));
-
-		SortedMapIterator parentIterator = new SortedMapIterator(map);
-		DuplicationIterator iterator = new DuplicationIterator();
-
-		Map<String, String> options = new HashMap<>();
-		options.put(DuplicationIterator.OPTION_COUNT, "2");
-
-		iterator.init(parentIterator, options, new DefaultIteratorEnvironment());
-		iterator.seek(new Range(), EMPTY_SET, false);
-
-		String[] expectedStrings = {
-				// key 1 (0)
-				"key1_0 cf1 cq1 Hello",
-				// key 1 (0)
-				"key1_0 cf2  abc",
-				// key 1 (1)
-				"key1_1 cf1 cq1 Hello",
-				// key 1 (1)
-				"key1_1 cf2  abc",
-				// key 1 (2)
-				"key1_2 cf1 cq1 Hello",
-				// key 1 (2)
-				"key1_2 cf2  abc",
-				// key 2 (0)
-				"key2_0 cf2  def",
-				// key 2 (1)
-				"key2_1 cf2  def",
-				// key 2 (2)
-				"key2_2 cf2  def" };
-
-		for (int i = 0; i < expectedStrings.length; i++) {
-			assertTrue(iterator.hasTop());
-
-			String actual = String.format("%s %s %s %s", iterator.getTopKey().getRow().toString(),
-					iterator.getTopKey().getColumnFamily().toString(),
-					iterator.getTopKey().getColumnQualifier().toString(), iterator.getTopValue().toString());
-
-			assertEquals(expectedStrings[i], actual);
-
-			iterator.next();
-		}
-
-		assertFalse(iterator.hasTop());
-	}
-}