eclipse-rdf4jGH-5059 remove calls to E(...) when the return value is …

…already being checked

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbContextIdIterator.java

@@ -104,12 +104,12 @@ public long[] next() {
 					Varint.writeUnsigned(minKeyBuf, record[0]);
 					minKeyBuf.flip();
 					keyData.mv_data(minKeyBuf);
-					lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_SET));
-					if (lastResult != 0) {
+					lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_SET);
+					if (lastResult != MDB_SUCCESS) {
 						// use MDB_SET_RANGE if key was deleted
-						lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE));
+						lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE);
 					}
-					if (lastResult != 0) {
+					if (lastResult != MDB_SUCCESS) {
 						closeInternal(false);
 						return null;
 					}
@@ -119,16 +119,16 @@ public long[] next() {
 			}
 
 			if (fetchNext) {
-				lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT));
+				lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT);
 				fetchNext = false;
 			} else {
 				if (minKeyBuf != null) {
 					// set cursor to min key
 					keyData.mv_data(minKeyBuf);
-					lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE));
+					lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE);
 				} else {
 					// set cursor to first item
-					lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT));
+					lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT);
 				}
 			}
 

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbRecordIterator.java

@@ -138,12 +138,12 @@ public long[] next() {
 					index.toKey(minKeyBuf, quad[0], quad[1], quad[2], quad[3]);
 					minKeyBuf.flip();
 					keyData.mv_data(minKeyBuf);
-					lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_SET));
-					if (lastResult != 0) {
+					lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_SET);
+					if (lastResult != MDB_SUCCESS) {
 						// use MDB_SET_RANGE if key was deleted
-						lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE));
+						lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE);
 					}
-					if (lastResult != 0) {
+					if (lastResult != MDB_SUCCESS) {
 						closeInternal(false);
 						return null;
 					}
@@ -153,16 +153,16 @@ public long[] next() {
 			}
 
 			if (fetchNext) {
-				lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT));
+				lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT);
 				fetchNext = false;
 			} else {
 				if (minKeyBuf != null) {
 					// set cursor to min key
 					keyData.mv_data(minKeyBuf);
-					lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE));
+					lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE);
 				} else {
 					// set cursor to first item
-					lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT));
+					lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT);
 				}
 			}
 
@@ -172,7 +172,7 @@ public long[] next() {
 					lastResult = MDB_NOTFOUND;
 				} else if (groupMatcher != null && !groupMatcher.matches(keyData.mv_data())) {
 					// value doesn't match search key/mask, fetch next value
-					lastResult = E(mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT));
+					lastResult = mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT);
 				} else {
 					// Matching value found
 					index.keyToQuad(keyData.mv_data(), quad);
@@ -183,8 +183,6 @@ public long[] next() {
 			}
 			closeInternal(false);
 			return null;
-		} catch (IOException e) {
-			throw new SailException(e);
 		} finally {
 			txnLock.unlockRead(stamp);
 		}

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/LmdbUtil.java

