Till Westmann has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/1224
Change subject: move SessionConfig to translator ...................................................................... move SessionConfig to translator Change-Id: I06d85aa361bb5d50f885311aad2545514d8a94b7 --- M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutorFactory.java R asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SessionConfig.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/APIServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryResultAPIServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/RESTAPIServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/java/AsterixJavaClient.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/FeedWorkCollection.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/DefaultStatementExecutorFactory.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/aql/translator/QueryTranslatorTest.java 14 files changed, 24 insertions(+), 26 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/24/1224/1 diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutorFactory.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutorFactory.java index 9addc87..05fde09 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutorFactory.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutorFactory.java @@ -20,7 +20,6 @@ import java.util.List; -import org.apache.asterix.common.app.SessionConfig; import org.apache.asterix.compiler.provider.ILangCompilationProvider; import org.apache.asterix.lang.common.base.Statement; diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/app/SessionConfig.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SessionConfig.java similarity index 99% rename from asterixdb/asterix-common/src/main/java/org/apache/asterix/common/app/SessionConfig.java rename to asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SessionConfig.java index f4e3be2..fc4f655 100644 --- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/app/SessionConfig.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SessionConfig.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.common.app; +package org.apache.asterix.translator; import java.io.PrintWriter; import java.util.HashMap; diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java index 9c0f66c..eb1764c 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java @@ -29,7 +29,6 @@ import org.apache.asterix.api.common.Job.SubmissionMode; import org.apache.asterix.app.cc.CompilerExtensionManager; import org.apache.asterix.app.result.ResultUtil; -import org.apache.asterix.common.app.SessionConfig; import org.apache.asterix.common.config.AsterixCompilerProperties; import org.apache.asterix.common.config.AsterixExternalProperties; import org.apache.asterix.common.config.OptimizationConfUtil; @@ -57,6 +56,7 @@ import org.apache.asterix.transaction.management.service.transaction.JobIdFactory; import org.apache.asterix.translator.CompiledStatements.ICompiledDmlStatement; import org.apache.asterix.translator.IStatementExecutor.Stats; +import org.apache.asterix.translator.SessionConfig; import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.common.utils.Pair; diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/APIServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/APIServlet.java index b811172..f32e451 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/APIServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/APIServlet.java @@ -40,8 +40,6 @@ import org.apache.asterix.app.result.ResultReader; import org.apache.asterix.app.result.ResultUtil; -import org.apache.asterix.common.app.SessionConfig; -import org.apache.asterix.common.app.SessionConfig.OutputFormat; import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.compiler.provider.ILangCompilationProvider; @@ -52,6 +50,8 @@ import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.translator.IStatementExecutor; import org.apache.asterix.translator.IStatementExecutorFactory; +import org.apache.asterix.translator.SessionConfig; +import org.apache.asterix.translator.SessionConfig.OutputFormat; import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.dataset.IHyracksDataset; import org.apache.hyracks.client.dataset.HyracksDataset; diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryResultAPIServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryResultAPIServlet.java index fdbf253..a572500 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryResultAPIServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryResultAPIServlet.java @@ -31,8 +31,8 @@ import org.apache.asterix.app.result.ResultReader; import org.apache.asterix.app.result.ResultUtil; -import org.apache.asterix.common.app.SessionConfig; import org.apache.asterix.translator.IStatementExecutor.Stats; +import org.apache.asterix.translator.SessionConfig; import org.apache.hyracks.api.client.HyracksConnection; import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.dataset.IHyracksDataset; diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java index 3a22302..c7adc25 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java @@ -40,7 +40,6 @@ import org.apache.asterix.app.result.ResultUtil; import org.apache.asterix.app.translator.QueryTranslator; import org.apache.asterix.common.api.IClusterManagementWork; -import org.apache.asterix.common.app.SessionConfig; import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.utils.JSONUtil; @@ -53,6 +52,7 @@ import org.apache.asterix.translator.IStatementExecutor; import org.apache.asterix.translator.IStatementExecutor.Stats; import org.apache.asterix.translator.IStatementExecutorFactory; +import org.apache.asterix.translator.SessionConfig; import org.apache.commons.io.IOUtils; import org.apache.hyracks.algebricks.core.algebra.prettyprint.AlgebricksAppendable; import org.apache.hyracks.api.client.IHyracksClientConnection; diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/RESTAPIServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/RESTAPIServlet.java index 100efed..558be35 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/RESTAPIServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/RESTAPIServlet.java @@ -36,8 +36,6 @@ import org.apache.asterix.app.result.ResultReader; import org.apache.asterix.app.result.ResultUtil; import org.apache.asterix.app.translator.QueryTranslator; -import org.apache.asterix.common.app.SessionConfig; -import org.apache.asterix.common.app.SessionConfig.OutputFormat; import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.compiler.provider.ILangCompilationProvider; @@ -48,6 +46,8 @@ import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.translator.IStatementExecutor; import org.apache.asterix.translator.IStatementExecutorFactory; +import org.apache.asterix.translator.SessionConfig; +import org.apache.asterix.translator.SessionConfig.OutputFormat; import org.apache.commons.io.IOUtils; import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.dataset.IHyracksDataset; diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/java/AsterixJavaClient.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/java/AsterixJavaClient.java index e358963..b269ecf 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/java/AsterixJavaClient.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/java/AsterixJavaClient.java @@ -25,8 +25,6 @@ import org.apache.asterix.api.common.APIFramework; import org.apache.asterix.api.common.Job; import org.apache.asterix.app.translator.QueryTranslator; -import org.apache.asterix.common.app.SessionConfig; -import org.apache.asterix.common.app.SessionConfig.OutputFormat; import org.apache.asterix.compiler.provider.ILangCompilationProvider; import org.apache.asterix.lang.common.base.IParser; import org.apache.asterix.lang.common.base.IParserFactory; @@ -34,6 +32,8 @@ import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.translator.IStatementExecutor; import org.apache.asterix.translator.IStatementExecutorFactory; +import org.apache.asterix.translator.SessionConfig; +import org.apache.asterix.translator.SessionConfig.OutputFormat; import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.job.JobSpecification; diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/FeedWorkCollection.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/FeedWorkCollection.java index 7f31d20..62f11df 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/FeedWorkCollection.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/FeedWorkCollection.java @@ -24,8 +24,6 @@ import org.apache.asterix.app.translator.DefaultStatementExecutorFactory; import org.apache.asterix.app.translator.QueryTranslator; -import org.apache.asterix.common.app.SessionConfig; -import org.apache.asterix.common.app.SessionConfig.OutputFormat; import org.apache.asterix.compiler.provider.AqlCompilationProvider; import org.apache.asterix.compiler.provider.ILangCompilationProvider; import org.apache.asterix.external.feed.api.IFeedWork; @@ -38,6 +36,8 @@ import org.apache.asterix.lang.common.struct.Identifier; import org.apache.asterix.runtime.util.AsterixAppContextInfo; import org.apache.asterix.translator.IStatementExecutor; +import org.apache.asterix.translator.SessionConfig; +import org.apache.asterix.translator.SessionConfig.OutputFormat; import org.apache.log4j.Level; import org.apache.log4j.Logger; diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java index 9b1b32b..22d2c23 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultPrinter.java @@ -24,11 +24,10 @@ import java.io.StringWriter; import java.nio.ByteBuffer; -import org.apache.asterix.common.app.SessionConfig; import org.apache.asterix.common.utils.JSONUtil; import org.apache.asterix.om.types.ARecordType; -import org.apache.asterix.translator.IStatementExecutor; import org.apache.asterix.translator.IStatementExecutor.Stats; +import org.apache.asterix.translator.SessionConfig; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.core.algebra.prettyprint.AlgebricksAppendable; import org.apache.hyracks.api.comm.IFrame; diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java index 979f7f4..f68f458 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/ResultUtil.java @@ -34,9 +34,9 @@ import java.util.stream.Stream; import org.apache.asterix.api.http.servlet.APIServlet; -import org.apache.asterix.common.app.SessionConfig; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.translator.IStatementExecutor.Stats; +import org.apache.asterix.translator.SessionConfig; import org.apache.http.ParseException; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.exceptions.HyracksDataException; diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/DefaultStatementExecutorFactory.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/DefaultStatementExecutorFactory.java index c802d08..1b10f3a 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/DefaultStatementExecutorFactory.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/DefaultStatementExecutorFactory.java @@ -21,10 +21,10 @@ import java.util.List; import org.apache.asterix.app.cc.CompilerExtensionManager; -import org.apache.asterix.common.app.SessionConfig; import org.apache.asterix.compiler.provider.ILangCompilationProvider; import org.apache.asterix.lang.common.base.Statement; import org.apache.asterix.translator.IStatementExecutorFactory; +import org.apache.asterix.translator.SessionConfig; public class DefaultStatementExecutorFactory implements IStatementExecutorFactory { diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java index c196ecc..91b33ee 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java @@ -34,9 +34,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Properties; import java.util.Random; -import java.util.Map.Entry; import java.util.logging.Level; import java.util.logging.Logger; @@ -53,24 +53,23 @@ import org.apache.asterix.app.external.FeedOperations; import org.apache.asterix.app.result.ResultReader; import org.apache.asterix.app.result.ResultUtil; -import org.apache.asterix.common.app.SessionConfig; import org.apache.asterix.common.config.AsterixExternalProperties; import org.apache.asterix.common.config.ClusterProperties; -import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.common.config.DatasetConfig.DatasetType; import org.apache.asterix.common.config.DatasetConfig.ExternalDatasetTransactionState; import org.apache.asterix.common.config.DatasetConfig.ExternalFilePendingOp; import org.apache.asterix.common.config.DatasetConfig.IndexType; +import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.common.exceptions.ACIDException; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.functions.FunctionSignature; import org.apache.asterix.compiler.provider.ILangCompilationProvider; import org.apache.asterix.external.api.IAdapterFactory; import org.apache.asterix.external.feed.api.IFeed; -import org.apache.asterix.external.feed.api.IFeedJoint; -import org.apache.asterix.external.feed.api.IFeedLifecycleEventSubscriber; import org.apache.asterix.external.feed.api.IFeed.FeedType; +import org.apache.asterix.external.feed.api.IFeedJoint; import org.apache.asterix.external.feed.api.IFeedJoint.FeedJointType; +import org.apache.asterix.external.feed.api.IFeedLifecycleEventSubscriber; import org.apache.asterix.external.feed.api.IFeedLifecycleEventSubscriber.FeedLifecycleEvent; import org.apache.asterix.external.feed.management.FeedConnectionId; import org.apache.asterix.external.feed.management.FeedConnectionRequest; @@ -78,9 +77,9 @@ import org.apache.asterix.external.feed.management.FeedJointKey; import org.apache.asterix.external.feed.management.FeedLifecycleEventSubscriber; import org.apache.asterix.external.feed.policy.FeedPolicyAccessor; +import org.apache.asterix.external.feed.watch.FeedActivity.FeedActivityDetails; import org.apache.asterix.external.feed.watch.FeedConnectJobInfo; import org.apache.asterix.external.feed.watch.FeedIntakeInfo; -import org.apache.asterix.external.feed.watch.FeedActivity.FeedActivityDetails; import org.apache.asterix.external.indexing.ExternalFile; import org.apache.asterix.external.util.FeedUtils.FeedRuntimeType; import org.apache.asterix.file.DatasetOperations; @@ -165,8 +164,6 @@ import org.apache.asterix.runtime.util.AsterixAppContextInfo; import org.apache.asterix.transaction.management.service.transaction.DatasetIdFactory; import org.apache.asterix.translator.AbstractLangTranslator; -import org.apache.asterix.translator.IStatementExecutor; -import org.apache.asterix.translator.TypeTranslator; import org.apache.asterix.translator.CompiledStatements.CompiledConnectFeedStatement; import org.apache.asterix.translator.CompiledStatements.CompiledCreateIndexStatement; import org.apache.asterix.translator.CompiledStatements.CompiledDatasetDropStatement; @@ -178,6 +175,9 @@ import org.apache.asterix.translator.CompiledStatements.CompiledSubscribeFeedStatement; import org.apache.asterix.translator.CompiledStatements.CompiledUpsertStatement; import org.apache.asterix.translator.CompiledStatements.ICompiledDmlStatement; +import org.apache.asterix.translator.IStatementExecutor; +import org.apache.asterix.translator.SessionConfig; +import org.apache.asterix.translator.TypeTranslator; import org.apache.asterix.translator.util.ValidateUtil; import org.apache.asterix.util.FlushDatasetUtils; import org.apache.asterix.util.JobUtils; diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/aql/translator/QueryTranslatorTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/aql/translator/QueryTranslatorTest.java index f3fd080..56d4191 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/aql/translator/QueryTranslatorTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/aql/translator/QueryTranslatorTest.java @@ -29,7 +29,6 @@ import java.util.List; import org.apache.asterix.app.translator.DefaultStatementExecutorFactory; -import org.apache.asterix.common.app.SessionConfig; import org.apache.asterix.common.config.AsterixExternalProperties; import org.apache.asterix.common.config.ClusterProperties; import org.apache.asterix.compiler.provider.AqlCompilationProvider; @@ -39,6 +38,7 @@ import org.apache.asterix.lang.common.statement.RunStatement; import org.apache.asterix.runtime.util.AsterixAppContextInfo; import org.apache.asterix.translator.IStatementExecutor; +import org.apache.asterix.translator.SessionConfig; import org.junit.Assert; import org.junit.Test; -- To view, visit https://asterix-gerrit.ics.uci.edu/1224 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06d85aa361bb5d50f885311aad2545514d8a94b7 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann <ti...@apache.org>