You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by pr...@apache.org on 2018/10/24 23:43:52 UTC
[geode] branch develop updated: GEODE-5909: Remove unknown tag
causing compile warning. (#2678)
This is an automated email from the ASF dual-hosted git repository.
prhomberg pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 1a2725c GEODE-5909: Remove unknown tag causing compile warning. (#2678)
1a2725c is described below
commit 1a2725c7bfe95b81db1c813be276348a54a003a2
Author: Patrick Rhomberg <pr...@pivotal.io>
AuthorDate: Wed Oct 24 16:43:44 2018 -0700
GEODE-5909: Remove unknown tag causing compile warning. (#2678)
* Also cleanup various pieces of dead code or now-inapplicable comments.
---
.../cache/partitioned/ShutdownAllDUnitTest.java | 18 ------------
.../query/functional/LimitClauseJUnitTest.java | 33 ----------------------
.../internal/CumulativeNonDistinctResults.java | 6 ----
.../cache/query/internal/types/TypeUtils.java | 7 -----
.../geode/internal/cache/BucketServerLocation.java | 6 ----
.../apache/geode/internal/cache/DiskStoreImpl.java | 7 ++---
.../org/apache/geode/internal/cache/TXState.java | 5 +---
.../internal/cache/partitioned/PutMessage.java | 20 -------------
.../cache/tier/sockets/CacheClientProxy.java | 23 ---------------
.../ConcurrentParallelGatewaySenderQueue.java | 5 ----
.../SerializableObjectHttpMessageConverter.java | 11 +-------
.../management/CacheServerManagementDUnitTest.java | 4 ---
.../org/apache/geode/cache30/RegionTestCase.java | 4 ---
.../apache/geode/management/model/SubOrder.java | 3 --
14 files changed, 4 insertions(+), 148 deletions(-)
diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
index 1ee896c..00a8d43 100644
--- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
+++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/ShutdownAllDUnitTest.java
@@ -417,24 +417,6 @@ public class ShutdownAllDUnitTest extends JUnit4CacheTestCase {
checkPRRecoveredFromDisk(vm1, "region", 0, true);
}
- /*
- * @Test public void testStopNonPersistRegions() throws Throwable { Host host = Host.getHost(0);
- * VM vm0 = host.getVM(0); VM vm1 = host.getVM(1); VM vm2 = host.getVM(2); createRegion(vm0,
- * "region", null, true, 1); createRegion(vm1, "region", "disk", true, 1);
- *
- * createData(vm0, 0, 1, "a", "region");
- *
- * shutDownAllMembers(vm2, 2);
- *
- * // restart vms, and let vm0 to do GII from vm0 createRegion(vm1, "region", "disk", true, 1);
- * createRegion(vm0, "region", null, true, 1);
- *
- * checkData(vm0, 0, 1, "a", "region"); checkData(vm1, 0, 1, "a", "region");
- *
- * checkPRRecoveredFromDisk(vm1, "region", 0, true); checkPRRecoveredFromDisk(vm0, "region", 0,
- * false); }
- */
-
@Test
public void testMultiPRDR() throws Throwable {
Host host = Host.getHost(0);
diff --git a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
index a54e5ae..1900f45 100644
--- a/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
+++ b/geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/LimitClauseJUnitTest.java
@@ -1193,39 +1193,6 @@ public class LimitClauseJUnitTest {
assertEquals(resultsNoIndex.size(), resultsWithIndex.size());
}
- /*
- * This test shows an error with order by. Limit does not affect this and will enable this test
- * after the bug for order by is logged and fixed
- *
- * @Test public void testNotApplyingLimitAtIndexLevelForMultiIndexAndClauseUsageWithOrderBy()
- * throws Exception { //try { Query query; SelectResults result; int limit = 25; Region region =
- * CacheUtils.createRegion("portfolios1", Portfolio.class); for (int i = 30; i > 0; i--) {
- * Portfolio p = new Portfolio(i); p.positions.clear(); p.positions.put("IBM", new Position("IBM",
- * i)); region.put("KEY" + i, p); }
- *
- * String queryString =
- * "<trace>SELECT distinct P FROM /portfolios1 P, P.positions.values POS WHERE P.ID > 5 AND POS.secId = 'IBM' ORDER BY P.ID"
- * ; query = qs.newQuery(queryString); SelectResults resultsNoIndex = (SelectResults)
- * query.execute();
- *
- * //Create Index on ID and secId //Index secIndex = qs.createIndex("secIdIndex", "pos.secId",
- * "/portfolios1 p, p.positions.values pos"); Index idIndex = qs.createIndex("idIndex",
- * IndexType.FUNCTIONAL, "P.ID", "/portfolios1 P");
- *
- * //assertNotNull(secIndex); assertNotNull(idIndex); assertTrue(idIndex instanceof
- * CompactRangeIndex); SelectResults resultsWithIndex = (SelectResults) query.execute();
- *
- * assertIndexDetailsEquals(resultsNoIndex.size(), resultsWithIndex.size());
- * assertIndexDetailsEquals(limit, resultsWithIndex.size());
- *
- * int expectedId = 6; Iterator iterator = resultsNoIndex.iterator(); while (iterator.hasNext()) {
- * Portfolio p = (Portfolio) iterator.next(); assertIndexDetailsEquals(expectedId++, p.ID); }
- *
- * //check order by results expectedId = 6; iterator = resultsWithIndex.iterator(); while
- * (iterator.hasNext()) { Portfolio p = (Portfolio) iterator.next();
- * assertIndexDetailsEquals(expectedId++, p.ID); } }
- */
-
@Test
public void testNotLimitAtIndexLevelForMultiSingleIndexAndClauseUsage() throws Exception {
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
index 7d90c9c..c4ce222 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CumulativeNonDistinctResults.java
@@ -192,12 +192,6 @@ public class CumulativeNonDistinctResults<E> implements SelectResults<E>, DataSe
}
}
- /*
- * @Override public boolean isEmpty() { boolean isEmpty = true; for (SelectResults<E> result :
- * this.sortedResults) { isEmpty = result.isEmpty(); if (!isEmpty) { break; } } return isEmpty;
- * }
- */
-
@Override
public Iterator<E> iterator() {
Iterator<E> iter = new CumulativeCollectionIterator();
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java
index 28e82f2..f11e271 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/types/TypeUtils.java
@@ -118,13 +118,6 @@ public class TypeUtils implements OQLLexerTokenTypes {
return TEMPORAL;
} else if (object1Class != object2Class && (isAssignableFrom(object1Class, Number.class)
&& isAssignableFrom(object2Class, Number.class))) {
- /*
- * @todo check for NaN, in which case we should not call compareTo Must also handle this in
- * the index lookup code to be consistent See bug 37716 NumericComparator cmprtr =
- * getNumericComparator(); boolean b; if (obj1.equals(Float.NaN) || obj1.equals(Double.NaN))
- * { return new Boolean(cmprtr.compareWithNaN(obj2)); } else if (obj2.equals(Float.NaN) ||
- * obj2.equals(Float.NaN)) { return new Boolean(cmprtr.compareWithNaN(obj1)); }
- */
return NUMERIC;
} else if (isAssignableFrom(object1Class, Boolean.class)
|| isAssignableFrom(object2Class, Boolean.class)) {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation.java
index 6766894..77c01c7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketServerLocation.java
@@ -70,12 +70,6 @@ public class BucketServerLocation extends ServerLocation {
return this.version;
}
- /*
- * @Override public String toString() { return "BucketServerLocation{bucketId=" + bucketId +
- * ",host=" + this.getHostName() + ",port=" + this.getPort() + ",isPrimary=" + isPrimary +
- * ",version=" + this.version + "}"; }
- */
-
public int getBucketId() {
return bucketId;
}
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
index e399980..e33b073 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
@@ -2833,20 +2833,17 @@ public class DiskStoreImpl implements DiskStore {
long compactionStart = getStats().startCompaction();
long start = System.nanoTime();
try {
- for (int i = 0; i < oplogs.length && keepCompactorRunning() /*
- * @todo && !owner. isDestroyed
- */; i++) {
+ for (int i = 0; i < oplogs.length && keepCompactorRunning(); i++) {
totalCount += oplogs[i].compact(this);
}
- // TODO:Asif : DiskRegion: How do we tackle
} finally {
getStats().endCompaction(compactionStart);
}
long endTime = System.nanoTime();
logger.info("compaction did {} creates and updates in {} ms",
totalCount, ((endTime - start) / 1000000));
- return true /* @todo !owner.isDestroyed */;
+ return true;
}
private boolean isClosing() {
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
index 8f7fcf8..e322beb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
@@ -472,10 +472,7 @@ public class TXState implements TXStateInterface {
* (applyChanges) 2. Ask for advice on who to send to (buildMessage) 3. Send out to other
* members.
*
- * If this is done out of order, we will have problems with GII, split brain, and HA. See
- * bug #41187
- *
- * @gregp
+ * If this is done out of order, we will have problems with GII, split brain, and HA.
*/
attachFilterProfileInformation(entries);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
index d859a11..b02f3ac 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/PutMessage.java
@@ -476,21 +476,6 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
this.filterInfo = filterInfo;
}
}
- /*
- * @Override public void appendOldValueToMessage(EntryEventImpl event) { if (event.hasOldValue())
- * { this.hasOldValue = true; CachedDeserializable cd = (CachedDeserializable)
- * event.getSerializedOldValue(); if (cd != null) { this.oldValueIsSerialized = true; Object o =
- * cd.getValue(); if (o instanceof byte[]) { setOldValBytes((byte[])o); } else { // Defer
- * serialization until toData is called. setOldValObj(o); } } else { Object old =
- * event.getRawOldValue(); if (old instanceof byte[]) { this.oldValueIsSerialized = false;
- * setOldValBytes((byte[]) old); } else { this.oldValueIsSerialized = true; setOldValObj(old); } }
- * } }
- */
- /*
- * private void setOldValBytes(byte[] valBytes){ this.oldValBytes = valBytes; } public final
- * byte[] getOldValueBytes(){ return this.oldValBytes; } private Object getOldValObj(){ return
- * this.oldValObj; } private void setOldValObj(Object o){ this.oldValObj = o; }
- */
public int getDSFID() {
return PR_PUT_MESSAGE;
@@ -517,11 +502,6 @@ public class PutMessage extends PartitionMessageWithDirectReply implements NewVa
if ((flags & HAS_EXPECTED_OLD_VAL) != 0) {
this.expectedOldValue = DataSerializer.readObject(in);
}
- /*
- * this.hasOldValue = in.readBoolean(); if (this.hasOldValue){
- * //out.writeBoolean(this.hasOldValue); this.oldValueIsSerialized = in.readBoolean();
- * setOldValBytes(DataSerializer.readByteArray(in)); }
- */
if (this.hasFilterInfo) {
this.filterInfo = new FilterRoutingInfo();
InternalDataSerializer.invokeFromData(this.filterInfo, in);
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 7a8977d..cd73069 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -1811,12 +1811,7 @@ public class CacheClientProxy implements ClientSession {
public String toString() {
StringBuffer buffer = new StringBuffer();
buffer.append("CacheClientProxy[")
- // .append("client proxy id=")
.append(this.proxyID)
- // .append("; client host name=")
- // .append(this._socket.getInetAddress().getCanonicalHostName())
- // .append("; client host address=")
- // .append(this._remoteHostAddress)
.append("; port=").append(this._socket.getPort()).append("; primary=").append(isPrimary)
.append("; version=").append(clientVersion).append("]");
return buffer.toString();
@@ -1825,12 +1820,7 @@ public class CacheClientProxy implements ClientSession {
public String getState() {
StringBuffer buffer = new StringBuffer();
buffer.append("CacheClientProxy[")
- // .append("client proxy id=")
.append(this.proxyID)
- // .append("; client host name=")
- // .append(this._socket.getInetAddress().getCanonicalHostName())
- // .append("; client host address=")
- // .append(this._remoteHostAddress)
.append("; port=").append(this._socket.getPort()).append("; primary=").append(isPrimary)
.append("; version=").append(clientVersion).append("; paused=").append(isPaused())
.append("; alive=").append(isAlive()).append("; connected=").append(isConnected())
@@ -1844,15 +1834,8 @@ public class CacheClientProxy implements ClientSession {
}
public boolean isPrimary() {
- // boolean primary = this._messageDispatcher.isAlive()
- // || this._messageDispatcher._messageQueue.isPrimary();
boolean primary = this.isPrimary;
- // System.out.println(this + ": DISPATCHER IS ALIVE: " + this._messageDispatcher.isAlive());
- // System.out.println(this + ": DISPATCHER QUEUE IS PRIMARY: " +
- // this._messageDispatcher._messageQueue.isPrimary());
- // System.out.println(this + ": IS PRIMARY: " + primary);
return primary;
- // return this.isPrimary ;
}
protected boolean basicIsPrimary() {
@@ -1863,12 +1846,6 @@ public class CacheClientProxy implements ClientSession {
this.isPrimary = isPrimary;
}
- // private static int nextId = 0;
- // protected static int getNextId() {
- // synchronized (CacheClientProxy.class) {
- // return ++nextId;
- // }
- // }
/*
* Return this client's HA region queue
*
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java
index cc77bd9..241810e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ConcurrentParallelGatewaySenderQueue.java
@@ -157,11 +157,6 @@ public class ConcurrentParallelGatewaySenderQueue implements RegionQueue {
return size;
}
- /*
- * @Override public void release() { for(int i =0; i< processors.length; i++){
- * processors[i].getQueue().release(); } }
- */
-
public void removeShadowPR(String prRegionName) {
for (int i = 0; i < processors.length; i++) {
processors[i].removeShadowPR(prRegionName);
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java
index ce3ba15..44297b8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/converter/SerializableObjectHttpMessageConverter.java
@@ -49,22 +49,13 @@ public class SerializableObjectHttpMessageConverter
super(MediaType.APPLICATION_OCTET_STREAM, MediaType.ALL);
}
- /*
- * @Override public boolean canRead(final Class<?> clazz, final MediaType mediaType) { return
- * canRead(mediaType); }
- */
-
@Override
protected boolean supports(final Class<?> type) {
if (logger.isTraceEnabled()) {
logger.trace(String.format("%1$s.supports(%2$s)", getClass().getName(), type.getName()),
new Throwable());
}
- /*
- * logger.warn(String.format("%1$s.supports(%2$s)", getClass().getName(), type.getName()));
- * final StringWriter writer = new StringWriter(); new Throwable().printStackTrace(new
- * PrintWriter(writer)); logger.warn(writer.toString());
- */
+
return (type != null && Serializable.class.isAssignableFrom(type));
}
diff --git a/geode-cq/src/distributedTest/java/org/apache/geode/management/CacheServerManagementDUnitTest.java b/geode-cq/src/distributedTest/java/org/apache/geode/management/CacheServerManagementDUnitTest.java
index 157ea19..fd25b7d 100644
--- a/geode-cq/src/distributedTest/java/org/apache/geode/management/CacheServerManagementDUnitTest.java
+++ b/geode-cq/src/distributedTest/java/org/apache/geode/management/CacheServerManagementDUnitTest.java
@@ -487,10 +487,6 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase {
assertTrue(bean.showAllClientStats()[0].getClientCQCount() == 1);
int numQueues = bean.getNumSubscriptions();
assertEquals(numQueues, 1);
- // test for client connection Count
-
- /* @TODO */
- // assertTrue(bean.getClientConnectionCount() > 0);
bean.getContinuousQueryList();
// Only temporarily stops the query
diff --git a/geode-dunit/src/main/java/org/apache/geode/cache30/RegionTestCase.java b/geode-dunit/src/main/java/org/apache/geode/cache30/RegionTestCase.java
index 453e98b..8c20586 100644
--- a/geode-dunit/src/main/java/org/apache/geode/cache30/RegionTestCase.java
+++ b/geode-dunit/src/main/java/org/apache/geode/cache30/RegionTestCase.java
@@ -394,10 +394,6 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
Region subregion = region.createSubregion(name, attrs);
assertTrue(attrs != subregion.getAttributes());
- /*
- * @todo compare each individual attribute for equality? assertIndexDetailsEquals(attrs,
- * subregion.getAttributes());
- */
Set subregions = region.subregions(false);
assertEquals(1, subregions.size());
diff --git a/geode-junit/src/main/java/org/apache/geode/management/model/SubOrder.java b/geode-junit/src/main/java/org/apache/geode/management/model/SubOrder.java
index 51dd65a..394ab05 100644
--- a/geode-junit/src/main/java/org/apache/geode/management/model/SubOrder.java
+++ b/geode-junit/src/main/java/org/apache/geode/management/model/SubOrder.java
@@ -14,9 +14,6 @@
*/
package org.apache.geode.management.model;
-/**
- * @rishim
- */
public class SubOrder extends Order {
private static final long serialVersionUID = 2049641616996906291L;