abdullah alamoudi has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1486
Change subject: Fix the names of Let to Servlet
......................................................................
Fix the names of Let to Servlet
Change-Id: Ib2f63f37ee9ef063930478028e3e05ca9dd4742c
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
R
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ServletUtil.java
M
asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
M
asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
M
hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/api/IServlet.java
M
hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
6 files changed, 62 insertions(+), 61 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/86/1486/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
index 7955ad6..dce0502 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplicationEntryPoint.java
@@ -55,7 +55,7 @@
import org.apache.asterix.common.config.MetadataProperties;
import org.apache.asterix.common.context.IStorageComponentProvider;
import org.apache.asterix.common.library.ILibraryManager;
-import org.apache.asterix.common.utils.LetUtil.Lets;
+import org.apache.asterix.common.utils.ServletUtil.Servlets;
import org.apache.asterix.external.library.ExternalLibraryManager;
import org.apache.asterix.file.StorageComponentProvider;
import org.apache.asterix.messaging.CCMessageBroker;
@@ -166,7 +166,7 @@
externalProperties.getWebInterfacePort());
IHyracksClientConnection hcc = getNewHyracksClientConnection();
webServer.setAttribute(HYRACKS_CONNECTION_ATTR, hcc);
- webServer.addLet(new ApiServlet(webServer.ctx(), new String[] { "/*" },
+ webServer.addServlet(new ApiServlet(webServer.ctx(), new String[] {
"/*" },
ccExtensionManager.getAqlCompilationProvider(),
ccExtensionManager.getSqlppCompilationProvider(),
ccExtensionManager.getQueryTranslatorFactory(),
componentProvider));
return webServer;
@@ -182,33 +182,33 @@
((ClusterControllerService)
appCtx.getControllerService()).getExecutor());
// AQL rest APIs.
- addLet(jsonAPIServer, Lets.AQL_QUERY);
- addLet(jsonAPIServer, Lets.AQL_UPDATE);
- addLet(jsonAPIServer, Lets.AQL_DDL);
- addLet(jsonAPIServer, Lets.AQL);
+ addServlet(jsonAPIServer, Servlets.AQL_QUERY);
+ addServlet(jsonAPIServer, Servlets.AQL_UPDATE);
+ addServlet(jsonAPIServer, Servlets.AQL_DDL);
+ addServlet(jsonAPIServer, Servlets.AQL);
// SQL+x+ rest APIs.
- addLet(jsonAPIServer, Lets.SQLPP_QUERY);
- addLet(jsonAPIServer, Lets.SQLPP_UPDATE);
- addLet(jsonAPIServer, Lets.SQLPP_DDL);
- addLet(jsonAPIServer, Lets.SQLPP);
+ addServlet(jsonAPIServer, Servlets.SQLPP_QUERY);
+ addServlet(jsonAPIServer, Servlets.SQLPP_UPDATE);
+ addServlet(jsonAPIServer, Servlets.SQLPP_DDL);
+ addServlet(jsonAPIServer, Servlets.SQLPP);
// Other APIs.
- addLet(jsonAPIServer, Lets.QUERY_STATUS);
- addLet(jsonAPIServer, Lets.QUERY_RESULT);
- addLet(jsonAPIServer, Lets.QUERY_SERVICE);
- addLet(jsonAPIServer, Lets.CONNECTOR);
- addLet(jsonAPIServer, Lets.SHUTDOWN);
- addLet(jsonAPIServer, Lets.VERSION);
- addLet(jsonAPIServer, Lets.CLUSTER_STATE);
- addLet(jsonAPIServer, Lets.CLUSTER_STATE_NODE_DETAIL); // this must
not precede add of CLUSTER_STATE
- addLet(jsonAPIServer, Lets.CLUSTER_STATE_CC_DETAIL); // this must not
precede add of CLUSTER_STATE
- addLet(jsonAPIServer, Lets.DIAGNOSTICS);
+ addServlet(jsonAPIServer, Servlets.QUERY_STATUS);
+ addServlet(jsonAPIServer, Servlets.QUERY_RESULT);
+ addServlet(jsonAPIServer, Servlets.QUERY_SERVICE);
+ addServlet(jsonAPIServer, Servlets.CONNECTOR);
+ addServlet(jsonAPIServer, Servlets.SHUTDOWN);
+ addServlet(jsonAPIServer, Servlets.VERSION);
+ addServlet(jsonAPIServer, Servlets.CLUSTER_STATE);
+ addServlet(jsonAPIServer, Servlets.CLUSTER_STATE_NODE_DETAIL); // this
must not precede add of CLUSTER_STATE
+ addServlet(jsonAPIServer, Servlets.CLUSTER_STATE_CC_DETAIL); // this
must not precede add of CLUSTER_STATE
+ addServlet(jsonAPIServer, Servlets.DIAGNOSTICS);
return jsonAPIServer;
}
- protected void addLet(HttpServer server, Lets let) {
- server.addLet(createServLet(server, let, let.getPath()));
+ protected void addServlet(HttpServer server, Servlets let) {
+ server.addServlet(createServlet(server, let, let.getPath()));
}
protected HttpServer setupQueryWebServer(ExternalProperties
externalProperties) throws Exception {
@@ -216,7 +216,7 @@
externalProperties.getQueryWebInterfacePort());
IHyracksClientConnection hcc = getNewHyracksClientConnection();
queryWebServer.setAttribute(HYRACKS_CONNECTION_ATTR, hcc);
- queryWebServer.addLet(new
QueryWebInterfaceServlet(queryWebServer.ctx(), new String[] { "/*" }));
+ queryWebServer.addServlet(new
QueryWebInterfaceServlet(queryWebServer.ctx(), new String[] { "/*" }));
return queryWebServer;
}
@@ -233,11 +233,11 @@
HttpServer feedServer = new HttpServer(webManager.getBosses(),
webManager.getWorkers(),
externalProperties.getFeedServerPort());
feedServer.setAttribute(HYRACKS_CONNECTION_ATTR,
getNewHyracksClientConnection());
- feedServer.addLet(new FeedServlet(feedServer.ctx(), new String[] { "/"
}));
+ feedServer.addServlet(new FeedServlet(feedServer.ctx(), new String[] {
"/" }));
return feedServer;
}
- protected IServlet createServLet(HttpServer server, Lets key, String...
paths) {
+ protected IServlet createServlet(HttpServer server, Servlets key,
String... paths) {
switch (key) {
case AQL:
return new FullApiServlet(server.ctx(), paths,
ccExtensionManager.getAqlCompilationProvider(),
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/LetUtil.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ServletUtil.java
similarity index 90%
rename from
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/LetUtil.java
rename to
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ServletUtil.java
index 2fe9380..b28a6e5 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/LetUtil.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/ServletUtil.java
@@ -18,9 +18,9 @@
*/
package org.apache.asterix.common.utils;
-public class LetUtil {
+public class ServletUtil {
- public enum Lets {
+ public enum Servlets {
AQL("/aql"),
AQL_QUERY("/query"),
AQL_UPDATE("/update"),
@@ -42,7 +42,7 @@
private final String path;
- Lets(String path) {
+ Servlets(String path) {
this.path = path;
}
@@ -52,7 +52,6 @@
}
- private LetUtil() {
- throw new AssertionError("No objects of this class should be
created.");
+ private ServletUtil() {
}
}
diff --git
a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
index ff30df3..80e8d09 100644
---
a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
+++
b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java
@@ -48,7 +48,7 @@
import java.util.regex.Pattern;
import org.apache.asterix.common.config.GlobalConfig;
-import org.apache.asterix.common.utils.LetUtil.Lets;
+import org.apache.asterix.common.utils.ServletUtil.Servlets;
import org.apache.asterix.test.base.ComparisonException;
import org.apache.asterix.test.server.ITestServer;
import org.apache.asterix.test.server.TestServerProvider;
@@ -603,7 +603,7 @@
}
private InputStream getHandleResult(String handle, OutputFormat fmt)
throws Exception {
- final String url = getEndpoint(Lets.QUERY_RESULT);
+ final String url = getEndpoint(Servlets.QUERY_RESULT);
// Create a method instance.
HttpUriRequest request =
RequestBuilder.get(url).addParameter("handle", handle)
@@ -744,9 +744,9 @@
switch (ctx.getType()) {
case "ddl":
if (ctx.getFile().getName().endsWith("aql")) {
- executeDDL(statement, getEndpoint(Lets.AQL_DDL));
+ executeDDL(statement, getEndpoint(Servlets.AQL_DDL));
} else {
- InputStream resultStream = executeQueryService(statement,
getEndpoint(Lets.QUERY_SERVICE));
+ InputStream resultStream = executeQueryService(statement,
getEndpoint(Servlets.QUERY_SERVICE));
ResultExtractor.extract(resultStream);
}
break;
@@ -756,9 +756,9 @@
statement = statement.replaceAll("nc1://",
"127.0.0.1://../../../../../../asterix-app/");
}
if (ctx.getFile().getName().endsWith("aql")) {
- executeUpdate(statement, getEndpoint(Lets.AQL_UPDATE));
+ executeUpdate(statement, getEndpoint(Servlets.AQL_UPDATE));
} else {
- InputStream resultStream = executeQueryService(statement,
getEndpoint(Lets.QUERY_SERVICE));
+ InputStream resultStream = executeQueryService(statement,
getEndpoint(Servlets.QUERY_SERVICE));
ResultExtractor.extract(resultStream);
}
break;
@@ -812,16 +812,16 @@
OutputFormat fmt = OutputFormat.forCompilationUnit(cUnit);
if (ctx.getFile().getName().endsWith("aql")) {
if (ctx.getType().equalsIgnoreCase("query")) {
- resultStream = executeQuery(statement, fmt,
getEndpoint(Lets.AQL_QUERY),
+ resultStream = executeQuery(statement, fmt,
getEndpoint(Servlets.AQL_QUERY),
cUnit.getParameter());
} else if (ctx.getType().equalsIgnoreCase("async")) {
- resultStream = executeAnyAQLAsync(statement, false,
fmt, getEndpoint(Lets.AQL));
+ resultStream = executeAnyAQLAsync(statement, false,
fmt, getEndpoint(Servlets.AQL));
} else if (ctx.getType().equalsIgnoreCase("asyncdefer")) {
- resultStream = executeAnyAQLAsync(statement, true,
fmt, getEndpoint(Lets.AQL));
+ resultStream = executeAnyAQLAsync(statement, true,
fmt, getEndpoint(Servlets.AQL));
}
} else {
final String reqType = ctx.getType();
- final String url = getEndpoint(Lets.QUERY_SERVICE);
+ final String url = getEndpoint(Servlets.QUERY_SERVICE);
final List<CompilationUnit.Parameter> params =
cUnit.getParameter();
if (reqType.equalsIgnoreCase("query")) {
resultStream = executeQueryService(statement, fmt,
url, params, true);
@@ -854,13 +854,13 @@
break;
case "txnqbc": // qbc represents query before crash
resultStream = executeQuery(statement,
OutputFormat.forCompilationUnit(cUnit),
- getEndpoint(Lets.AQL_QUERY), cUnit.getParameter());
+ getEndpoint(Servlets.AQL_QUERY), cUnit.getParameter());
qbcFile = getTestCaseQueryBeforeCrashFile(actualPath,
testCaseCtx, cUnit);
writeOutputToFile(qbcFile, resultStream);
break;
case "txnqar": // qar represents query after recovery
resultStream = executeQuery(statement,
OutputFormat.forCompilationUnit(cUnit),
- getEndpoint(Lets.AQL_QUERY), cUnit.getParameter());
+ getEndpoint(Servlets.AQL_QUERY), cUnit.getParameter());
File qarFile = new File(actualPath + File.separator
+
testCaseCtx.getTestCase().getFilePath().replace(File.separator, "_") + "_" +
cUnit.getName()
+ "_qar.adm");
@@ -870,7 +870,7 @@
break;
case "txneu": // eu represents erroneous update
try {
- executeUpdate(statement, getEndpoint(Lets.AQL_UPDATE));
+ executeUpdate(statement, getEndpoint(Servlets.AQL_UPDATE));
} catch (Exception e) {
// An exception is expected.
failed = true;
@@ -898,7 +898,7 @@
break;
case "errddl": // a ddlquery that expects error
try {
- executeDDL(statement, getEndpoint(Lets.AQL_DDL));
+ executeDDL(statement, getEndpoint(Servlets.AQL_DDL));
} catch (Exception e) {
// expected error happens
failed = true;
@@ -1136,11 +1136,11 @@
+ cUnit.getName() + "_qbc.adm");
}
- protected String getPath(Lets servlet) {
+ protected String getPath(Servlets servlet) {
return servlet.getPath();
}
- protected String getEndpoint(Lets servlet) {
+ protected String getEndpoint(Servlets servlet) {
return "http://"; + host + ":" + port +
getPath(servlet).replaceAll("/\\*$", "");
}
@@ -1152,7 +1152,7 @@
try {
ArrayList<String> toBeDropped = new ArrayList<>();
InputStream resultStream = executeQueryService("select
dv.DataverseName from Metadata.`Dataverse` as dv;",
- getEndpoint(Lets.QUERY_SERVICE));
+ getEndpoint(Servlets.QUERY_SERVICE));
String out = IOUtils.toString(resultStream);
ObjectMapper om = new ObjectMapper();
om.setConfig(om.getDeserializationConfig().with(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT));
@@ -1181,7 +1181,7 @@
dropStatement.append(dv);
dropStatement.append(";\n");
}
- resultStream = executeQueryService(dropStatement.toString(),
getEndpoint(Lets.QUERY_SERVICE));
+ resultStream = executeQueryService(dropStatement.toString(),
getEndpoint(Servlets.QUERY_SERVICE));
ResultExtractor.extract(resultStream);
}
} catch (Throwable th) {
diff --git
a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
index 0991d4f..83d421f 100644
---
a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
+++
b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java
@@ -27,7 +27,7 @@
import java.net.URL;
import java.util.Collections;
-import org.apache.asterix.common.utils.LetUtil.Lets;
+import org.apache.asterix.common.utils.ServletUtil.Servlets;
import org.apache.asterix.test.aql.TestExecutor;
import org.apache.asterix.test.base.TestMethodTracer;
import org.apache.asterix.test.common.TestHelper;
@@ -89,7 +89,7 @@
public void test1_sanityQuery() throws Exception {
TestExecutor testExecutor = new TestExecutor();
InputStream resultStream = testExecutor.executeQuery("1+1",
OutputFormat.ADM,
- "http://127.0.0.1:19002"; + Lets.AQL_QUERY.getPath(),
Collections.emptyList());
+ "http://127.0.0.1:19002"; + Servlets.AQL_QUERY.getPath(),
Collections.emptyList());
StringWriter sw = new StringWriter();
IOUtils.copy(resultStream, sw);
Assert.assertEquals("2", sw.toString().trim());
diff --git
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/api/IServlet.java
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/api/IServlet.java
index b079d36..ba574da 100644
---
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/api/IServlet.java
+++
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/api/IServlet.java
@@ -21,7 +21,7 @@
import java.util.concurrent.ConcurrentMap;
/**
- * Represents a component that handles IServLet requests
+ * Represents a component that handles IServlet requests
*/
public interface IServlet {
@@ -45,6 +45,7 @@
/**
* Get the mime string representation from the extension
+ *
* @param extension
* @return
*/
@@ -74,7 +75,7 @@
}
/**
- * @return an array of paths associated with this IServLet
+ * @return an array of paths associated with this IServlet
*/
String[] getPaths();
@@ -84,7 +85,8 @@
ConcurrentMap<String, Object> ctx();
/**
- * handle the IServLetRequest writing the response in the passed
IServLetResponse
+ * handle the IServletRequest writing the response in the passed
IServletResponse
+ *
* @param request
* @param response
*/
diff --git
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
index 302e5f3..ad8ff41 100644
---
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
+++
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpServer.java
@@ -55,7 +55,7 @@
private final Object lock = new Object();
private final AtomicInteger threadId = new AtomicInteger();
private final ConcurrentMap<String, Object> ctx;
- private final List<IServlet> lets;
+ private final List<IServlet> servlets;
private final EventLoopGroup bossGroup;
private final EventLoopGroup workerGroup;
private final int port;
@@ -70,7 +70,7 @@
this.workerGroup = workerGroup;
this.port = port;
ctx = new ConcurrentHashMap<>();
- lets = new ArrayList<>();
+ servlets = new ArrayList<>();
executor = Executors.newFixedThreadPool(16,
runnable -> new Thread(runnable, "HttpExecutor(port:" + port +
")-" + threadId.getAndIncrement()));
}
@@ -166,22 +166,22 @@
return ctx;
}
- public void addLet(IServlet let) {
- lets.add(let);
+ public void addServlet(IServlet let) {
+ servlets.add(let);
}
protected void doStart() throws InterruptedException {
/*
- * This is a hacky way to ensure that ILets with more specific paths
are checked first.
+ * This is a hacky way to ensure that IServlets with more specific
paths are checked first.
* For example:
* "/path/to/resource/"
* is checked before
* "/path/to/"
* which in turn is checked before
* "/path/"
- * Note that it doesn't work for the case where multiple paths map to
a single ILet
+ * Note that it doesn't work for the case where multiple paths map to
a single IServlet
*/
- Collections.sort(lets, (l1, l2) -> l2.getPaths()[0].length() -
l1.getPaths()[0].length());
+ Collections.sort(servlets, (l1, l2) -> l2.getPaths()[0].length() -
l1.getPaths()[0].length());
ServerBootstrap b = new ServerBootstrap();
b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class)
.childOption(ChannelOption.WRITE_BUFFER_WATER_MARK,
@@ -201,7 +201,7 @@
if (i >= 0) {
uri = uri.substring(0, i);
}
- for (IServlet let : lets) {
+ for (IServlet let : servlets) {
for (String path : let.getPaths()) {
if (match(path, uri)) {
return let;
--
To view, visit https://asterix-gerrit.ics.uci.edu/1486
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2f63f37ee9ef063930478028e3e05ca9dd4742c
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: abdullah alamoudi <[email protected]>
