[email protected] has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/3058
Change subject: cleaning up.
......................................................................
cleaning up.
Change-Id: I1837bd744d40a1831a04d30eb2d182af62d08bb2
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
M
asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
M
asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
3 files changed, 0 insertions(+), 39 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/58/3058/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
index 45d792c..41cc69d 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
@@ -40,7 +40,6 @@
import org.apache.asterix.common.config.GlobalConfig;
import org.apache.asterix.common.context.IStorageComponentProvider;
import org.apache.asterix.common.dataflow.ICcApplicationContext;
-import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.exceptions.ErrorCode;
import org.apache.asterix.common.exceptions.RuntimeDataException;
import org.apache.asterix.compiler.provider.ILangCompilationProvider;
@@ -48,7 +47,6 @@
import org.apache.asterix.lang.common.base.IParser;
import org.apache.asterix.lang.common.base.IParserFactory;
import org.apache.asterix.lang.common.base.Statement;
-
import org.apache.asterix.metadata.MetadataManager;
import org.apache.asterix.om.base.IAObject;
import org.apache.asterix.translator.*;
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
index 1af04ad..ed989e8 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
@@ -71,7 +71,6 @@
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.http.HttpEntityEnclosingRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.client.HttpClient;
@@ -589,8 +588,6 @@
List<Parameter> newParams = upsertParam(params, "format",
ParameterTypeEnum.STRING, fmt.mimeType());
newParams = upsertParam(newParams,
QueryServiceServlet.Parameter.PLAN_FORMAT.str(), ParameterTypeEnum.STRING,
DEFAULT_PLAN_FORMAT);
-
-
final Optional<String> maxReadsOptional = extractMaxResultReads(str);
if (maxReadsOptional.isPresent()) {
newParams = upsertParam(newParams,
QueryServiceServlet.Parameter.MAX_RESULT_READS.str(),
@@ -602,21 +599,9 @@
}
HttpUriRequest method = jsonEncoded ? constructPostMethodJson(str,
uri, "statement", newParams)
: constructPostMethodUrl(str, uri, "statement", newParams);
-
- //HttpEntityEnclosingRequest method =
- // (HttpEntityEnclosingRequest) (jsonEncoded ?
constructPostMethodJson(str, uri, "statement", newParams)
- // : constructPostMethodUrl(str, uri, "statement",
newParams));
-
-
- //final String entity = EntityUtils.toString(method.getEntity());
- //System.out.println(entity);
-
// Set accepted output response type
method.setHeader("Origin", uri.getScheme() + uri.getAuthority());
method.setHeader("Accept", OutputFormat.CLEAN_JSON.mimeType());
-
- //System.out.println("The method = " + method.toString());
- //HttpResponse response = executeHttpRequest((HttpUriRequest) method);
HttpResponse response = executeHttpRequest(method);
if (responseCodeValidator != null) {
checkResponse(response, responseCodeValidator);
@@ -1227,12 +1212,7 @@
if (DELIVERY_IMMEDIATE.equals(delivery)) {
resultStream =
executeQueryService(statement, fmt, uri, params,
isJsonEncoded, null, isCancellable(reqType));
- //String res = IOUtils.toString(resultStream,
StandardCharsets.UTF_8);
- //EnumSet<ResultExtractor.ResultField> resultFields = new
EnumSet<ResultExtractor.ResultField>();
- //resultFields.add(ResultExtractor.ResultField.PARSEVALS);
-
switch(reqType){
-
case METRICS_QUERY_TYPE:
resultStream =
ResultExtractor.extractMetrics(resultStream);
break;
@@ -1242,24 +1222,16 @@
default:
resultStream = ResultExtractor.extract(resultStream);
break;
-
}
- //resultStream = METRICS_QUERY_TYPE.equals(reqType) ?
ResultExtractor.extractMetrics(resultStream)
- // : ResultExtractor.extract(resultStream);
- //String res1 = IOUtils.toString(resultStream,
StandardCharsets.UTF_8);
-
} else {
String handleVar = getHandleVariable(statement);
resultStream = executeQueryService(statement, fmt, uri,
upsertParam(params, "mode", ParameterTypeEnum.STRING,
delivery), isJsonEncoded);
- //String res = IOUtils.toString(resultStream,
StandardCharsets.UTF_8);
String handle = ResultExtractor.extractHandle(resultStream);
Assert.assertNotNull("no handle for " + reqType + " test " +
testFile.toString(), handleVar);
variableCtx.put(handleVar, toQueryServiceHandle(handle));
}
if (actualResultFile == null) {
- String namex = testFile.getName();
-
if (testFile.getName().startsWith(DIAGNOSE)) {
LOGGER.info("Diagnostic output: {}",
IOUtils.toString(resultStream, StandardCharsets.UTF_8));
} else {
@@ -1267,7 +1239,6 @@
+ ", filectxs.size: " + numResultFiles);
}
} else {
- //String res = IOUtils.toString(resultStream,
StandardCharsets.UTF_8);
writeOutputToFile(actualResultFile, resultStream);
if (expectedResultFile == null) {
if (reqType.equals("store")) {
@@ -1531,7 +1502,6 @@
String value = m.group("value");
param.setValue(value);
String type = m.group("type");
-
if (type != null) {
try {
param.setType(ParameterTypeEnum.fromValue(type.toLowerCase()));
@@ -1663,11 +1633,6 @@
final String statement = readTestFile(testFile);
try {
if (!testFile.getName().startsWith(DIAGNOSE)) {
- executeTestFile(testCaseCtx, ctx, variableCtx,
statement, isDmlRecoveryTest, pb, cUnit,
- queryCount, expectedResultFileCtxs, testFile,
actualPath);
- }
- else
- {
executeTestFile(testCaseCtx, ctx, variableCtx,
statement, isDmlRecoveryTest, pb, cUnit,
queryCount, expectedResultFileCtxs, testFile,
actualPath);
}
diff --git
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
index 7b9994e..c2b3e45 100644
---
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
+++
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppVariableUtil.java
@@ -22,7 +22,6 @@
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.ILangExpression;
-import org.apache.asterix.lang.common.base.Statement;
import org.apache.asterix.lang.common.clause.GroupbyClause;
import org.apache.asterix.lang.common.clause.LetClause;
import org.apache.asterix.lang.common.expression.GbyVariableExpressionPair;
@@ -32,7 +31,6 @@
import org.apache.asterix.lang.sqlpp.clause.FromClause;
import org.apache.asterix.lang.sqlpp.clause.FromTerm;
import org.apache.asterix.lang.sqlpp.visitor.FreeVariableVisitor;
-import org.apache.asterix.lang.sqlpp.visitor.NamedParameterVisitor;
public class SqlppVariableUtil {
--
To view, visit https://asterix-gerrit.ics.uci.edu/3058
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1837bd744d40a1831a04d30eb2d182af62d08bb2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: [email protected]
