honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove two NOCOMMITs 

* TimeoutInfo - This is now tracked in the SQL tracker github issue
* AbstractProto - Convert to a TODO as we *can* handle it after
release. I've added it to the SQL tracker github issue in a special
section for low priority protocol stuff. Protocol stuff is special
because if we can make the change before release we don't have to
worry about backwards compatibility.

Original commit: elastic/x-pack-elasticsearch@dbef9db5f8
This commit is contained in:
Nik Everett 2017-09-18 12:47:53 -04:00
parent 52ee02da27
commit 759411571e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/AbstractProto.java
View File

@ -55,7 +55,7 @@ public abstract class AbstractProto {
throw new IOException("Response version [" + version + "] does not match client version [" throw new IOException("Response version [" + version + "] does not match client version ["
+ CURRENT_VERSION + "]. Server is busted."); + CURRENT_VERSION + "]. Server is busted.");
} }
// NOCOMMIT why do I need the response type at all? Just a byte for err/exception/normal, then get response type from request. // TODO why do I need the response type at all? Just a byte for err/exception/normal, then get response type from request.
Response response = readResponseType(in).reader().read(request, in); Response response = readResponseType(in).reader().read(request, in);
if (response.requestType() != request.requestType()) { if (response.requestType() != request.requestType()) {
throw new IOException("Expected request type to be [" + request.requestType() throw new IOException("Expected request type to be [" + request.requestType()

1
sql/shared-proto/src/main/java/org/elasticsearch/xpack/sql/protocol/shared/TimeoutInfo.java
View File

@ -11,7 +11,6 @@ import java.io.IOException;
import java.util.Objects; import java.util.Objects;
public class TimeoutInfo { public class TimeoutInfo {
// NOCOMMIT javadoc on each of these would be nice because I don't know from reading how "timeout" is different from requestTimeout
public final long clientTime, timeout, requestTimeout; public final long clientTime, timeout, requestTimeout;
public TimeoutInfo(long clientTime, long timeout, long requestTimeout) { public TimeoutInfo(long clientTime, long timeout, long requestTimeout) {