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

encode scroll id with base64 in url safe manner

This commit is contained in:
kimchy 2010-11-28 02:23:38 +02:00
parent cfa8c9aa79
commit 8285ffe221
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryAndFetchAction.java
View File

@ -163,7 +163,7 @@ public class TransportSearchDfsQueryAndFetchAction extends TransportSearchTypeAc
}
}
private void innerFinishHim() {
private void innerFinishHim() throws Exception {
sortedShardList = searchPhaseController.sortDocs(queryFetchResults.values());
final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryFetchResults, queryFetchResults);
String scrollId = null;

2
modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchDfsQueryThenFetchAction.java
View File

@ -258,7 +258,7 @@ public class TransportSearchDfsQueryThenFetchAction extends TransportSearchTypeA
}
}
private void innerFinishHim() {
private void innerFinishHim() throws Exception {
final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryResults, fetchResults);
String scrollId = null;
if (request.scroll() != null) {

8
modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchHelper.java
View File

@ -79,7 +79,7 @@ public abstract class TransportSearchHelper {
return internalRequest;
}
public static String buildScrollId(SearchType searchType, Iterable<? extends SearchPhaseResult> searchPhaseResults) {
public static String buildScrollId(SearchType searchType, Iterable<? extends SearchPhaseResult> searchPhaseResults) throws IOException {
if (searchType == SearchType.DFS_QUERY_THEN_FETCH || searchType == SearchType.QUERY_THEN_FETCH) {
return buildScrollId(ParsedScrollId.QUERY_THEN_FETCH_TYPE, searchPhaseResults);
} else if (searchType == SearchType.QUERY_AND_FETCH || searchType == SearchType.DFS_QUERY_AND_FETCH) {
@ -89,17 +89,17 @@ public abstract class TransportSearchHelper {
}
}
public static String buildScrollId(String type, Iterable<? extends SearchPhaseResult> searchPhaseResults) {
public static String buildScrollId(String type, Iterable<? extends SearchPhaseResult> searchPhaseResults) throws IOException {
StringBuilder sb = new StringBuilder().append(type).append(';');
for (SearchPhaseResult searchPhaseResult : searchPhaseResults) {
sb.append(searchPhaseResult.id()).append(':').append(searchPhaseResult.shardTarget().nodeId()).append(';');
}
return Base64.encodeBytes(Unicode.fromStringAsBytes(sb.toString()));
return Base64.encodeBytes(Unicode.fromStringAsBytes(sb.toString()), Base64.URL_SAFE);
}
public static ParsedScrollId parseScrollId(String scrollId) {
try {
scrollId = Unicode.fromBytes(Base64.decode(scrollId));
scrollId = Unicode.fromBytes(Base64.decode(scrollId, Base64.URL_SAFE));
} catch (IOException e) {
throw new ElasticSearchIllegalArgumentException("Failed to decode scrollId", e);
}

2
modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryAndFetchAction.java
View File

@ -75,7 +75,7 @@ public class TransportSearchQueryAndFetchAction extends TransportSearchTypeActio
queryFetchResults.put(result.shardTarget(), result);
}
@Override protected void moveToSecondPhase() {
@Override protected void moveToSecondPhase() throws Exception {
sortedShardList = searchPhaseController.sortDocs(queryFetchResults.values());
final InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryFetchResults, queryFetchResults);
String scrollId = null;

2
modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchQueryThenFetchAction.java
View File

@ -171,7 +171,7 @@ public class TransportSearchQueryThenFetchAction extends TransportSearchTypeActi
}
}
private void innerFinishHim() {
private void innerFinishHim() throws Exception {
InternalSearchResponse internalResponse = searchPhaseController.merge(sortedShardList, queryResults, fetchResults);
String scrollId = null;
if (request.scroll() != null) {

2
modules/elasticsearch/src/main/java/org/elasticsearch/action/search/type/TransportSearchTypeAction.java
View File

@ -353,7 +353,7 @@ public abstract class TransportSearchTypeAction extends BaseAction<SearchRequest
protected abstract void processFirstPhaseResult(ShardRouting shard, FirstResult result);
protected abstract void moveToSecondPhase();
protected abstract void moveToSecondPhase() throws Exception;
protected abstract String firstPhaseName();
}

4
modules/elasticsearch/src/main/java/org/elasticsearch/common/lucene/Lucene.java
View File

@ -44,7 +44,7 @@ import java.util.Map;
*/
public class Lucene {
public static Version VERSION = Version.LUCENE_CURRENT;
@SuppressWarnings({"deprecation"}) public static Version VERSION = Version.LUCENE_CURRENT;
public static Version ANALYZER_VERSION = VERSION;
public static Version QUERYPARSER_VERSION = VERSION;
@ -280,6 +280,7 @@ public class Lucene {
}
}
@SuppressWarnings({"unchecked"})
public static Object readFieldValue(StreamInput in) throws IOException {
byte type = in.readByte();
if (type == -1) {
@ -327,6 +328,7 @@ public class Lucene {
}
}
@SuppressWarnings({"unchecked"})
public static void writeFieldValue(StreamOutput out, Object value) throws IOException {
if (value == null) {
out.writeByte((byte) -1);