Author: mreutegg
Date: Thu Jun 4 06:48:18 2020
New Revision: 1878460
URL: http://svn.apache.org/viewvc?rev=1878460&view=rev
Log:
OAK-9083: Remove unnecessary (un)boxing in oak-store-document
Revert commit r1878399
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBRow.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/SystemPropertySupplierTest.java
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java?rev=1878460&r1=1878459&r2=1878460&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
Thu Jun 4 06:48:18 2020
@@ -161,10 +161,10 @@ public class RDBDocumentSerializer {
doc.put(CMODCOUNT, row.getCollisionsModcount());
}
if (row.hasBinaryProperties() != null) {
- doc.put(HASBINARY, row.hasBinaryProperties());
+ doc.put(HASBINARY, row.hasBinaryProperties().longValue());
}
if (row.deletedOnce() != null) {
- doc.put(DELETEDONCE, row.deletedOnce());
+ doc.put(DELETEDONCE, row.deletedOnce().booleanValue());
}
if (row.getSchemaVersion() >= 2) {
if (row.getSdType() != RDBRow.LONG_UNSET) {
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1878460&r1=1878459&r2=1878460&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Thu Jun 4 06:48:18 2020
@@ -2104,7 +2104,7 @@ public class RDBDocumentStore implements
if (!success && shouldRetry) {
data = ser.asString(document, tmd.getColumnOnlyProperties());
Object m = document.get(MODIFIED);
- long modified = (m instanceof Long) ? (Long) m : 0;
+ long modified = (m instanceof Long) ? ((Long)m).longValue() :
0;
success = db.update(connection, tmd, document.getId(),
modified, hasBinary, deletedOnce, modcount, cmodcount,
oldmodcount, data);
connection.commit();
@@ -2320,7 +2320,7 @@ public class RDBDocumentStore implements
private static long modifiedOf(@NotNull Document doc) {
Object l = doc.get(NodeDocument.MODIFIED_IN_SECS);
- return (l instanceof Long) ? (Long) l : -1;
+ return (l instanceof Long) ? ((Long)l).longValue() : -1;
}
@NotNull
@@ -2370,7 +2370,7 @@ public class RDBDocumentStore implements
if (collection == Collection.CLUSTER_NODES) {
synchronized (this) {
Long old = cnUpdates.get(key);
- old = old == null ? 1L : old + 1;
+ old = old == null ? Long.valueOf(1) : old + 1;
cnUpdates.put(key, old);
}
}
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java?rev=1878460&r1=1878459&r2=1878460&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
Thu Jun 4 06:48:18 2020
@@ -85,7 +85,7 @@ public class RDBDocumentStoreJDBC {
private final RDBDocumentSerializer ser;
private final int queryHitsLimit, queryTimeLimit;
- private static final Long INITIALMODCOUNT = 1L;
+ private static final Long INITIALMODCOUNT = Long.valueOf(1);
public RDBDocumentStoreJDBC(RDBDocumentStoreDB dbInfo,
RDBDocumentSerializer ser, int queryHitsLimit, int queryTimeLimit) {
this.dbInfo = dbInfo;
@@ -1095,13 +1095,13 @@ public class RDBDocumentStoreJDBC {
@Nullable
private static Boolean readBooleanOrNullFromResultSet(ResultSet res, int
index) throws SQLException {
long v = res.getLong(index);
- return res.wasNull() ? null : v != 0;
+ return res.wasNull() ? null : Boolean.valueOf(v != 0);
}
@Nullable
private static Long readLongOrNullFromResultSet(ResultSet res, int index)
throws SQLException {
long v = res.getLong(index);
- return res.wasNull() ? null : v;
+ return res.wasNull() ? null : Long.valueOf(v);
}
private static final Integer INT_FALSE = 0;
@@ -1109,7 +1109,7 @@ public class RDBDocumentStoreJDBC {
@Nullable
private static Integer deletedOnceAsNullOrInteger(Boolean b) {
- return b == null ? null : (b ? INT_TRUE : INT_FALSE);
+ return b == null ? null : (b.booleanValue() ? INT_TRUE : INT_FALSE);
}
@Nullable
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java?rev=1878460&r1=1878459&r2=1878460&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
Thu Jun 4 06:48:18 2020
@@ -360,13 +360,13 @@ public class RDBExport {
@Nullable
private static Boolean readBooleanOrNullFromResultSet(ResultSet res,
String field) throws SQLException {
long v = res.getLong(field);
- return res.wasNull() ? null : v != 0;
+ return res.wasNull() ? null : Boolean.valueOf(v != 0);
}
@Nullable
private static Long readLongOrNullFromResultSet(ResultSet res, String
field) throws SQLException {
long v = res.getLong(field);
- return res.wasNull() ? null : v;
+ return res.wasNull() ? null : Long.valueOf(v);
}
@NotNull
Modified:
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBRow.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBRow.java?rev=1878460&r1=1878459&r2=1878460&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBRow.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBRow.java
Thu Jun 4 06:48:18 2020
@@ -43,12 +43,12 @@ public class RDBRow {
this.id = id;
this.hasBinaryProperties = hasBinaryProperties;
this.deletedOnce = deletedOnce;
- this.modified = modified != null ? modified : LONG_UNSET;
- this.modcount = modcount != null ? modcount : LONG_UNSET;
- this.cmodcount = cmodcount != null ? cmodcount : LONG_UNSET;
- this.schemaVersion = schemaVersion != null ? schemaVersion :
LONG_UNSET;
- this.sdType = sdType != null ? sdType : LONG_UNSET;
- this.sdMaxRevTime = sdMaxRevTime != null ? sdMaxRevTime : LONG_UNSET;
+ this.modified = modified != null ? modified.longValue() : LONG_UNSET;
+ this.modcount = modcount != null ? modcount.longValue() : LONG_UNSET;
+ this.cmodcount = cmodcount != null ? cmodcount.longValue() :
LONG_UNSET;
+ this.schemaVersion = schemaVersion != null ? schemaVersion.longValue()
: LONG_UNSET;
+ this.sdType = sdType != null ? sdType.longValue() : LONG_UNSET;
+ this.sdMaxRevTime = sdMaxRevTime != null ? sdMaxRevTime.longValue() :
LONG_UNSET;
this.data = data;
this.bdata = bdata;
}
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java?rev=1878460&r1=1878459&r2=1878460&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BasicDocumentStoreTest.java
Thu Jun 4 06:48:18 2020
@@ -627,7 +627,7 @@ public class BasicDocumentStoreTest exte
Boolean dovalue = (Boolean)nd.get(NodeDocument.DELETED_ONCE);
if (dovalue != null) {
// RDB persistence does not distinguish null and false
- assertEquals(dovalue, Boolean.FALSE);
+ assertEquals(dovalue.booleanValue(), Boolean.FALSE);
}
}
@@ -915,7 +915,7 @@ public class BasicDocumentStoreTest exte
for (int i = 0; i < 10; i++) {
String id = base + i;
UpdateOp up = new UpdateOp(id, true);
- up.set(NodeDocument.DELETED_ONCE, i % 2 == 0);
+ up.set(NodeDocument.DELETED_ONCE, Boolean.valueOf(i % 2 == 0));
boolean success = super.ds.create(Collection.NODES,
Collections.singletonList(up));
assertTrue("document with " + id + " not created", success);
removeMe.add(id);
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java?rev=1878460&r1=1878459&r2=1878460&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BulkCreateOrUpdateTest.java
Thu Jun 4 06:48:18 2020
@@ -336,10 +336,10 @@ public class BulkCreateOrUpdateTest exte
if (prevModCount != null) {
assertNotNull(modCount);
assertTrue("_modCount, when present, must be increasing, but
changed from " + prevModCount + " to " + modCount,
- prevModCount < modCount);
+ prevModCount.longValue() < modCount.longValue());
}
prevModCount = modCount;
- assertEquals("The old value is not correct", (long) (i - 1),
docs.get(i).get("update_id"));
+ assertEquals("The old value is not correct", Long.valueOf(i - 1),
docs.get(i).get("update_id"));
}
NodeDocument newDoc = ds.find(Collection.NODES, id);
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java?rev=1878460&r1=1878459&r2=1878460&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperTest.java
Thu Jun 4 06:48:18 2020
@@ -60,7 +60,7 @@ public class ReadOnlyDocumentStoreWrappe
}
if ("determineServerTimeDifferenceMillis".equals(methodName)) {
- return 0L;
+ return new Long(0);
} else {
return null;
}
Modified:
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/SystemPropertySupplierTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/SystemPropertySupplierTest.java?rev=1878460&r1=1878459&r2=1878460&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/SystemPropertySupplierTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/util/SystemPropertySupplierTest.java
Thu Jun 4 06:48:18 2020
@@ -42,18 +42,18 @@ public class SystemPropertySupplierTest
@Test
public void testInteger() {
assertEquals(Integer.valueOf(123),
- SystemPropertySupplier.create("foo",
123).usingSystemPropertyReader((n) -> null).get());
+ SystemPropertySupplier.create("foo",
Integer.valueOf(123)).usingSystemPropertyReader((n) -> null).get());
assertEquals(Integer.valueOf(1742),
- SystemPropertySupplier.create("foo",
123).usingSystemPropertyReader((n) -> "1742").get());
+ SystemPropertySupplier.create("foo",
Integer.valueOf(123)).usingSystemPropertyReader((n) -> "1742").get());
}
@Test
public void testLong() {
long big = Long.MAX_VALUE;
assertEquals(Long.valueOf(big),
- SystemPropertySupplier.create("foo",
big).usingSystemPropertyReader((n) -> null).get());
+ SystemPropertySupplier.create("foo",
Long.valueOf(big)).usingSystemPropertyReader((n) -> null).get());
assertEquals(Long.valueOf(1742),
- SystemPropertySupplier.create("foo",
big).usingSystemPropertyReader((n) -> "1742").get());
+ SystemPropertySupplier.create("foo",
Long.valueOf(big)).usingSystemPropertyReader((n) -> "1742").get());
}
@Test
@@ -69,7 +69,7 @@ public class SystemPropertySupplierTest
logCustomizer.starting();
try {
- int positive = SystemPropertySupplier.create("foo",
123).loggingTo(LOG)
+ int positive = SystemPropertySupplier.create("foo",
Integer.valueOf(123)).loggingTo(LOG)
.usingSystemPropertyReader((n) -> "-1").validateWith(n ->
n >= 0).get();
assertEquals(123, positive);
assertEquals(1, logCustomizer.getLogs().size());
@@ -85,7 +85,7 @@ public class SystemPropertySupplierTest
logCustomizer.starting();
try {
- int positive = SystemPropertySupplier.create("foo",
123).loggingTo(LOG)
+ int positive = SystemPropertySupplier.create("foo",
Integer.valueOf(123)).loggingTo(LOG)
.usingSystemPropertyReader((n) -> "abc").validateWith(n ->
n >= 0).get();
assertEquals(123, positive);
assertEquals(1, logCustomizer.getLogs().size());
@@ -102,7 +102,7 @@ public class SystemPropertySupplierTest
logCustomizer.starting();
try {
- int positive = SystemPropertySupplier.create("foo",
123).loggingTo(local)
+ int positive = SystemPropertySupplier.create("foo",
Integer.valueOf(123)).loggingTo(local)
.usingSystemPropertyReader((n) -> "4217").get();
assertEquals(4217, positive);
assertEquals(2, logCustomizer.getLogs().size());