@@ -105,7 +105,7 @@ static <T> T transaction(long env, Transaction<T> transaction) throws IOExceptio
 			int err;
 			try {
 				ret = transaction.exec(stack, txn);
-				err = E(mdb_txn_commit(txn));
+				err = mdb_txn_commit(txn);
 			} catch (Throwable t) {
 				mdb_txn_abort(txn);
 				throw t;

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/PersistentSet.java

@@ -126,7 +126,7 @@ private synchronized boolean update(Object element, boolean add) throws IOExcept
 			keyVal.mv_data(keyBuf);
 
 			if (add) {
-				if (E(mdb_put(factory.writeTxn, dbi, keyVal, dataVal, MDB_NOOVERWRITE)) == MDB_SUCCESS) {
+				if (mdb_put(factory.writeTxn, dbi, keyVal, dataVal, MDB_NOOVERWRITE) == MDB_SUCCESS) {
 					size++;
 					return true;
 				}

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TripleStore.java

@@ -561,7 +561,7 @@ protected void filterUsedIds(Collection<Long> ids) throws IOException {
 				keyBuf.clear();
 				Varint.writeUnsigned(keyBuf, id);
 				keyData.mv_data(keyBuf.flip());
-				if (E(mdb_get(txn, contextsDbi, keyData, valueData)) == MDB_SUCCESS) {
+				if (mdb_get(txn, contextsDbi, keyData, valueData) == MDB_SUCCESS) {
 					it.remove();
 				}
 			}
@@ -587,15 +587,15 @@ protected void filterUsedIds(Collection<Long> ids) throws IOException {
 
 						if (fullScan) {
 							long[] quad = new long[4];
-							int rc = E(mdb_cursor_get(cursor, keyData, valueData, MDB_FIRST));
+							int rc = mdb_cursor_get(cursor, keyData, valueData, MDB_FIRST);
 							while (rc == MDB_SUCCESS && !ids.isEmpty()) {
 								index.keyToQuad(keyData.mv_data(), quad);
 								ids.remove(quad[0]);
 								ids.remove(quad[1]);
 								ids.remove(quad[2]);
 								ids.remove(quad[3]);
 
-								rc = E(mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT));
+								rc = mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT);
 							}
 						} else {
 							for (Iterator<Long> it = ids.iterator(); it.hasNext();) {
@@ -625,15 +625,15 @@ protected void filterUsedIds(Collection<Long> ids) throws IOException {
 
 								// set cursor to min key
 								keyData.mv_data(keyBuf);
-								int rc = E(mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE));
+								int rc = mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE);
 								boolean exists = false;
-								while (!exists && rc == 0) {
+								while (!exists && rc == MDB_SUCCESS) {
 									if (mdb_cmp(txn, dbi, keyData, maxKey) > 0) {
 										// id was not found
 										break;
 									} else if (!matcher.matches(keyData.mv_data())) {
 										// value doesn't match search key/mask, fetch next value
-										rc = E(mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT));
+										rc = mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT);
 									} else {
 										exists = true;
 									}
@@ -708,24 +708,24 @@ protected double cardinality(long subj, long pred, long obj, long context) throw
 
 						// set cursor to min key
 						keyData.mv_data(keyBuf);
-						int rc = E(mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE));
-						if (rc != 0 || mdb_cmp(txn, dbi, keyData, maxKey) >= 0) {
+						int rc = mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE);
+						if (rc != MDB_SUCCESS || mdb_cmp(txn, dbi, keyData, maxKey) >= 0) {
 							break;
 						} else {
 							Varint.readListUnsigned(keyData.mv_data(), s.minValues);
 						}
 
 						// set cursor to max key
 						keyData.mv_data(maxKeyBuf);
-						rc = E(mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE));
-						if (rc != 0) {
+						rc = mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE);
+						if (rc != MDB_SUCCESS) {
 							// directly go to last value
-							rc = E(mdb_cursor_get(cursor, keyData, valueData, MDB_LAST));
+							rc = mdb_cursor_get(cursor, keyData, valueData, MDB_LAST);
 						} else {
 							// go to previous value of selected key
-							rc = E(mdb_cursor_get(cursor, keyData, valueData, MDB_PREV));
+							rc = mdb_cursor_get(cursor, keyData, valueData, MDB_PREV);
 						}
-						if (rc == 0) {
+						if (rc == MDB_SUCCESS) {
 							Varint.readListUnsigned(keyData.mv_data(), s.maxValues);
 							// this is required to correctly estimate the range size at a later point
 							s.startValues[s.MAX_BUCKETS] = s.maxValues;
@@ -747,7 +747,7 @@ protected double cardinality(long subj, long pred, long obj, long context) throw
 							keyData.mv_data(keyBuf);
 
 							int currentSamplesCount = 0;
-							rc = E(mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE));
+							rc = mdb_cursor_get(cursor, keyData, valueData, MDB_SET_RANGE);
 							while (rc == MDB_SUCCESS && currentSamplesCount < s.MAX_SAMPLES_PER_BUCKET) {
 								if (mdb_cmp(txn, dbi, keyData, maxKey) >= 0) {
 									endOfRange = true;
@@ -776,8 +776,8 @@ protected double cardinality(long subj, long pred, long obj, long context) throw
 											}
 										}
 									}
-									rc = E(mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT));
-									if (rc != 0) {
+									rc = mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT);
+									if (rc != MDB_SUCCESS) {
 										// no more elements are available
 										endOfRange = true;
 									}
@@ -873,14 +873,14 @@ public boolean storeTriple(long subj, long pred, long obj, long context, boolean
 				return recordCache.storeRecord(quad, explicit);
 			}
 
-			int rc = E(mdb_put(writeTxn, mainIndex.getDB(explicit), keyVal, dataVal, MDB_NOOVERWRITE));
+			int rc = mdb_put(writeTxn, mainIndex.getDB(explicit), keyVal, dataVal, MDB_NOOVERWRITE);
 			if (rc != MDB_SUCCESS && rc != MDB_KEYEXIST) {
 				throw new IOException(mdb_strerror(rc));
 			}
 			stAdded = rc == MDB_SUCCESS;
 			boolean foundImplicit = false;
 			if (explicit && stAdded) {
-				foundImplicit = E(mdb_del(writeTxn, mainIndex.getDB(false), keyVal, dataVal)) == MDB_SUCCESS;
+				foundImplicit = mdb_del(writeTxn, mainIndex.getDB(false), keyVal, dataVal) == MDB_SUCCESS;
 			}
 
 			if (stAdded) {
@@ -920,7 +920,7 @@ private void incrementContext(MemoryStack stack, long context) throws IOExceptio
 			idVal.mv_data(bb);
 			MDBVal dataVal = MDBVal.calloc(stack);
 			long newCount = 1;
-			if (E(mdb_get(writeTxn, contextsDbi, idVal, dataVal)) == MDB_SUCCESS) {
+			if (mdb_get(writeTxn, contextsDbi, idVal, dataVal) == MDB_SUCCESS) {
 				// update count
 				newCount = Varint.readUnsigned(dataVal.mv_data()) + 1;
 			}
@@ -944,7 +944,7 @@ private boolean decrementContext(MemoryStack stack, long context) throws IOExcep
 			bb.flip();
 			idVal.mv_data(bb);
 			MDBVal dataVal = MDBVal.calloc(stack);
-			if (E(mdb_get(writeTxn, contextsDbi, idVal, dataVal)) == MDB_SUCCESS) {
+			if (mdb_get(writeTxn, contextsDbi, idVal, dataVal) == MDB_SUCCESS) {
 				// update count
 				long newCount = Varint.readUnsigned(dataVal.mv_data()) - 1;
 				if (newCount <= 0) {

core/sail/lmdb/src/main/java/org/eclipse/rdf4j/sail/lmdb/TxnRecordCache.java

@@ -135,9 +135,9 @@ protected boolean update(long[] quad, boolean explicit, boolean add) throws IOEx
 			keyBuf.flip();
 			keyVal.mv_data(keyBuf);
 
-			boolean foundExplicit = E(mdb_get(writeTxn, dbiExplicit, keyVal, dataVal)) == MDB_SUCCESS &&
+			boolean foundExplicit = mdb_get(writeTxn, dbiExplicit, keyVal, dataVal) == MDB_SUCCESS &&
 					(dataVal.mv_data().get(0) & 0b1) != 0;
-			boolean foundImplicit = !foundExplicit && E(mdb_get(writeTxn, dbiInferred, keyVal, dataVal)) == MDB_SUCCESS
+			boolean foundImplicit = !foundExplicit && mdb_get(writeTxn, dbiInferred, keyVal, dataVal) == MDB_SUCCESS
 					&&
 					(dataVal.mv_data().get(0) & 0b1) != 0;
 
@@ -197,17 +197,13 @@ protected RecordCacheIterator(int dbi) throws IOException {
 		}
 
 		public Record next() {
-			try {
-				if (E(mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT)) == MDB_SUCCESS) {
-					Varint.readListUnsigned(keyData.mv_data(), quad);
-					byte op = valueData.mv_data().get(0);
-					Record r = new Record();
-					r.quad = quad;
-					r.add = op == 1;
-					return r;
-				}
-			} catch (IOException e) {
-				throw new SailException(e);
+			if (mdb_cursor_get(cursor, keyData, valueData, MDB_NEXT) == MDB_SUCCESS) {
+				Varint.readListUnsigned(keyData.mv_data(), quad);
+				byte op = valueData.mv_data().get(0);
+				Record r = new Record();
+				r.quad = quad;
+				r.add = op == 1;
+				return r;
 			}
 			close();
 			return null;