convenience methods for deleteRange added

criccomini · Feb 15, 2015 · c92c7b1 · c92c7b1
1 parent a582b86
commit c92c7b1
Show file tree

Hide file tree

Showing 4 changed files with 143 additions and 3 deletions.
diff --git a/ezdb-api/src/main/java/ezdb/RangeTable.java b/ezdb-api/src/main/java/ezdb/RangeTable.java
@@ -209,12 +209,53 @@ public TableIterator<H, R, V> rangeReverse(H hashKey, R fromRangeKey,
 	 */
 	public void delete(H hashKey, R rangeKey);
 
+	/**
+	 * Deletes all rows with a given hash key.
+	 * 
+	 * @param hashKey
+	 *            A key used group rows together.
+	 */
+	public void deleteRange(H hashKey);
+
+	/**
+	 * Deletes all rows with a given hash key, and a range key that's greater than
+	 * or equal to the "from" range key provided.
+	 * 
+	 * @param hashKey
+	 *            A key used group rows together.
+	 * @param fromRangeKey
+	 *            The range key to use as the starting point. If an exact match
+	 *            doesn't exist for this hash/range pair, the nearest range key
+	 *            that is larger than this range key will be used as the
+	 *            starting point.
+	 */
+	public void deleteRange(H hashKey, R fromRangeKey);
+
+	/**
+	 * Deletes all rows with a given hash key, and a range key that's greater than
+	 * or equal to the "from" range key, and less than or equal to the "to"
+	 * range key. That is, the "from" range key is inclusive, and the "to" range
+	 * key is inclusive.
+	 * 
+	 * @param hashKey
+	 *            A key used group rows together.
+	 * @param fromRangeKey
+	 *            The range key to use as the starting point. If an exact match
+	 *            doesn't exist for this hash/range pair, the nearest range key
+	 *            that is larger than this range key will be used as the
+	 *            starting point.
+	 * @param toRangeKey
+	 *            The range key to use as the end point (inclusive). If an exact
+	 *            match doesn't exist, the nearest range key that is less than
+	 *            this range key will be used as the end point (inclusive).
+	 */
+	public void deleteRange(H hashKey, R fromRangeKey, R toRangeKey);
+
 	/**
 	 * With this it is possible to do bulk/batch puts and deletes.
 	 * 
 	 * @return a new batch enabled transaction object
 	 */
 	public RangeBatch<H, R, V> newRangeBatch();
-
 
 }
diff --git a/ezdb-leveldb/src/main/java/ezdb/leveldb/EzLevelDbTable.java b/ezdb-leveldb/src/main/java/ezdb/leveldb/EzLevelDbTable.java
@@ -742,5 +742,41 @@ public Batch<H, V> newBatch() {
 	public RangeBatch<H, R, V> newRangeBatch() {
 		return new EzLevelDbBatch<H, R, V>(db, hashKeySerde, rangeKeySerde, valueSerde);
 	}
+
+	@Override
+	public void deleteRange(H hashKey) {
+		TableIterator<H, R, V> range = range(hashKey);
+		internalDeleteRange(range);
+	}
+
+	@Override
+	public void deleteRange(H hashKey, R fromRangeKey) {
+		TableIterator<H, R, V> range = range(hashKey, fromRangeKey);
+		internalDeleteRange(range);
+	}
+
+
+	@Override
+	public void deleteRange(H hashKey, R fromRangeKey, R toRangeKey) {
+		TableIterator<H, R, V> range = range(hashKey, fromRangeKey, toRangeKey);
+		internalDeleteRange(range);
+	}
+
+	private void internalDeleteRange(TableIterator<H, R, V> range) {
+		RangeBatch<H, R, V> batch = newRangeBatch();
+		try {
+			while (range.hasNext()) {
+				TableRow<H, R, V> next = range.next();
+				batch.delete(next.getHashKey(), next.getRangeKey());
+			}
+			batch.flush();
+		} finally {
+			try {
+				batch.close();
+			} catch (IOException e) {
+				throw new DbException(e);
+			}
+		}
+	}
 
 }
diff --git a/ezdb-rocksdb-jni/src/main/java/ezdb/rocksdb/EzRocksDbTable.java b/ezdb-rocksdb-jni/src/main/java/ezdb/rocksdb/EzRocksDbTable.java
@@ -45,11 +45,11 @@ public EzRocksDbTable(File path, EzRocksDbFactory factory,
 		this.rangeKeyComparator = rangeKeyComparator;
 
 		this.options = new Options();
-		
+
 		options.setCreateIfMissing(true);
 		options.setComparator(new EzRocksDbComparator(hashKeyComparator,
 				rangeKeyComparator));
-		
+
 		try {
 			this.db = factory.open(path, options);
 		} catch (IOException e) {
@@ -762,4 +762,40 @@ public RangeBatch<H, R, V> newRangeBatch() {
 				valueSerde);
 	}
 
+	@Override
+	public void deleteRange(H hashKey) {
+		TableIterator<H, R, V> range = range(hashKey);
+		internalDeleteRange(range);
+	}
+
+	@Override
+	public void deleteRange(H hashKey, R fromRangeKey) {
+		TableIterator<H, R, V> range = range(hashKey, fromRangeKey);
+		internalDeleteRange(range);
+	}
+
+
+	@Override
+	public void deleteRange(H hashKey, R fromRangeKey, R toRangeKey) {
+		TableIterator<H, R, V> range = range(hashKey, fromRangeKey, toRangeKey);
+		internalDeleteRange(range);
+	}
+
+	private void internalDeleteRange(TableIterator<H, R, V> range) {
+		RangeBatch<H, R, V> batch = newRangeBatch();
+		try {
+			while (range.hasNext()) {
+				TableRow<H, R, V> next = range.next();
+				batch.delete(next.getHashKey(), next.getRangeKey());
+			}
+			batch.flush();
+		} finally {
+			try {
+				batch.close();
+			} catch (IOException e) {
+				throw new DbException(e);
+			}
+		}
+	}
+
 }
diff --git a/ezdb-treemap/src/main/java/ezdb/treemap/TreeMapTable.java b/ezdb-treemap/src/main/java/ezdb/treemap/TreeMapTable.java
@@ -275,5 +275,32 @@ public Batch<H, V> newBatch() {
 	public RangeBatch<H, R, V> newRangeBatch() {
 		throw new UnsupportedOperationException();
 	}
+
+	@Override
+	public void deleteRange(H hashKey) {
+		TableIterator<H, R, V> range = range(hashKey);
+		while(range.hasNext()){
+			TableRow<H, R, V> next = range.next();
+			delete(next.getHashKey(), next.getRangeKey());
+		}
+	}
+
+	@Override
+	public void deleteRange(H hashKey, R fromRangeKey) {
+		TableIterator<H, R, V> range = range(hashKey, fromRangeKey);
+		while(range.hasNext()){
+			TableRow<H, R, V> next = range.next();
+			delete(next.getHashKey(), next.getRangeKey());
+		}
+	}
+
+	@Override
+	public void deleteRange(H hashKey, R fromRangeKey, R toRangeKey) {
+		TableIterator<H, R, V> range = range(hashKey, fromRangeKey, toRangeKey);
+		while(range.hasNext()){
+			TableRow<H, R, V> next = range.next();
+			delete(next.getHashKey(), next.getRangeKey());
+		}
+	}
 
 }