>From Ali Alsuliman <[email protected]>: Ali Alsuliman has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21280?usp=email )
Change subject: [ASTERIXDB-3649][FUN] Rename 'async-requests()' -> 'open-requests()' ...................................................................... [ASTERIXDB-3649][FUN] Rename 'async-requests()' -> 'open-requests()' - user model changes: no - storage format changes: no - interface changes: no Ext-ref: MB-71998 Change-Id: Ie64ba4138120256625b4b414fba951b5b123e4fc Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21280 Integration-Tests: Jenkins <[email protected]> Reviewed-by: Ian Maxon <[email protected]> Reviewed-by: Ali Alsuliman <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> --- R asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/OpenRequestsDatasource.java R asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/OpenRequestsRewriter.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/util/MetadataBuiltinFunctions.java M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.2.query.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.3.plans.sqlpp M asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.6.query.sqlpp 6 files changed, 18 insertions(+), 18 deletions(-) Approvals: Ian Maxon: Looks good to me, approved Michael Blow: Looks good to me, approved Jenkins: Verified; Verified Ali Alsuliman: Looks good to me, but someone else must approve Anon. E. Moose #1000171: diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/AsyncRequestsDatasource.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/OpenRequestsDatasource.java similarity index 84% rename from asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/AsyncRequestsDatasource.java rename to asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/OpenRequestsDatasource.java index a2f112f..9ec04aa 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/AsyncRequestsDatasource.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/OpenRequestsDatasource.java @@ -29,13 +29,13 @@ import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.core.algebra.properties.INodeDomain; -public class AsyncRequestsDatasource extends FunctionDataSource { +public class OpenRequestsDatasource extends FunctionDataSource { - private static final DataSourceId ASYNC_REQUESTS_DATASOURCE_ID = - createDataSourceId(AsyncRequestsRewriter.ASYNC_REQUESTS); + private static final DataSourceId OPEN_REQUESTS_DATASOURCE_ID = + createDataSourceId(OpenRequestsRewriter.OPEN_REQUESTS); - public AsyncRequestsDatasource(INodeDomain domain) throws AlgebricksException { - super(ASYNC_REQUESTS_DATASOURCE_ID, AsyncRequestsRewriter.ASYNC_REQUESTS, domain); + public OpenRequestsDatasource(INodeDomain domain) throws AlgebricksException { + super(OPEN_REQUESTS_DATASOURCE_ID, OpenRequestsRewriter.OPEN_REQUESTS, domain); } @Override diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/AsyncRequestsRewriter.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/OpenRequestsRewriter.java similarity index 78% rename from asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/AsyncRequestsRewriter.java rename to asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/OpenRequestsRewriter.java index 96ffc8b..8aac2ff 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/AsyncRequestsRewriter.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/OpenRequestsRewriter.java @@ -25,18 +25,18 @@ import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression; import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -public class AsyncRequestsRewriter extends FunctionRewriter { +public class OpenRequestsRewriter extends FunctionRewriter { - public static final FunctionIdentifier ASYNC_REQUESTS = FunctionConstants.newAsterix("async-requests", 0); - public static final AsyncRequestsRewriter INSTANCE = new AsyncRequestsRewriter(ASYNC_REQUESTS); + public static final FunctionIdentifier OPEN_REQUESTS = FunctionConstants.newAsterix("open-requests", 0); + public static final OpenRequestsRewriter INSTANCE = new OpenRequestsRewriter(OPEN_REQUESTS); - private AsyncRequestsRewriter(FunctionIdentifier functionId) { + private OpenRequestsRewriter(FunctionIdentifier functionId) { super(functionId); } @Override protected FunctionDataSource toDatasource(IOptimizationContext context, AbstractFunctionCallExpression f) throws AlgebricksException { - return new AsyncRequestsDatasource(context.getComputationNodeDomain()); + return new OpenRequestsDatasource(context.getComputationNodeDomain()); } } diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/util/MetadataBuiltinFunctions.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/util/MetadataBuiltinFunctions.java index 1cf7d61..58bc863 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/util/MetadataBuiltinFunctions.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/util/MetadataBuiltinFunctions.java @@ -19,13 +19,13 @@ package org.apache.asterix.util; import org.apache.asterix.app.function.ActiveRequestsRewriter; -import org.apache.asterix.app.function.AsyncRequestsRewriter; import org.apache.asterix.app.function.CompletedRequestsRewriter; import org.apache.asterix.app.function.DatasetResourcesRewriter; import org.apache.asterix.app.function.DatasetRewriter; import org.apache.asterix.app.function.DumpIndexRewriter; import org.apache.asterix.app.function.FeedRewriter; import org.apache.asterix.app.function.JobSummariesRewriter; +import org.apache.asterix.app.function.OpenRequestsRewriter; import org.apache.asterix.app.function.PingRewriter; import org.apache.asterix.app.function.QueryIndexRewriter; import org.apache.asterix.app.function.QueryPartitionRewriter; @@ -85,10 +85,10 @@ BuiltinFunctions.addDatasourceFunction(ActiveRequestsRewriter.ACTIVE_REQUESTS, ActiveRequestsRewriter.INSTANCE, BuiltinFunctions.DataSourceFunctionProperty.MIN_MEMORY_BUDGET); // Async requests function - BuiltinFunctions.addFunction(AsyncRequestsRewriter.ASYNC_REQUESTS, + BuiltinFunctions.addFunction(OpenRequestsRewriter.OPEN_REQUESTS, (expression, env, mp) -> RecordUtil.FULLY_OPEN_RECORD_TYPE, true); - BuiltinFunctions.addUnnestFun(AsyncRequestsRewriter.ASYNC_REQUESTS, true); - BuiltinFunctions.addDatasourceFunction(AsyncRequestsRewriter.ASYNC_REQUESTS, AsyncRequestsRewriter.INSTANCE, + BuiltinFunctions.addUnnestFun(OpenRequestsRewriter.OPEN_REQUESTS, true); + BuiltinFunctions.addDatasourceFunction(OpenRequestsRewriter.OPEN_REQUESTS, OpenRequestsRewriter.INSTANCE, BuiltinFunctions.DataSourceFunctionProperty.MIN_MEMORY_BUDGET); // job-summaries function BuiltinFunctions.addPrivateFunction(JobSummariesRewriter.JOBSUMMARIES, diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.2.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.2.query.sqlpp index 1b371a3..d3dda00 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.2.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.2.query.sqlpp @@ -17,4 +17,4 @@ * under the License. */ -SELECT VALUE rqst.clientContextID FROM async_requests() rqst WHERE rqst.clientContextID = "async_query"; \ No newline at end of file +SELECT VALUE rqst.clientContextID FROM open_requests() rqst WHERE rqst.clientContextID = "async_query"; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.3.plans.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.3.plans.sqlpp index 0eb6eb2..5b9c3771 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.3.plans.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.3.plans.sqlpp @@ -18,13 +18,13 @@ */ /* - * Test that a query that only uses async_requests() gets assigned a minimal memory budget + * Test that a query that only uses open_requests() gets assigned a minimal memory budget */ -- param job:string=true SET `compiler.parallelism` "1"; -from async_requests() t +from open_requests() t select value t order by t; \ No newline at end of file diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.6.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.6.query.sqlpp index 1b371a3..d3dda00 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.6.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/misc/async_requests/async_requests.6.query.sqlpp @@ -17,4 +17,4 @@ * under the License. */ -SELECT VALUE rqst.clientContextID FROM async_requests() rqst WHERE rqst.clientContextID = "async_query"; \ No newline at end of file +SELECT VALUE rqst.clientContextID FROM open_requests() rqst WHERE rqst.clientContextID = "async_query"; \ No newline at end of file -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21280?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: lumina Gerrit-Change-Id: Ie64ba4138120256625b4b414fba951b5b123e4fc Gerrit-Change-Number: 21280 Gerrit-PatchSet: 2 Gerrit-Owner: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]>
